795 files changed, 58438 insertions, 43891 deletions

diff --git a/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml
index 8c4358d805..ad3466ad16 100644
--- a/.github/workflows/check-whitespace.yml
+++ b/.github/workflows/check-whitespace.yml
@@ -1,8 +1,9 @@
 name: check-whitespace
 
-# Get the repo with the commits(+1) in the series.
+# Get the repository with all commits to ensure that we can analyze
+# all of the commits contributed via the Pull Request.
 # Process `git log --check` output to extract just the check errors.
-# Add a comment to the pull request with the check errors.
+# Exit with failure upon white-space issues.
 
 on:
   pull_request:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6ed6a9e807..c35200defb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: CI/PR
+name: CI
 
 on: [push, pull_request]
 
@@ -7,6 +7,7 @@ env:
 
 jobs:
   ci-config:
+    name: config
     runs-on: ubuntu-latest
     outputs:
       enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }}
@@ -77,6 +78,7 @@ jobs:
             }
 
   windows-build:
+    name: win build
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     runs-on: windows-latest
@@ -97,6 +99,7 @@ jobs:
         name: windows-artifacts
         path: artifacts
   windows-test:
+    name: win test
     runs-on: windows-latest
     needs: [windows-build]
     strategy:
@@ -127,6 +130,7 @@ jobs:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   vs-build:
+    name: win+VS build
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
@@ -178,6 +182,7 @@ jobs:
         name: vs-artifacts
         path: artifacts
   vs-test:
+    name: win+VS test
     runs-on: windows-latest
     needs: vs-build
     strategy:
@@ -210,6 +215,7 @@ jobs:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   regular:
+    name: ${{matrix.vector.jobname}} (${{matrix.vector.pool}})
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     strategy:
@@ -219,14 +225,25 @@ jobs:
           - jobname: linux-clang
             cc: clang
             pool: ubuntu-latest
+          - jobname: linux-sha256
+            cc: clang
+            os: ubuntu
+            pool: ubuntu-latest
           - jobname: linux-gcc
             cc: gcc
+            cc_package: gcc-8
+            pool: ubuntu-latest
+          - jobname: linux-TEST-vars
+            cc: gcc
+            os: ubuntu
+            cc_package: gcc-8
             pool: ubuntu-latest
           - jobname: osx-clang
             cc: clang
             pool: macos-latest
           - jobname: osx-gcc
             cc: gcc
+            cc_package: gcc-9
             pool: macos-latest
           - jobname: linux-gcc-default
             cc: gcc
@@ -236,7 +253,9 @@ jobs:
             pool: ubuntu-latest
     env:
       CC: ${{matrix.vector.cc}}
+      CC_PACKAGE: ${{matrix.vector.cc_package}}
       jobname: ${{matrix.vector.jobname}}
+      runs_on_pool: ${{matrix.vector.pool}}
     runs-on: ${{matrix.vector.pool}}
     steps:
     - uses: actions/checkout@v2
@@ -251,6 +270,7 @@ jobs:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   dockerized:
+    name: ${{matrix.vector.jobname}} (${{matrix.vector.image}})
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     strategy:
@@ -259,7 +279,8 @@ jobs:
         vector:
         - jobname: linux-musl
           image: alpine
-        - jobname: Linux32
+        - jobname: linux32
+          os: ubuntu32
           image: daald/ubuntu32:xenial
         - jobname: pedantic
           image: fedora
@@ -289,6 +310,7 @@ jobs:
     - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
     - run: ci/run-static-analysis.sh
+    - run: ci/check-directional-formatting.bash
   sparse:
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
@@ -310,6 +332,7 @@ jobs:
       run: ci/install-dependencies.sh
     - run: make sparse
   documentation:
+    name: documentation
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 908330a0a3..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-language: c
-
-cache:
-  directories:
-    - $HOME/travis-cache
-
-os:
-  - linux
-  - osx
-
-osx_image: xcode10.1
-
-compiler:
-  - clang
-  - gcc
-
-matrix:
-  include:
-    - env: jobname=linux-gcc-default
-      os: linux
-      compiler:
-      addons:
-      before_install:
-    - env: jobname=linux-gcc-4.8
-      os: linux
-      dist: trusty
-      compiler:
-    - env: jobname=Linux32
-      os: linux
-      compiler:
-      addons:
-      services:
-        - docker
-      before_install:
-      script: ci/run-docker.sh
-    - env: jobname=linux-musl
-      os: linux
-      compiler:
-      addons:
-      services:
-        - docker
-      before_install:
-      script: ci/run-docker.sh
-    - env: jobname=StaticAnalysis
-      os: linux
-      compiler:
-      script: ci/run-static-analysis.sh
-      after_failure:
-    - env: jobname=Documentation
-      os: linux
-      compiler:
-      script: ci/test-documentation.sh
-      after_failure:
-
-before_install: ci/install-dependencies.sh
-script: ci/run-build-and-tests.sh
-after_failure: ci/print-test-failures.sh
-
-notifications:
-  email: false
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 711cb9171e..0e27b5395d 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -499,6 +499,33 @@ For Python scripts:
  - Where required libraries do not restrict us to Python 2, we try to
    also be compatible with Python 3.1 and later.
 
+
+Program Output
+
+ We make a distinction between a Git command's primary output and
+ output which is merely chatty feedback (for instance, status
+ messages, running transcript, or progress display), as well as error
+ messages. Roughly speaking, a Git command's primary output is that
+ which one might want to capture to a file or send down a pipe; its
+ chatty output should not interfere with these use-cases.
+
+ As such, primary output should be sent to the standard output stream
+ (stdout), and chatty output should be sent to the standard error
+ stream (stderr). Examples of commands which produce primary output
+ include `git log`, `git show`, and `git branch --list` which generate
+ output on the stdout stream.
+
+ Not all Git commands have primary output; this is often true of
+ commands whose main function is to perform an action. Some action
+ commands are silent, whereas others are chatty. An example of a
+ chatty action commands is `git clone` with its "Cloning into
+ '<path>'..." and "Checking connectivity..." status messages which it
+ sends to the stderr stream.
+
+ Error messages from Git commands should always be sent to the stderr
+ stream.
+
+
 Error Messages
 
  - Do not end error messages with a full stop.
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index b20bc8e914..63a2ef5449 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -905,19 +905,34 @@ Sending emails with Git is a two-part process; before you can prepare the emails
 themselves, you'll need to prepare the patches. Luckily, this is pretty simple:
 
 ----
-$ git format-patch --cover-letter -o psuh/ master..psuh
-----
-
-The `--cover-letter` parameter tells `format-patch` to create a cover letter
-template for you. You will need to fill in the template before you're ready
-to send - but for now, the template will be next to your other patches.
-
-The `-o psuh/` parameter tells `format-patch` to place the patch files into a
-directory. This is useful because `git send-email` can take a directory and
-send out all the patches from there.
-
-`master..psuh` tells `format-patch` to generate patches for the difference
-between `master` and `psuh`. It will make one patch file per commit. After you
+$ git format-patch --cover-letter -o psuh/ --base=auto psuh@{u}..psuh
+----
+
+ . The `--cover-letter` option tells `format-patch` to create a
+   cover letter template for you. You will need to fill in the
+   template before you're ready to send - but for now, the template
+   will be next to your other patches.
+
+ . The `-o psuh/` option tells `format-patch` to place the patch
+   files into a directory. This is useful because `git send-email`
+   can take a directory and send out all the patches from there.
+
+ . The `--base=auto` option tells the command to record the "base
+   commit", on which the recipient is expected to apply the patch
+   series.  The `auto` value will cause `format-patch` to compute
+   the base commit automatically, which is the merge base of tip
+   commit of the remote-tracking branch and the specified revision
+   range.
+
+ . The `psuh@{u}..psuh` option tells `format-patch` to generate
+   patches for the commits you created on the `psuh` branch since it
+   forked from its upstream (which is `origin/master` if you
+   followed the example in the "Set up your workspace" section).  If
+   you are already on the `psuh` branch, you can just say `@{u}`,
+   which means "commits on the current branch since it forked from
+   its upstream", which is the same thing.
+
+The command will make one patch file per commit. After you
 run, you can go have a look at each of the patches with your favorite text
 editor and make sure everything looks alright; however, it's not recommended to
 make code fixups via the patch file. It's a better idea to make the change the
diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index 45eb84d8b4..ca267941f3 100644
--- a/Documentation/MyFirstObjectWalk.txt
+++ b/Documentation/MyFirstObjectWalk.txt
@@ -58,14 +58,19 @@ running, enable trace output by setting the environment variable `GIT_TRACE`.
 
 Add usage text and `-h` handling, like all subcommands should consistently do
 (our test suite will notice and complain if you fail to do so).
+We'll need to include the `parse-options.h` header.
 
 ----
+#include "parse-options.h"
+
+...
+
 int cmd_walken(int argc, const char **argv, const char *prefix)
 {
 	const char * const walken_usage[] = {
 		N_("git walken"),
 		NULL,
-	}
+	};
 	struct option options[] = {
 		OPT_END()
 	};
@@ -195,9 +200,14 @@ Similarly to the default values, we don't have anything to do here yet
 ourselves; however, we should call `git_default_config()` if we aren't calling
 any other existing config callbacks.
 
-Add a new function to `builtin/walken.c`:
+Add a new function to `builtin/walken.c`.
+We'll also need to include the `config.h` header:
 
 ----
+#include "config.h"
+
+...
+
 static int git_walken_config(const char *var, const char *value, void *cb)
 {
 	/*
@@ -229,8 +239,14 @@ typically done by calling `repo_init_revisions()` with the repository you intend
 to target, as well as the `prefix` argument of `cmd_walken` and your `rev_info`
 struct.
 
-Add the `struct rev_info` and the `repo_init_revisions()` call:
+Add the `struct rev_info` and the `repo_init_revisions()` call.
+We'll also need to include the `revision.h` header:
+
 ----
+#include "revision.h"
+
+...
+
 int cmd_walken(int argc, const char **argv, const char *prefix)
 {
 	/* This can go wherever you like in your declarations.*/
@@ -624,9 +640,14 @@ static void walken_object_walk(struct rev_info *rev)
 ----
 
 Let's start by calling just the unfiltered walk and reporting our counts.
-Complete your implementation of `walken_object_walk()`:
+Complete your implementation of `walken_object_walk()`.
+We'll also need to include the `list-objects.h` header.
 
 ----
+#include "list-objects.h"
+
+...
+
 	traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL);
 
 	printf("commits %d\nblobs %d\ntags %d\ntrees %d\n", commit_count,
@@ -697,7 +718,7 @@ First, we'll need to `#include "list-objects-filter-options.h"` and set up the
 ----
 static void walken_object_walk(struct rev_info *rev)
 {
-	struct list_objects_filter_options filter_options = {};
+	struct list_objects_filter_options filter_options = { 0 };
 
 	...
 ----
diff --git a/Documentation/RelNotes/2.35.0.txt b/Documentation/RelNotes/2.35.0.txt
new file mode 100644
index 0000000000..d69b50d180
--- /dev/null
+++ b/Documentation/RelNotes/2.35.0.txt
@@ -0,0 +1,412 @@
+Git 2.35 Release Notes
+======================
+
+Updates since Git 2.34
+----------------------
+
+Backward compatibility warts
+
+ * "_" is now treated as any other URL-valid characters in an URL when
+   matching the per-URL configuration variable names.
+
+ * The color palette used by "git grep" has been updated to match that
+   of GNU grep.
+
+
+Note to those who build from the source
+
+ * You may need to define NO_UNCOMPRESS2 Makefile macro if you build
+   with zlib older than 1.2.9.
+
+ * If your compiler cannot grok C99, the build will fail.  See the
+   instruction at the beginning of git-compat-util.h if this happens
+   to you.
+
+
+UI, Workflows & Features
+
+ * "git status --porcelain=v2" now show the number of stash entries
+   with --show-stash like the normal output does.
+
+ * "git stash" learned the "--staged" option to stash away what has
+   been added to the index (and nothing else).
+
+ * "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
+   the newly created branch if "git init" is run.
+
+ * Various operating modes of "git reset" have been made to work
+   better with the sparse index.
+
+ * "git submodule deinit" for a submodule whose .git metadata
+   directory is embedded in its working tree refused to work, until
+   the submodule gets converted to use the "absorbed" form where the
+   metadata directory is stored in superproject, and a gitfile at the
+   top-level of the working tree of the submodule points at it.  The
+   command is taught to convert such submodules to the absorbed form
+   as needed.
+
+ * The completion script (in contrib/) learns that the "--date"
+   option of commands from the "git log" family takes "human" and
+   "auto" as valid values.
+
+ * "Zealous diff3" style of merge conflict presentation has been added.
+
+ * The "git log --format=%(describe)" placeholder has been extended to
+   allow passing selected command-line options to the underlying "git
+   describe" command.
+
+ * "default" and "reset" have been added to our color palette.
+
+ * The cryptographic signing using ssh keys can specify literal keys
+   for keytypes whose name do not begin with the "ssh-" prefix by
+   using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
+
+ * "git fetch" without the "--update-head-ok" option ought to protect
+   a checked out branch from getting updated, to prevent the working
+   tree that checks it out to go out of sync.  The code was written
+   before the use of "git worktree" got widespread, and only checked
+   the branch that was checked out in the current worktree, which has
+   been updated.
+
+ * "git name-rev" has been tweaked to give output that is shorter and
+   easier to understand.
+
+ * "git apply" has been taught to ignore a message without a patch
+   with the "--allow-empty" option.  It also learned to honor the
+   "--quiet" option given from the command line.
+
+ * The "init" and "set" subcommands in "git sparse-checkout" have been
+   unified for a better user experience and performance.
+
+ * Many git commands that deal with working tree files try to remove a
+   directory that becomes empty (i.e. "git switch" from a branch that
+   has the directory to another branch that does not would attempt
+   remove all files in the directory and the directory itself).  This
+   drops users into an unfamiliar situation if the command was run in
+   a subdirectory that becomes subject to removal due to the command.
+   The commands have been taught to keep an empty directory if it is
+   the directory they were started in to avoid surprising users.
+
+ * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is
+   done to a piece of e-mail without a patch in it.
+
+ * The default merge message prepared by "git merge" records the name
+   of the current branch; the name can be overridden with a new option
+   to allow users to pretend a merge is made on a different branch.
+
+ * The way "git p4" shows file sizes in its output has been updated to
+   use human-readable units.
+
+ * "git -c branch.autosetupmerge=inherit branch new old" makes "new"
+   to have the same upstream as the "old" branch, instead of marking
+   "old" itself as its upstream.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The use of errno as a means to carry the nature of error in the ref
+   API implementation has been reworked and reduced.
+
+ * Teach and encourage first-time contributors to this project to
+   state the base commit when they submit their topic.
+
+ * The command line completion for "git send-email" options have been
+   tweaked to make it easier to keep it in sync with the command itself.
+
+ * Ensure that the sparseness of the in-core index matches the
+   index.sparse configuration specified by the repository immediately
+   after the on-disk index file is read.
+
+ * Code clean-up to eventually allow information on remotes defined
+   for an arbitrary repository to be read.
+
+ * Build optimization.
+
+ * Tighten code for testing pack-bitmap.
+
+ * Weather balloon to break people with compilers that do not support
+   C99.
+
+ * The "reftable" backend for the refs API, without integrating into
+   the refs subsystem, has been added.
+
+ * More tests are marked as leak-free.
+
+ * The test framework learns to list unsatisfied test prerequisites,
+   and optionally error out when prerequisites that are expected to be
+   satisfied are not.
+
+ * The default setting for trace2 event nesting was too low to cause
+   test failures, which is worked around by bumping it up in the test
+   framework.
+
+ * Drop support for TravisCI and update test workflows at GitHub.
+
+ * Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+   mechanism to force "git" to use 'master' as the default name for
+   the initial branch no longer need it; the use of the mechanism from
+   them have been removed.
+
+ * Allow running our tests while disabling fsync.
+
+ * Document the parameters given to the reflog entry iterator callback
+   functions.
+   (merge e6e94f34b2 jc/reflog-iterator-callback-doc later to maint).
+
+ * The test helper for refs subsystem learned to write bogus and/or
+   nonexistent object name to refs to simulate error situations we
+   want to test Git in.
+
+ * "diff --histogram" optimization.
+
+ * Weather balloon to find compilers that do not grok variable
+   declaration in the for() loop.
+
+ * diff and blame commands have been taught to work better with sparse
+   index.
+
+ * The chainlint test script linter in the test suite has been updated.
+
+ * The DEVELOPER=yes build uses -std=gnu99 now.
+
+ * "git format-patch" uses a single rev_info instance and then exits.
+   Mark the structure with UNLEAK() macro to squelch leak sanitizer.
+
+ * New interface into the tmp-objdir API to help in-core use of the
+   quarantine feature.
+
+ * Broken &&-chains in the test scripts have been corrected.
+
+ * The RCS keyword substitution in "git p4" used to be done assuming
+   that the contents are UTF-8 text, which can trigger decoding
+   errors.  We now treat the contents as a bytestring for robustness
+   and correctness.
+
+ * The conditions to choose different definitions of the FLEX_ARRAY
+   macro for vendor compilers has been simplified to make it easier to
+   maintain.
+
+ * Correctness and performance update to "diff --color-moved" feature.
+
+ * "git upload-pack" (the other side of "git fetch") used a 8kB buffer
+   but most of its payload came on 64kB "packets".  The buffer size
+   has been enlarged so that such a packet fits.
+
+ * "git fetch" and "git pull" are now declared sparse-index clean.
+   Also "git ls-files" learns the "--sparse" option to help debugging.
+
+ * Similar message templates have been consolidated so that
+   translators need to work on fewer number of messages.
+
+
+Fixes since v2.34
+-----------------
+
+ * "git grep" looking in a blob that has non-UTF8 payload was
+   completely broken when linked with certain versions of PCREv2
+   library in the latest release.
+
+ * Other code cleanup, docfix, build fix, etc.
+
+ * "git pull" with any strategy when the other side is behind us
+   should succeed as it is a no-op, but doesn't.
+
+ * An earlier change in 2.34.0 caused JGit application (that abused
+   GIT_EDITOR mechanism when invoking "git config") to get stuck with
+   a SIGTTOU signal; it has been reverted.
+
+ * An earlier change that broke .gitignore matching has been reverted.
+
+ * Things like "git -c branch.sort=bogus branch new HEAD", i.e. the
+   operation modes of the "git branch" command that do not need the
+   sort key information, no longer errors out by seeing a bogus sort
+   key.
+   (merge 98e7ab6d42 jc/fix-ref-sorting-parse later to maint).
+
+ * The compatibility implementation for unsetenv(3) were written to
+   mimic ancient, non-POSIX, variant seen in an old glibc; it has been
+   changed to return an integer to match the more modern era.
+   (merge a38989bd5b jc/unsetenv-returns-an-int later to maint).
+
+ * The clean/smudge conversion code path has been prepared to better
+   work on platforms where ulong is narrower than size_t.
+   (merge 596b5e77c9 mc/clean-smudge-with-llp64 later to maint).
+
+ * Redact the path part of packfile URI that appears in the trace output.
+   (merge 0ba558ffb1 if/redact-packfile-uri later to maint).
+
+ * CI has been taught to catch some Unicode directional formatting
+   sequence that can be used in certain mischief.
+   (merge 0e7696c64d js/ci-no-directional-formatting later to maint).
+
+ * The "--date=format:<strftime>" gained a workaround for the lack of
+   system support for a non-local timezone to handle "%s" placeholder.
+   (merge 9b591b9403 jk/strbuf-addftime-seconds-since-epoch later to maint).
+
+ * The "merge" subcommand of "git jump" (in contrib/) silently ignored
+   pathspec and other parameters.
+   (merge 67ba13e5a4 jk/jump-merge-with-pathspec later to maint).
+
+ * The code to decode the length of packed object size has been
+   corrected.
+   (merge 34de5b8eac jt/pack-header-lshift-overflow later to maint).
+
+ * The advice message given by "git pull" when the user hasn't made a
+   choice between merge and rebase still said that the merge is the
+   default, which no longer is the case.  This has been corrected.
+   (merge 71076d0edd ah/advice-pull-has-no-preference-between-rebase-and-merge later to maint).
+
+ * "git fetch", when received a bad packfile, can fail with SIGPIPE.
+   This wasn't wrong per-se, but we now detect the situation and fail
+   in a more predictable way.
+   (merge 2a4aed42ec jk/fetch-pack-avoid-sigpipe-to-index-pack later to maint).
+
+ * The function to cull a child process and determine the exit status
+   had two separate code paths for normal callers and callers in a
+   signal handler, and the latter did not yield correct value when the
+   child has caught a signal.  The handling of the exit status has
+   been unified for these two code paths.  An existing test with
+   flakiness has also been corrected.
+   (merge 5263e22cba jk/t7006-sigpipe-tests-fix later to maint).
+
+ * When a non-existent program is given as the pager, we tried to
+   reuse an uninitialized child_process structure and crashed, which
+   has been fixed.
+   (merge f917f57f40 em/missing-pager later to maint).
+
+ * The single-key-input mode in "git add -p" had some code to handle
+   keys that generate a sequence of input via ReadKey(), which did not
+   handle end-of-file correctly, which has been fixed.
+   (merge fc8a8126df cb/add-p-single-key-fix later to maint).
+
+ * "git rebase -x" added an unnecessary 'exec' instructions before
+   'noop', which has been corrected.
+   (merge cc9dcdee61 en/rebase-x-fix later to maint).
+
+ * When the "git push" command is killed while the receiving end is
+   trying to report what happened to the ref update proposals, the
+   latter used to die, due to SIGPIPE.  The code now ignores SIGPIPE
+   to increase our chances to run the post-receive hook after it
+   happens.
+   (merge d34182b9e3 rj/receive-pack-avoid-sigpipe-during-status-reporting later to maint).
+
+ * "git worktree add" showed "Preparing worktree" message to the
+   standard output stream, but when it failed, the message from die()
+   went to the standard error stream.  Depending on the order the
+   stdio streams are flushed at the program end, this resulted in
+   confusing output.  It has been corrected by sending all the chatty
+   messages to the standard error stream.
+   (merge b50252484f es/worktree-chatty-to-stderr later to maint).
+
+ * Coding guideline document has been updated to clarify what goes to
+   standard error in our system.
+   (merge e258eb4800 es/doc-stdout-vs-stderr later to maint).
+
+ * The sparse-index/sparse-checkout feature had a bug in its use of
+   the matching code to determine which path is in or outside the
+   sparse checkout patterns.
+   (merge 8c5de0d265 ds/sparse-deep-pattern-checkout-fix later to maint).
+
+ * "git rebase -x" by mistake started exporting the GIT_DIR and
+   GIT_WORK_TREE environment variables when the command was rewritten
+   in C, which has been corrected.
+   (merge 434e0636db en/rebase-x-wo-git-dir-env later to maint).
+
+ * When "git log" implicitly enabled the "decoration" processing
+   without being explicitly asked with "--decorate" option, it failed
+   to read and honor the settings given by the "--decorate-refs"
+   option.
+
+ * "git fetch --set-upstream" did not check if there is a current
+   branch, leading to a segfault when it is run on a detached HEAD,
+   which has been corrected.
+   (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint).
+
+ * Among some code paths that ask an yes/no question, only one place
+   gave a prompt that looked different from the others, which has been
+   updated to match what the others create.
+   (merge 0fc8ed154c km/help-prompt-fix later to maint).
+
+ * "git log --invert-grep --author=<name>" used to exclude commits
+   written by the given author, but now "--invert-grep" only affects
+   the matches made by the "--grep=<pattern>" option.
+   (merge 794c000267 rs/log-invert-grep-with-headers later to maint).
+
+ * "git grep --perl-regexp" failed to match UTF-8 characters with
+   wildcard when the pattern consists only of ASCII letters, which has
+   been corrected.
+   (merge 32e3e8bc55 rs/pcre2-utf later to maint).
+
+ * Certain sparse-checkout patterns that are valid in non-cone mode
+   led to segfault in cone mode, which has been corrected.
+
+ * Use of certain "git rev-list" options with "git fast-export"
+   created nonsense results (the worst two of which being "--reverse"
+   and "--invert-grep --grep=<foo>").  The use of "--first-parent" is
+   made to behave a bit more sensible than before.
+   (merge 726a228dfb ws/fast-export-with-revision-options later to maint).
+
+ * Perf tests were run with end-user's shell, but it has been
+   corrected to use the shell specified by $TEST_SHELL_PATH.
+   (merge 9ccab75608 ja/perf-use-specified-shell later to maint).
+
+ * Fix dependency rules to generate hook-list.h header file.
+   (merge d3fd1a6667 ab/makefile-hook-list-dependency-fix later to maint).
+
+ * "git stash" by default triggers its "push" action, but its
+   implementation also made "git stash -h" to show short help only for
+   "git stash push", which has been corrected.
+   (merge ca7990cea5 ab/do-not-limit-stash-help-to-push later to maint).
+
+ * "git apply --3way" bypasses the attempt to do a three-way
+   application in more cases to address the regression caused by the
+   recent change to use direct application as a fallback.
+   (merge 34d607032c jz/apply-3-corner-cases later to maint).
+
+ * Fix performance-releated bug in "git subtree" (in contrib/).
+   (merge 3ce8888fb4 jl/subtree-check-parents-argument-passing-fix later to maint).
+
+ * Extend the guidance to choose the base commit to build your work
+   on, and hint/nudge contributors to read others' changes.
+   (merge fdfae830f8 jc/doc-submitting-patches-choice-of-base later to maint).
+
+ * A corner case bug in the ort merge strategy has been corrected.
+   (merge d30126c20d en/merge-ort-renorm-with-rename-delete-conflict-fix later to maint).
+
+ * "git stash apply" forgot to attempt restoring untracked files when
+   it failed to restore changes to tracked ones.
+   (merge 71cade5a0b en/stash-df-fix later to maint).
+
+ * Calling dynamically loaded functions on Windows has been corrected.
+   (merge 4a9b204920 ma/windows-dynload-fix later to maint).
+
+ * Some lockfile code called free() in signal-death code path, which
+   has been corrected.
+   (merge 58d4d7f1c5 ps/lockfile-cleanup-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
+   (merge f9b2b6684d ja/doc-cleanup later to maint).
+   (merge 7d1b866778 jc/fix-first-object-walk later to maint).
+   (merge 538ac74604 js/trace2-avoid-recursive-errors later to maint).
+   (merge 152923b132 jk/t5319-midx-corruption-test-deflake later to maint).
+   (merge 9081a421a6 ab/checkout-branch-info-leakfix later to maint).
+   (merge 42c456ff81 rs/mergesort later to maint).
+   (merge ad506e6780 tl/midx-docfix later to maint).
+   (merge bf5b83fd8a hk/ci-checkwhitespace-commentfix later to maint).
+   (merge 49f1eb3b34 jk/refs-g11-workaround later to maint).
+   (merge 7d3fc7df70 jt/midx-doc-fix later to maint).
+   (merge 7b089120d9 hn/create-reflog-simplify later to maint).
+   (merge 9e12400da8 cb/mingw-gmtime-r later to maint).
+   (merge 0bf0de6cc7 tb/pack-revindex-on-disk-cleanup later to maint).
+   (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint).
+   (merge eafd6e7e55 ab/die-with-bug later to maint).
+   (merge 91028f7659 jc/grep-patterntype-default-doc later to maint).
+   (merge 47ca93d071 ds/repack-fixlets later to maint).
+   (merge e6a9bc0c60 rs/t4202-invert-grep-test-fix later to maint).
+   (merge deb5407a42 gh/gpg-doc-markup-fix later to maint).
+   (merge 999bba3e0b rs/daemon-plug-leak later to maint).
+   (merge 786eb1ba39 js/l10n-mention-ngettext-early-in-readme later to maint).
+   (merge 2f12b31b74 ab/makefile-msgfmt-wo-stats later to maint).
+   (merge 0517f591ca fs/gpg-unknown-key-test-fix later to maint).
+   (merge 97d6fb5a1f ma/header-dup-cleanup later to maint).
diff --git a/Documentation/RelNotes/2.35.1.txt b/Documentation/RelNotes/2.35.1.txt
new file mode 100644
index 0000000000..726ba250ef
--- /dev/null
+++ b/Documentation/RelNotes/2.35.1.txt
@@ -0,0 +1,6 @@
+Git v2.35.1 Release Notes
+=========================
+
+Git 2.35 shipped with a regression that broke use of "rebase" and
+"stash" in a secondary worktree.  This maintenance release ought to
+fix it.
diff --git a/Documentation/RelNotes/2.35.2.txt b/Documentation/RelNotes/2.35.2.txt
new file mode 100644
index 0000000000..290bfa9ea4
--- /dev/null
+++ b/Documentation/RelNotes/2.35.2.txt
@@ -0,0 +1,7 @@
+Git v2.35.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3,
+v2.31.2, v2.32.1, v2.33.2 and v2.34.2 to address the security
+issue CVE-2022-24765; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.35.3.txt b/Documentation/RelNotes/2.35.3.txt
new file mode 100644
index 0000000000..5458ba3441
--- /dev/null
+++ b/Documentation/RelNotes/2.35.3.txt
@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.35.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.35.3.
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 11e03056f2..92b80d94d4 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -19,8 +19,10 @@ change is relevant to.
   base your work on the tip of the topic.
 
 * A new feature should be based on `master` in general. If the new
-  feature depends on a topic that is in `seen`, but not in `master`,
-  base your work on the tip of that topic.
+  feature depends on other topics that are in `next`, but not in
+  `master`, fork a branch from the tip of `master`, merge these topics
+  to the branch, and work on that branch.  You can remind yourself of
+  how you prepared the base with `git log --first-parent master..`.
 
 * Corrections and enhancements to a topic not yet in `master` should
   be based on the tip of that topic. If the topic has not been merged
@@ -28,10 +30,10 @@ change is relevant to.
   into the series.
 
 * In the exceptional case that a new feature depends on several topics
-  not in `master`, start working on `next` or `seen` privately and send
-  out patches for discussion. Before the final merge, you may have to
-  wait until some of the dependent topics graduate to `master`, and
-  rebase your work.
+  not in `master`, start working on `next` or `seen` privately and
+  send out patches only for discussion. Once your new feature starts
+  to stabilize, you would have to rebase it (see the "depends on other
+  topics" above).
 
 * Some parts of the system have dedicated maintainers with their own
   repositories (see the section "Subsystems" below).  Changes to
@@ -71,8 +73,13 @@ Make sure that you have tests for the bug you are fixing.  See
 [[tests]]
 When adding a new feature, make sure that you have new tests to show
 the feature triggers the new behavior when it should, and to show the
-feature does not trigger when it shouldn't.  After any code change, make
-sure that the entire test suite passes.
+feature does not trigger when it shouldn't.  After any code change,
+make sure that the entire test suite passes.  When fixing a bug, make
+sure you have new tests that break if somebody else breaks what you
+fixed by accident to avoid regression.  Also, try merging your work to
+'next' and 'seen' and make sure the tests still pass; topics by others
+that are still in flight may have unexpected interactions with what
+you are trying to do in your topic.
 
 Pushing to a fork of https://github.com/git/git will use their CI
 integration to test your changes on Linux, Mac and Windows. See the
@@ -144,8 +151,21 @@ without external resources. Instead of giving a URL to a mailing list
 archive, summarize the relevant points of the discussion.
 
 [[commit-reference]]
-If you want to reference a previous commit in the history of a stable
-branch, use the format "abbreviated hash (subject, date)", like this:
+
+There are a few reasons why you may want to refer to another commit in
+the "more stable" part of the history (i.e. on branches like `maint`,
+`master`, and `next`):
+
+. A commit that introduced the root cause of a bug you are fixing.
+
+. A commit that introduced a feature that you are enhancing.
+
+. A commit that conflicts with your work when you made a trial merge
+  of your work into `next` and `seen` for testing.
+
+When you reference a commit on a more stable branch (like `master`,
+`maint` and `next`), use the format "abbreviated hash (subject,
+date)", like this:
 
 ....
 	Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
@@ -259,9 +279,11 @@ Please make sure your patch does not add commented out debugging code,
 or include any extra files which do not relate to what your patch
 is trying to achieve. Make sure to review
 your patch after generating it, to ensure accuracy.  Before
-sending out, please make sure it cleanly applies to the `master`
-branch head.  If you are preparing a work based on "next" branch,
-that is fine, but please mark it as such.
+sending out, please make sure it cleanly applies to the base you
+have chosen in the "Decide what to base your work on" section,
+and unless it targets the `master` branch (which is the default),
+mark your patches as such.
+
 
 [[send-patches]]
 === Sending your patches.
@@ -365,7 +387,10 @@ Security mailing list{security-ml-ref}.
 Send your patch with "To:" set to the mailing list, with "cc:" listing
 people who are involved in the area you are touching (the `git
 contacts` command in `contrib/contacts/` can help to
-identify them), to solicit comments and reviews.
+identify them), to solicit comments and reviews.  Also, when you made
+trial merges of your topic to `next` and `seen`, you may have noticed
+work by others conflicting with your changes.  There is a good possibility
+that these people may know the area you are touching well.
 
 :current-maintainer: footnote:[The current maintainer: gitster@pobox.com]
 :git-ml: footnote:[The mailing list: git@vger.kernel.org]
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cdff79b78d..8d3f518083 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -262,11 +262,19 @@ color::
        colors (at most two, one for foreground and one for background)
        and attributes (as many as you want), separated by spaces.
 +
-The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
-`blue`, `magenta`, `cyan` and `white`.  The first color given is the
-foreground; the second is the background.  All the basic colors except
-`normal` have a bright variant that can be specified by prefixing the
-color with `bright`, like `brightred`.
+The basic colors accepted are `normal`, `black`, `red`, `green`,
+`yellow`, `blue`, `magenta`, `cyan`, `white` and `default`.  The first
+color given is the foreground; the second is the background.  All the
+basic colors except `normal` and `default` have a bright variant that can
+be specified by prefixing the color with `bright`, like `brightred`.
++
+The color `normal` makes no change to the color. It is the same as an
+empty string, but can be used as the foreground color when specifying a
+background color alone (for example, "normal red").
++
+The color `default` explicitly resets the color to the terminal default,
+for example to specify a cleared background. Although it varies between
+terminals, this is usually not the same as setting to "white black".
 +
 Colors may also be given as numbers between 0 and 255; these use ANSI
 256-color mode (but note that not all terminals may support this).  If
@@ -280,6 +288,11 @@ The position of any attributes with respect to the colors
 be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
 `no-ul`, etc).
 +
+The pseudo-attribute `reset` resets all colors and attributes before
+applying the specified coloring. For example, `reset green` will result
+in a green foreground and default background without any active
+attributes.
++
 An empty color string produces no color effect at all. This can be used
 to avoid coloring specific elements without disabling color entirely.
 +
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index d323d7327f..1e0c7af014 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -7,7 +7,8 @@ branch.autoSetupMerge::
 	automatic setup is done; `true` -- automatic setup is done when the
 	starting point is a remote-tracking branch; `always` --
 	automatic setup is done when the starting point is either a
-	local branch or remote-tracking
+	local branch or remote-tracking branch; `inherit` -- if the starting point
+	has a tracking configuration, it is copied to the new
 	branch. This option defaults to true.
 
 branch.autoSetupRebase::
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index 4f30c7dbdd..0cb189a077 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -34,7 +34,7 @@ gpg.minTrustLevel::
 * `fully`
 * `ultimate`
 
-gpg.ssh.defaultKeyCommand:
+gpg.ssh.defaultKeyCommand::
 	This command that will be run when user.signingkey is not set and a ssh
 	signature is requested. On successful exit a valid ssh public key is
 	expected in the	first line of its output. To automatically use the first
@@ -44,7 +44,7 @@ gpg.ssh.allowedSignersFile::
 	A file containing ssh public keys which you are willing to trust.
 	The file consists of one or more lines of principals followed by an ssh
 	public key.
-	e.g.: user1@example.com,user2@example.com ssh-rsa AAAAX1...
+	e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...`
 	See ssh-keygen(1) "ALLOWED SIGNERS" for details.
 	The principal is only used to identify the key and is available when
 	verifying a signature.
@@ -64,6 +64,11 @@ A repository that only allows signed commits can store the file
 in the repository itself using a path relative to the top-level of the working tree.
 This way only committers with an already valid key can add or change keys in the keyring.
 +
+Since OpensSSH 8.8 this file allows specifying a key lifetime using valid-after &
+valid-before options. Git will mark signatures as valid if the signing key was
+valid at the time of the signatures creation. This allows users to change a
+signing key without invalidating all previously made signatures.
++
 Using a SSH CA key with the cert-authority option
 (see ssh-keygen(1) "CERTIFICATES") is also valid.
 
diff --git a/Documentation/config/grep.txt b/Documentation/config/grep.txt
index 44abe45a7c..182edd813a 100644
--- a/Documentation/config/grep.txt
+++ b/Documentation/config/grep.txt
@@ -8,7 +8,8 @@ grep.patternType::
 	Set the default matching behavior. Using a value of 'basic', 'extended',
 	'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
 	`--fixed-strings`, or `--perl-regexp` option accordingly, while the
-	value 'default' will return to the default matching behavior.
+	value 'default' will use the `grep.extendedRegexp` option to choose
+	between 'basic' and 'extended'.
 
 grep.extendedRegexp::
 	If set to true, enable `--extended-regexp` option by default. This
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index e27cc63944..99e83dd36e 100644
--- a/Documentation/config/merge.txt
+++ b/Documentation/config/merge.txt
@@ -4,7 +4,14 @@ merge.conflictStyle::
 	shows a `<<<<<<<` conflict marker, changes made by one side,
 	a `=======` marker, changes made by the other side, and then
 	a `>>>>>>>` marker.  An alternate style, "diff3", adds a `|||||||`
-	marker and the original text before the `=======` marker.
+	marker and the original text before the `=======` marker.  The
+	"merge" style tends to produce smaller conflict regions than diff3,
+	both because of the exclusion of the original text, and because
+	when a subset of lines match on the two sides they are just pulled
+	out of the conflict region.  Another alternate style, "zdiff3", is
+	similar to diff3 but removes matching lines on the two sides from
+	the conflict region when those matching lines appear near either
+	the beginning or end of a conflict region.
 
 merge.defaultToUpstream::
 	If merge is called without any commit argument, merge the upstream
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index ad78dce9ec..ec9233b060 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -36,10 +36,13 @@ user.signingKey::
 	commit, you can override the default selection with this variable.
 	This option is passed unchanged to gpg's --local-user parameter,
 	so you may specify a key using any method that gpg supports.
-	If gpg.format is set to "ssh" this can contain the literal ssh public
-	key (e.g.: "ssh-rsa XXXXXX identifier") or a file which contains it and
-	corresponds to the private key used for signing. The private key
-	needs to be available via ssh-agent. Alternatively it can be set to
-	a file containing a private key directly. If not set git will call
-	gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the first
-	key available.
+	If gpg.format is set to `ssh` this can contain the path to either
+	your private ssh key or the public key when ssh-agent is used.
+	Alternatively it can contain a public key prefixed with `key::`
+	directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
+	needs to be available via ssh-agent. If not set git will call
+	gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
+	first key available. For backward compatibility, a raw key which
+	begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
+	as "key::ssh-rsa XXXXXX identifier", but this form is deprecated;
+	use the `key::` form instead.
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 99c455f51c..67645cae64 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -5,9 +5,9 @@ The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables
 support the following date formats:
 
 Git internal format::
-	It is `<unix timestamp> <time zone offset>`, where `<unix
-	timestamp>` is the number of seconds since the UNIX epoch.
-	`<time zone offset>` is a positive or negative offset from UTC.
+	It is `<unix-timestamp> <time-zone-offset>`, where
+	`<unix-timestamp>` is the number of seconds since the UNIX epoch.
+	`<time-zone-offset>` is a positive or negative offset from UTC.
 	For example CET (which is 1 hour ahead of UTC) is `+0100`.
 
 RFC 2822::
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 0a4a984dfd..09107fb106 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -16,8 +16,9 @@ SYNOPSIS
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 	 [--quoted-cr=<action>]
+	 [--empty=(stop|drop|keep)]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)
 
 DESCRIPTION
 -----------
@@ -63,6 +64,14 @@ OPTIONS
 --quoted-cr=<action>::
 	This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 
+--empty=(stop|drop|keep)::
+	By default, or when the option is set to 'stop', the command
+	errors out on an input e-mail message lacking a patch
+	and stops into the middle of the current am session. When this
+	option is set to 'drop', skip such an e-mail message instead.
+	When this option is set to 'keep', create an empty commit,
+	recording the contents of the e-mail message as its log.
+
 -m::
 --message-id::
 	Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
@@ -191,6 +200,11 @@ default.   You can use `--no-utf8` to override this.
 	the e-mail message; if `diff`, show the diff portion only.
 	Defaults to `raw`.
 
+--allow-empty::
+	After a patch failure on an input e-mail message lacking a patch,
+	create an empty commit with the contents of the e-mail message
+	as its log message.
+
 DISCUSSION
 ----------
 
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index aa1ae56a25..b6d77f4206 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 	  [--ignore-space-change | --ignore-whitespace]
 	  [--whitespace=(nowarn|warn|fix|error|error-all)]
 	  [--exclude=<path>] [--include=<path>] [--directory=<root>]
-	  [--verbose] [--unsafe-paths] [<patch>...]
+	  [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -228,6 +228,11 @@ behavior:
 	current patch being applied will be printed. This option will cause
 	additional information to be reported.
 
+-q::
+--quiet::
+	Suppress stderr output. Messages about patch status and progress
+	will not be printed.
+
 --recount::
 	Do not trust the line counts in the hunk headers, but infer them
 	by inspecting the patch (e.g. after editing the patch without
@@ -251,6 +256,10 @@ When `git apply` is used as a "better GNU patch", the user can pass
 the `--unsafe-paths` option to override this safety check.  This option
 has no effect when `--index` or `--cached` is in use.
 
+--allow-empty::
+	Don't return error for patches containing no diff. This includes
+	empty patches and patches with commit text only.
+
 CONFIGURATION
 -------------
 
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index a595a0ffee..847777fd17 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git
 SYNOPSIS
 --------
 [verse]
-'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
-               <archive/branch>[:<git-branch>] ...
+'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]
+	       <archive>/<branch>[:<git-branch>]...
 
 DESCRIPTION
 -----------
 Imports a project from one or more GNU Arch repositories.
 It will follow branches
-and repositories within the namespaces defined by the <archive/branch>
+and repositories within the namespaces defined by the <archive>/<branch>
 parameters supplied. If it cannot find the remote branch a merge comes from
 it will just import it as a regular commit. If it can find it, it will mark it
 as a merge whenever possible (see discussion below).
@@ -27,7 +27,7 @@ import new branches within the provided roots.
 
 It expects to be dealing with one project only. If it sees
 branches that have different roots, it will refuse to run. In that case,
-edit your <archive/branch> parameters to define clearly the scope of the
+edit your <archive>/<branch> parameters to define clearly the scope of the
 import.
 
 'git archimport' uses `tla` extensively in the background to access the
@@ -42,7 +42,7 @@ incremental imports.
 
 While 'git archimport' will try to create sensible branch names for the
 archives that it imports, it is also possible to specify Git branch names
-manually.  To do so, write a Git branch name after each <archive/branch>
+manually.  To do so, write a Git branch name after each <archive>/<branch>
 parameter, separated by a colon.  This way, you can shorten the Arch
 branch names and convert Arch jargon to Git jargon, for example mapping a
 "PROJECT{litdd}devo{litdd}VERSION" branch to "master".
@@ -104,8 +104,8 @@ OPTIONS
 	Override the default tempdir.
 
 
-<archive/branch>::
-	Archive/branch identifier in a format that `tla log` understands.
+<archive>/<branch>::
+	<archive>/<branch> identifier in a format that `tla log` understands.
 
 
 GIT
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 8af42eff89..731e340cbc 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -16,7 +16,7 @@ SYNOPSIS
 	[--points-at <object>] [--format=<format>]
 	[(-r | --remotes) | (-a | --all)]
 	[--list] [<pattern>...]
-'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]
+'git branch' [--track[=(direct|inherit)] | --no-track] [-f] <branchname> [<start-point>]
 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 'git branch' --unset-upstream [<branchname>]
 'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -206,24 +206,34 @@ This option is only applicable in non-verbose mode.
 	Display the full sha1s in the output listing rather than abbreviating them.
 
 -t::
---track::
+--track[=(direct|inherit)]::
 	When creating a new branch, set up `branch.<name>.remote` and
-	`branch.<name>.merge` configuration entries to mark the
-	start-point branch as "upstream" from the new branch. This
+	`branch.<name>.merge` configuration entries to set "upstream" tracking
+	configuration for the new branch. This
 	configuration will tell git to show the relationship between the
 	two branches in `git status` and `git branch -v`. Furthermore,
 	it directs `git pull` without arguments to pull from the
 	upstream when the new branch is checked out.
 +
-This behavior is the default when the start point is a remote-tracking branch.
+The exact upstream branch is chosen depending on the optional argument:
+`-t`, `--track`, or `--track=direct` means to use the start-point branch
+itself as the upstream; `--track=inherit` means to copy the upstream
+configuration of the start-point branch.
++
+`--track=direct` is the default when the start point is a remote-tracking branch.
 Set the branch.autoSetupMerge configuration variable to `false` if you
 want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
 were given. Set it to `always` if you want this behavior when the
-start-point is either a local or remote-tracking branch.
+start-point is either a local or remote-tracking branch. Set it to
+`inherit` if you want to copy the tracking configuration from the
+branch point.
++
+See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on
+how the `branch.<name>.remote` and `branch.<name>.merge` options are used.
 
 --no-track::
 	Do not set up "upstream" configuration, even if the
-	branch.autoSetupMerge configuration variable is true.
+	branch.autoSetupMerge configuration variable is set.
 
 --set-upstream::
 	As this option had confusing syntax, it is no longer supported.
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d473c9bf38..9f37e22e13 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git checkout' [-q] [-f] [-m] [<branch>]
 'git checkout' [-q] [-f] [-m] --detach [<branch>]
 'git checkout' [-q] [-f] [-m] [--detach] <commit>
-'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
+'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...
 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
 'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
@@ -43,7 +43,7 @@ You could omit `<branch>`, in which case the command degenerates to
 rather expensive side-effects to show only the tracking information,
 if exists, for the current branch.
 
-'git checkout' -b|-B <new_branch> [<start point>]::
+'git checkout' -b|-B <new-branch> [<start-point>]::
 
 	Specifying `-b` causes a new branch to be created as if
 	linkgit:git-branch[1] were called and then checked out.  In
@@ -52,11 +52,11 @@ if exists, for the current branch.
 	`--track` without `-b` implies branch creation; see the
 	description of `--track` below.
 +
-If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it
+If `-B` is given, `<new-branch>` is created if it doesn't exist; otherwise, it
 is reset. This is the transactional equivalent of
 +
 ------------
-$ git branch -f <branch> [<start point>]
+$ git branch -f <branch> [<start-point>]
 $ git checkout <branch>
 ------------
 +
@@ -145,18 +145,18 @@ as `ours` (i.e. "our shared canonical history"), while what you did
 on your side branch as `theirs` (i.e. "one contributor's work on top
 of it").
 
--b <new_branch>::
-	Create a new branch named `<new_branch>` and start it at
-	`<start_point>`; see linkgit:git-branch[1] for details.
+-b <new-branch>::
+	Create a new branch named `<new-branch>` and start it at
+	`<start-point>`; see linkgit:git-branch[1] for details.
 
--B <new_branch>::
-	Creates the branch `<new_branch>` and start it at `<start_point>`;
-	if it already exists, then reset it to `<start_point>`. This is
+-B <new-branch>::
+	Creates the branch `<new-branch>` and start it at `<start-point>`;
+	if it already exists, then reset it to `<start-point>`. This is
 	equivalent to running "git branch" with "-f"; see
 	linkgit:git-branch[1] for details.
 
 -t::
---track::
+--track[=(direct|inherit)]::
 	When creating a new branch, set up "upstream" configuration. See
 	"--track" in linkgit:git-branch[1] for details.
 +
@@ -210,16 +210,16 @@ variable.
 	`<commit>` is not a branch name.  See the "DETACHED HEAD" section
 	below for details.
 
---orphan <new_branch>::
-	Create a new 'orphan' branch, named `<new_branch>`, started from
-	`<start_point>` and switch to it.  The first commit made on this
+--orphan <new-branch>::
+	Create a new 'orphan' branch, named `<new-branch>`, started from
+	`<start-point>` and switch to it.  The first commit made on this
 	new branch will have no parents and it will be the root of a new
 	history totally disconnected from all the other branches and
 	commits.
 +
 The index and the working tree are adjusted as if you had previously run
-`git checkout <start_point>`.  This allows you to start a new history
-that records a set of paths similar to `<start_point>` by easily running
+`git checkout <start-point>`.  This allows you to start a new history
+that records a set of paths similar to `<start-point>` by easily running
 `git commit -a` to make the root commit.
 +
 This can be useful when you want to publish the tree from a commit
@@ -229,7 +229,7 @@ whose full history contains proprietary or otherwise encumbered bits of
 code.
 +
 If you want to start a disconnected history that records a set of paths
-that is totally different from the one of `<start_point>`, then you should
+that is totally different from the one of `<start-point>`, then you should
 clear the index and the working tree right after creating the orphan
 branch by running `git rm -rf .` from the top level of the working tree.
 Afterwards you will be ready to prepare your new files, repopulating the
@@ -266,8 +266,7 @@ When switching branches with `--merge`, staged changes may be lost.
 	The same as `--merge` option above, but changes the way the
 	conflicting hunks are presented, overriding the
 	`merge.conflictStyle` configuration variable.  Possible values are
-	"merge" (default) and "diff3" (in addition to what is shown by
-	"merge" style, shows the original contents).
+	"merge" (default), "diff3", and "zdiff3".
 
 -p::
 --patch::
@@ -341,10 +340,10 @@ As a special case, you may use `A...B` as a shortcut for the
 merge base of `A` and `B` if there is exactly one merge base. You can
 leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 
-<new_branch>::
+<new-branch>::
 	Name for the new branch.
 
-<start_point>::
+<start-point>::
 	The name of a commit at which to start the new branch; see
 	linkgit:git-branch[1] for details. Defaults to `HEAD`.
 +
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 5d750314b2..78dcc9171f 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -8,7 +8,7 @@ git-cherry-pick - Apply the changes introduced by some existing commits
 SYNOPSIS
 --------
 [verse]
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
+'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
 		  [-S[<keyid>]] <commit>...
 'git cherry-pick' (--continue | --skip | --abort | --quit)
 
@@ -81,8 +81,8 @@ OPTIONS
 	described above, and `-r` was to disable it.  Now the
 	default is not to do `-x` so this option is a no-op.
 
--m parent-number::
---mainline parent-number::
+-m <parent-number>::
+--mainline <parent-number>::
 	Usually you cannot cherry-pick a merge because you do not know which
 	side of the merge should be considered the mainline.  This
 	option specifies the parent number (starting from 1) of
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 3fe3810f1c..984d194934 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -9,10 +9,10 @@ git-clone - Clone a repository into a new directory
 SYNOPSIS
 --------
 [verse]
-'git clone' [--template=<template_directory>]
+'git clone' [--template=<template-directory>]
 	  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
 	  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
-	  [--dissociate] [--separate-git-dir <git dir>]
+	  [--dissociate] [--separate-git-dir <git-dir>]
 	  [--depth <depth>] [--[no-]single-branch] [--no-tags]
 	  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
 	  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
@@ -167,10 +167,10 @@ objects from the source repository into a pack in the cloned repository.
 	configuration variables are created.
 
 --sparse::
-	Initialize the sparse-checkout file so the working
-	directory starts with only the files in the root
-	of the repository. The sparse-checkout file can be
-	modified to grow the working directory as needed.
+	Employ a sparse-checkout, with only files in the toplevel
+	directory initially being present.  The
+	linkgit:git-sparse-checkout[1] command can be used to grow the
+	working directory as needed.
 
 --filter=<filter-spec>::
 	Use the partial clone feature and request that the server sends
@@ -211,7 +211,7 @@ objects from the source repository into a pack in the cloned repository.
 	via ssh, this specifies a non-default path for the command
 	run on the other end.
 
---template=<template_directory>::
+--template=<template-directory>::
 	Specify the directory from which templates will be used;
 	(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
 
@@ -294,7 +294,7 @@ or `--mirror` is given)
 	superproject's recorded SHA-1. Equivalent to passing `--remote` to
 	`git submodule update`.
 
---separate-git-dir=<git dir>::
+--separate-git-dir=<git-dir>::
 	Instead of placing the cloned repository where it is supposed
 	to be, place the cloned repository at the specified directory,
 	then make a filesystem-agnostic Git symbolic link to there.
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 992225f612..2285effb36 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -9,20 +9,20 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
-'git config' [<file-option>] [--type=<type>] --add name value
-'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
-'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
-'git config' [<file-option>] [--fixed-value] --unset name [value-pattern]
-'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
-'git config' [<file-option>] --rename-section old_name new_name
-'git config' [<file-option>] --remove-section name
+'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
+'git config' [<file-option>] [--type=<type>] --add <name> <value>
+'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
+'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
+'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
+'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
+'git config' [<file-option>] --rename-section <old-name> <new-name>
+'git config' [<file-option>] --remove-section <name>
 'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
-'git config' [<file-option>] --get-color name [default]
-'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
+'git config' [<file-option>] --get-color <name> [<default>]
+'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
 'git config' [<file-option>] -e | --edit
 
 DESCRIPTION
@@ -102,9 +102,9 @@ OPTIONS
 	in which section and variable names are lowercased, but subsection
 	names are not.
 
---get-urlmatch name URL::
+--get-urlmatch <name> <URL>::
 	When given a two-part name section.key, the value for
-	section.<url>.key whose <url> part matches the best to the
+	section.<URL>.key whose <URL> part matches the best to the
 	given URL is returned (if no such key exists, the value for
 	section.key is used as a fallback).  When given just the
 	section as name, do so for all the keys in the section and
@@ -145,8 +145,8 @@ See also <<FILES>>.
 	read from or written to if `extensions.worktreeConfig` is
 	present. If not it's the same as `--local`.
 
--f config-file::
---file config-file::
+-f <config-file>::
+--file <config-file>::
 	For writing options: write to the specified file rather than the
 	repository `.git/config`.
 +
@@ -155,7 +155,7 @@ available files.
 +
 See also <<FILES>>.
 
---blob blob::
+--blob <blob>::
 	Similar to `--file` but use the given blob instead of a file. E.g.
 	you can use 'master:.gitmodules' to read values from the file
 	'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
@@ -246,18 +246,18 @@ Valid `<type>`'s include:
 	all queried config options with the scope of that value
 	(local, global, system, command).
 
---get-colorbool name [stdout-is-tty]::
+--get-colorbool <name> [<stdout-is-tty>]::
 
-	Find the color setting for `name` (e.g. `color.diff`) and output
-	"true" or "false".  `stdout-is-tty` should be either "true" or
+	Find the color setting for `<name>` (e.g. `color.diff`) and output
+	"true" or "false".  `<stdout-is-tty>` should be either "true" or
 	"false", and is taken into account when configuration says
-	"auto".  If `stdout-is-tty` is missing, then checks the standard
+	"auto".  If `<stdout-is-tty>` is missing, then checks the standard
 	output of the command itself, and exits with status 0 if color
 	is to be used, or exits with status 1 otherwise.
 	When the color setting for `name` is undefined, the command uses
 	`color.ui` as fallback.
 
---get-color name [default]::
+--get-color <name> [<default>]::
 
 	Find the color configured for `name` (e.g. `color.diff.new`) and
 	output it as the ANSI color escape sequence to the standard
diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 206e3c5f40..f18673017f 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -8,7 +8,7 @@ git-credential - Retrieve and store user credentials
 SYNOPSIS
 --------
 ------------------
-git credential <fill|approve|reject>
+'git credential' (fill|approve|reject)
 ------------------
 
 DESCRIPTION
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 00154b6c85..41c8a8a05c 100644
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -9,8 +9,8 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
 SYNOPSIS
 --------
 [verse]
-'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
-	[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]
+	[-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>
 
 
 DESCRIPTION
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index de1ebed67d..b3f27671a0 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -11,9 +11,9 @@ SYNOPSIS
 [verse]
 'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]
 	      [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]
-	      [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
-	      [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]
-	      [-r <remote>] [-R] [<CVS_module>]
+	      [-C <git-repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
+	      [-a] [-m] [-M <regex>] [-S <regex>] [-L <commit-limit>]
+	      [-r <remote>] [-R] [<CVS-module>]
 
 
 DESCRIPTION
@@ -59,7 +59,7 @@ OPTIONS
 	from `CVS/Root`. If no such file exists, it checks for the
 	`CVSROOT` environment variable.
 
-<CVS_module>::
+<CVS-module>::
 	The CVS module you want to import. Relative to <CVSROOT>.
 	If not given, 'git cvsimport' tries to read it from
 	`CVS/Repository`.
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 906774f0f7..bf1febb9ae 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the index
 SYNOPSIS
 --------
 [verse]
-'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
+'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>...]
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index 27acb31cbf..679cae27d9 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -9,7 +9,7 @@ git-diff-index - Compare a tree to the working tree or index
 SYNOPSIS
 --------
 [verse]
-'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
+'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 2fc24c542f..274d5eaba9 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
 	      [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
-	      [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
+	      [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 6793d8fc05..6f28812f38 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -9,7 +9,7 @@ git-fmt-merge-msg - Produce a merge commit message
 SYNOPSIS
 --------
 [verse]
-'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log]
+'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
 'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
 
 DESCRIPTION
@@ -44,6 +44,10 @@ OPTIONS
 	Use <message> instead of the branch names for the first line
 	of the log message.  For use with `--log`.
 
+--into-name <branch>::
+	Prepare the merge message as if merging to the branch `<branch>`,
+	instead of the name of the real branch to which the merge is made.
+
 -F <file>::
 --file <file>::
 	Take the list of merged objects from <file> instead of
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 113eabc107..be797d7a28 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -18,7 +18,7 @@ SYNOPSIS
 		   [-n | --numbered | -N | --no-numbered]
 		   [--start-number <n>] [--numbered-files]
 		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
-		   [--ignore-if-in-upstream]
+		   [--ignore-if-in-upstream] [--always]
 		   [--cover-from-description=<mode>]
 		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
@@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
+--always::
+	Include patches for commits that do not introduce any change,
+	which are omitted by default.
+
 --cover-from-description=<mode>::
 	Controls which parts of the cover letter will be automatically
 	populated using the branch's description.
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index bd596619c0..5088783dcc 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
 	 [--[no-]full] [--strict] [--verbose] [--lost-found]
 	 [--[no-]dangling] [--[no-]progress] [--connectivity-only]
-	 [--[no-]name-objects] [<object>*]
+	 [--[no-]name-objects] [<object>...]
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt
index c9d7e96214..e8f3ccb433 100644
--- a/Documentation/git-gui.txt
+++ b/Documentation/git-gui.txt
@@ -8,7 +8,7 @@ git-gui - A portable graphical interface to Git
 SYNOPSIS
 --------
 [verse]
-'git gui' [<command>] [arguments]
+'git gui' [<command>] [<arguments>]
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 96d5f598b4..44ea63cc6d 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -9,14 +9,14 @@ SYNOPSIS
 --------
 [verse]
 'git help' [-a|--all [--[no-]verbose]]
-	   [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE]
+	   [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
 'git help' [-g|--guides]
 'git help' [-c|--config]
 
 DESCRIPTION
 -----------
 
-With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
+With no options and no '<command>' or '<guide>' given, the synopsis of the 'git'
 command and a list of the most commonly used Git commands are printed
 on the standard output.
 
@@ -33,7 +33,7 @@ variables.
 
 If an alias is given, git shows the definition of the alias on
 standard output. To get the manual page for the aliased command, use
-`git COMMAND --help`.
+`git <command> --help`.
 
 Note that `git --help ...` is identical to `git help ...` because the
 former is internally converted into the latter.
diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 9fa17b60e4..319062c021 100644
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP
 SYNOPSIS
 --------
 [verse]
-'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
+'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index ea03a4eeb0..7c6a6dd7f6 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -9,7 +9,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
 SYNOPSIS
 --------
 [verse]
-'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
+'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]
 
 DESCRIPTION
 -----------
@@ -63,16 +63,15 @@ of such patterns separated by a colon ":" (this means that a ref name
 cannot have a colon in it).  A single pattern '<name>' is just a
 shorthand for '<name>:<name>'.
 
-Each pattern pair consists of the source side (before the colon)
-and the destination side (after the colon).  The ref to be
-pushed is determined by finding a match that matches the source
-side, and where it is pushed is determined by using the
-destination side.
+Each pattern pair '<src>:<dst>' consists of the source side (before
+the colon) and the destination side (after the colon).  The ref to be
+pushed is determined by finding a match that matches the source side,
+and where it is pushed is determined by using the destination side.
 
- - It is an error if <src> does not match exactly one of the
+ - It is an error if '<src>' does not match exactly one of the
    local refs.
 
- - If <dst> does not match any remote ref, either
+ - If '<dst>' does not match any remote ref, either
 
    * it has to start with "refs/"; <dst> is used as the
      destination literally in this case.
diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index 648a6cd78a..18bf1a3c8c 100644
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -9,7 +9,7 @@ git-init-db - Creates an empty Git repository
 SYNOPSIS
 --------
 [verse]
-'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]
+'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]
 
 
 DESCRIPTION
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index b611d80697..ad921fe782 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -9,10 +9,10 @@ git-init - Create an empty Git repository or reinitialize an existing one
 SYNOPSIS
 --------
 [verse]
-'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
-	  [--separate-git-dir <git dir>] [--object-format=<format>]
+'git init' [-q | --quiet] [--bare] [--template=<template-directory>]
+	  [--separate-git-dir <git-dir>] [--object-format=<format>]
 	  [-b <branch-name> | --initial-branch=<branch-name>]
-	  [--shared[=<permissions>]] [directory]
+	  [--shared[=<permissions>]] [<directory>]
 
 
 DESCRIPTION
@@ -57,12 +57,12 @@ values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default.
 +
 include::object-format-disclaimer.txt[]
 
---template=<template_directory>::
+--template=<template-directory>::
 
 Specify the directory from which templates will be used.  (See the "TEMPLATE
 DIRECTORY" section below.)
 
---separate-git-dir=<git dir>::
+--separate-git-dir=<git-dir>::
 
 Instead of initializing the repository as a directory to either `$GIT_DIR` or
 `./.git/`, create a text file there containing the path to the actual
@@ -79,7 +79,7 @@ repository.  If not specified, fall back to the default name (currently
 `master`, but this is subject to change in the future; the name can be
 customized via the `init.defaultBranch` configuration variable).
 
---shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
+--shared[=(false|true|umask|group|all|world|everybody|<perm>)]::
 
 Specify that the Git repository is to be shared amongst several users.  This
 allows users belonging to the same group to push into that
@@ -110,13 +110,16 @@ the repository permissions.
 
 Same as 'group', but make the repository readable by all users.
 
-'0xxx'::
+'<perm>'::
 
-'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will
-override users' umask(2) value (and not only loosen permissions as 'group' and
-'all' does). '0640' will create a repository which is group-readable, but not
-group-writable or accessible to others. '0660' will create a repo that is
-readable and writable to the current user and group, but inaccessible to others.
+'<perm>' is a 3-digit octal number prefixed with `0` and each file
+will have mode '<perm>'. '<perm>' will override users' umask(2)
+value (and not only loosen permissions as 'group' and 'all'
+does). '0640' will create a repository which is group-readable, but
+not group-writable or accessible to others. '0660' will create a repo
+that is readable and writable to the current user and group, but
+inaccessible to others (directories and executable files get their
+`x` bit from the `r` bit for corresponding classes of users).
 --
 
 By default, the configuration flag `receive.denyNonFastForwards` is enabled
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 0498e7bacb..20e87cecf4 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -9,7 +9,7 @@ git-log - Show commit logs
 SYNOPSIS
 --------
 [verse]
-'git log' [<options>] [<revision range>] [[--] <path>...]
+'git log' [<options>] [<revision-range>] [[--] <path>...]
 
 DESCRIPTION
 -----------
@@ -81,13 +81,13 @@ produced by `--stat`, etc.
 
 include::line-range-options.txt[]
 
-<revision range>::
+<revision-range>::
 	Show only commits in the specified revision range.  When no
-	<revision range> is specified, it defaults to `HEAD` (i.e. the
+	<revision-range> is specified, it defaults to `HEAD` (i.e. the
 	whole history leading to the current commit).  `origin..HEAD`
 	specifies all the commits reachable from the current commit
 	(i.e. `HEAD`), but not from `origin`. For a complete list of
-	ways to spell <revision range>, see the 'Specifying Ranges'
+	ways to spell <revision-range>, see the 'Specifying Ranges'
 	section of linkgit:gitrevisions[7].
 
 [--] <path>...::
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 6d11ab506b..48cc7c0b6f 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -10,9 +10,9 @@ SYNOPSIS
 --------
 [verse]
 'git ls-files' [-z] [-t] [-v] [-f]
-		(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
-		(-[c|d|o|i|s|u|k|m])*
-		[--eol]
+		[-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored]
+		[-s|--stage] [-u|--unmerged] [-k|--|killed] [-m|--modified]
+		[--directory [--no-empty-directory]] [--eol]
 		[--deduplicate]
 		[-x <pattern>|--exclude=<pattern>]
 		[-X <file>|--exclude-from=<file>]
@@ -187,6 +187,11 @@ Both the <eolinfo> in the index ("i/<eolinfo>")
 and in the working tree ("w/<eolinfo>") are shown for regular files,
 followed by the  ("attr/<eolattr>").
 
+--sparse::
+	If the index is sparse, show the sparse directories without expanding
+	to the contained files. Sparse directories will be shown with a
+	trailing slash, such as "x/" for a sparse directory "x".
+
 \--::
 	Do not interpret any more arguments as options.
 
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index f856032613..7e9093fab6 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -70,6 +70,9 @@ OPTIONS
 --diff3::
 	Show conflicts in "diff3" style.
 
+--zdiff3::
+	Show conflicts in "zdiff3" style.
+
 --ours::
 --theirs::
 --union::
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 2ab84a91e5..eea56b3154 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -9,7 +9,7 @@ git-merge-index - Run a merge for files needing merging
 SYNOPSIS
 --------
 [verse]
-'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
+'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e4f3352eb5..3125473cc1 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -12,7 +12,8 @@ SYNOPSIS
 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
 	[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
 	[--[no-]allow-unrelated-histories]
-	[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
+	[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]
+	[--into-name <branch>] [<commit>...]
 'git merge' (--continue | --abort | --quit)
 
 DESCRIPTION
@@ -76,6 +77,11 @@ The 'git fmt-merge-msg' command can be
 used to give a good default for automated 'git merge'
 invocations. The automated message can include the branch description.
 
+--into-name <branch>::
+	Prepare the default merge message as if merging to the branch
+	`<branch>`, instead of the name of the real branch to which
+	the merge is made.
+
 -F <file>::
 --file=<file>::
 	Read the commit message to be used for the merge commit (in
@@ -240,7 +246,8 @@ from the RCS suite to present such a conflicted hunk, like this:
 
 ------------
 Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed.
+ancestor, or cleanly resolved because only one side changed,
+or cleanly resolved because both sides changed the same way.
 <<<<<<< yours:sample.txt
 Conflict resolution is hard;
 let's go shopping.
@@ -261,16 +268,37 @@ side wants to say it is hard and you'd prefer to go shopping, while the
 other side wants to claim it is easy.
 
 An alternative style can be used by setting the "merge.conflictStyle"
-configuration variable to "diff3".  In "diff3" style, the above conflict
-may look like this:
+configuration variable to either "diff3" or "zdiff3".  In "diff3"
+style, the above conflict may look like this:
+
+------------
+Here are lines that are either unchanged from the common
+ancestor, or cleanly resolved because only one side changed,
+<<<<<<< yours:sample.txt
+or cleanly resolved because both sides changed the same way.
+Conflict resolution is hard;
+let's go shopping.
+||||||| base:sample.txt
+or cleanly resolved because both sides changed identically.
+Conflict resolution is hard.
+=======
+or cleanly resolved because both sides changed the same way.
+Git makes conflict resolution easy.
+>>>>>>> theirs:sample.txt
+And here is another line that is cleanly resolved or unmodified.
+------------
+
+while in "zdiff3" style, it may look like this:
 
 ------------
 Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed.
+ancestor, or cleanly resolved because only one side changed,
+or cleanly resolved because both sides changed the same way.
 <<<<<<< yours:sample.txt
 Conflict resolution is hard;
 let's go shopping.
-|||||||
+||||||| base:sample.txt
+or cleanly resolved because both sides changed identically.
 Conflict resolution is hard.
 =======
 Git makes conflict resolution easy.
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 38e5257b2a..e21fcd8f71 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -9,10 +9,10 @@ git-p4 - Import from and submit to Perforce repositories
 SYNOPSIS
 --------
 [verse]
-'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...
-'git p4 sync' [<sync options>] [<p4 depot path>...]
+'git p4 clone' [<sync-options>] [<clone-options>] <p4-depot-path>...
+'git p4 sync' [<sync-options>] [<p4-depot-path>...]
 'git p4 rebase'
-'git p4 submit' [<submit options>] [<master branch name>]
+'git p4 submit' [<submit-options>] [<master-branch-name>]
 
 
 DESCRIPTION
@@ -361,7 +361,7 @@ These options can be used to modify 'git p4 submit' behavior.
 	p4/master.  See the "Sync options" section above for more
 	information.
 
---commit <sha1>|<sha1..sha1>::
+--commit (<sha1>|<sha1>..<sha1>)::
     Submit only the specified commit or range of commits, instead of the full
     list of changes that are in the current Git branch.
 
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index dbfd1f9017..f8344e1e5b 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -13,8 +13,8 @@ SYNOPSIS
 	[--no-reuse-delta] [--delta-base-offset] [--non-empty]
 	[--local] [--incremental] [--window=<n>] [--depth=<n>]
 	[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
-	[--stdout [--filter=<filter-spec>] | base-name]
-	[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list
+	[--stdout [--filter=<filter-spec>] | <base-name>]
+	[--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
 
 
 DESCRIPTION
diff --git a/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.txt
index f2869da572..ee7034b5e5 100644
--- a/Documentation/git-pack-redundant.txt
+++ b/Documentation/git-pack-redundant.txt
@@ -9,7 +9,7 @@ git-pack-redundant - Find redundant pack files
 SYNOPSIS
 --------
 [verse]
-'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >
+'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | <pack-filename>... )
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index a1af21fcef..9da4647061 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -714,9 +714,9 @@ information about the rebased commits and their parents (and instead
 generates new fake commits based off limited information in the
 generated patches), those commits cannot be identified; instead it has
 to fall back to a commit summary.  Also, when merge.conflictStyle is
-set to diff3, the apply backend will use "constructed merge base" to
-label the content from the merge base, and thus provide no information
-about the merge base commit whatsoever.
+set to diff3 or zdiff3, the apply backend will use "constructed merge
+base" to label the content from the merge base, and thus provide no
+information about the merge base commit whatsoever.
 
 The merge backend works with the full commits on both sides of history
 and thus has no such limitations.
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index ff487ff77d..5ced7ad4f8 100644
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -17,12 +17,12 @@ The command takes various subcommands, and different options
 depending on the subcommand:
 
 [verse]
-'git reflog' ['show'] [log-options] [<ref>]
+'git reflog' ['show'] [<log-options>] [<ref>]
 'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
 	[--rewrite] [--updateref] [--stale-fix]
 	[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
 'git reflog delete' [--rewrite] [--updateref]
-	[--dry-run | -n] [--verbose] ref@\{specifier\}...
+	[--dry-run | -n] [--verbose] <ref>@\{<specifier>\}...
 'git reflog exists' <ref>
 
 Reference logs, or "reflogs", record when the tips of branches and
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 31c29c9b31..2bebc32566 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
+'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
 'git remote rename' <old> <new>
 'git remote remove' <name>
 'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
@@ -18,7 +18,7 @@ SYNOPSIS
 'git remote get-url' [--push] [--all] <name>
 'git remote set-url' [--push] <name> <newurl> [<oldurl>]
 'git remote set-url --add' [--push] <name> <newurl>
-'git remote set-url --delete' [--push] <name> <url>
+'git remote set-url --delete' [--push] <name> <URL>
 'git remote' [-v | --verbose] 'show' [-n] <name>...
 'git remote prune' [-n | --dry-run] <name>...
 'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
@@ -47,7 +47,7 @@ subcommands are available to perform operations on the remotes.
 'add'::
 
 Add a remote named <name> for the repository at
-<url>.  The command `git fetch <name>` can then be used to create and
+<URL>.  The command `git fetch <name>` can then be used to create and
 update remote-tracking branches <name>/<branch>.
 +
 With `-f` option, `git fetch <name>` is run immediately after
@@ -152,7 +152,7 @@ With `--push`, push URLs are manipulated instead of fetch URLs.
 With `--add`, instead of changing existing URLs, new URL is added.
 +
 With `--delete`, instead of changing existing URLs, all URLs matching
-regex <url> are deleted for remote <name>.  Trying to delete all
+regex <URL> are deleted for remote <name>.  Trying to delete all
 non-push URLs is an error.
 +
 Note that the push URL and the fetch URL, even though they can
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 7183fb498f..ee30edc178 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -76,8 +76,9 @@ to the new separate pack will be written.
 	linkgit:git-pack-objects[1].
 
 -q::
-	Pass the `-q` option to 'git pack-objects'. See
-	linkgit:git-pack-objects[1].
+--quiet::
+	Show no progress over the standard error stream and pass the `-q`
+	option to 'git pack-objects'. See linkgit:git-pack-objects[1].
 
 -n::
 	Do not update the server information with
diff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt
index 4d4392d0f8..fa5a426709 100644
--- a/Documentation/git-request-pull.txt
+++ b/Documentation/git-request-pull.txt
@@ -8,7 +8,7 @@ git-request-pull - Generates a summary of pending changes
 SYNOPSIS
 --------
 [verse]
-'git request-pull' [-p] <start> <url> [<end>]
+'git request-pull' [-p] <start> <URL> [<end>]
 
 DESCRIPTION
 -----------
@@ -21,7 +21,7 @@ the changes and indicates from where they can be pulled.
 The upstream project is expected to have the commit named by
 `<start>` and the output asks it to integrate the changes you made
 since that commit, up to the commit named by `<end>`, by visiting
-the repository named by `<url>`.
+the repository named by `<URL>`.
 
 
 OPTIONS
@@ -33,14 +33,14 @@ OPTIONS
 	Commit to start at.  This names a commit that is already in
 	the upstream history.
 
-<url>::
+<URL>::
 	The repository URL to be pulled from.
 
 <end>::
 	Commit to end at (defaults to HEAD).  This names the commit
 	at the tip of the history you are asking to be pulled.
 +
-When the repository named by `<url>` has the commit at a tip of a
+When the repository named by `<URL>` has the commit at a tip of a
 ref that is different from the ref you have locally, you can use the
 `<local>:<remote>` syntax, to have its local name, a colon `:`, and
 its remote name.
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 55bde91ef9..5964810caa 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -92,8 +92,7 @@ in linkgit:git-checkout[1] for details.
 	The same as `--merge` option above, but changes the way the
 	conflicting hunks are presented, overriding the
 	`merge.conflictStyle` configuration variable.  Possible values
-	are "merge" (default) and "diff3" (in addition to what is
-	shown by "merge" style, shows the original contents).
+	are "merge" (default), "diff3", and "zdiff3".
 
 --ignore-unmerged::
 	When restoring files on the working tree from the index, do
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 3db4eab4ba..41cd8cb424 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -9,7 +9,8 @@ git-send-email - Send a collection of patches as emails
 SYNOPSIS
 --------
 [verse]
-'git send-email' [<options>] <file|directory|rev-list options>...
+'git send-email' [<options>] <file|directory>...
+'git send-email' [<options>] <format-patch options>
 'git send-email' --dump-aliases
 
 
@@ -19,7 +20,8 @@ Takes the patches given on the command line and emails them out.
 Patches can be specified as files, directories (which will send all
 files in the directory), or directly as a revision list.  In the
 last case, any format accepted by linkgit:git-format-patch[1] can
-be passed to git send-email.
+be passed to git send-email, as well as options understood by
+linkgit:git-format-patch[1].
 
 The header of the email is configurable via command-line options.  If not
 specified on the command line, the user will be prompted with a ReadLine
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index c9c7f3065c..f64e77047b 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -8,7 +8,7 @@ git-shortlog - Summarize 'git log' output
 SYNOPSIS
 --------
 [verse]
-'git shortlog' [<options>] [<revision range>] [[--] <path>...]
+'git shortlog' [<options>] [<revision-range>] [[--] <path>...]
 git log --pretty=short | 'git shortlog' [<options>]
 
 DESCRIPTION
@@ -89,13 +89,13 @@ counts both authors and co-authors.
 If width is `0` (zero) then indent the lines of the output without wrapping
 them.
 
-<revision range>::
+<revision-range>::
 	Show only commits in the specified revision range.  When no
-	<revision range> is specified, it defaults to `HEAD` (i.e. the
+	<revision-range> is specified, it defaults to `HEAD` (i.e. the
 	whole history leading to the current commit).  `origin..HEAD`
 	specifies all the commits reachable from the current commit
 	(i.e. `HEAD`), but not from `origin`. For a complete list of
-	ways to spell <revision range>, see the "Specifying Ranges"
+	ways to spell <revision-range>, see the "Specifying Ranges"
 	section of linkgit:gitrevisions[7].
 
 [--] <path>...::
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index 42056ee9ff..b81dbe0654 100644
--- a/Documentation/git-sparse-checkout.txt
+++ b/Documentation/git-sparse-checkout.txt
@@ -11,7 +11,7 @@ given by a list of patterns.
 SYNOPSIS
 --------
 [verse]
-'git sparse-checkout <subcommand> [options]'
+'git sparse-checkout <subcommand> [<options>]'
 
 
 DESCRIPTION
@@ -30,28 +30,36 @@ COMMANDS
 'list'::
 	Describe the patterns in the sparse-checkout file.
 
-'init'::
-	Enable the `core.sparseCheckout` setting. If the
-	sparse-checkout file does not exist, then populate it with
-	patterns that match every file in the root directory and
-	no other directories, then will remove all directories tracked
-	by Git. Add patterns to the sparse-checkout file to
-	repopulate the working directory.
+'set'::
+	Enable the necessary config settings
+	(extensions.worktreeConfig, core.sparseCheckout,
+	core.sparseCheckoutCone) if they are not already enabled, and
+	write a set of patterns to the sparse-checkout file from the
+	list of arguments following the 'set' subcommand. Update the
+	working directory to match the new patterns.
 +
-To avoid interfering with other worktrees, it first enables the
-`extensions.worktreeConfig` setting and makes sure to set the
-`core.sparseCheckout` setting in the worktree-specific config file.
+When the `--stdin` option is provided, the patterns are read from
+standard in as a newline-delimited list instead of from the arguments.
 +
-When `--cone` is provided, the `core.sparseCheckoutCone` setting is
-also set, allowing for better performance with a limited set of
-patterns (see 'CONE PATTERN SET' below).
+When `--cone` is passed or `core.sparseCheckoutCone` is enabled, the
+input list is considered a list of directories instead of
+sparse-checkout patterns.  This allows for better performance with a
+limited set of patterns (see 'CONE PATTERN SET' below).  Note that the
+set command will write patterns to the sparse-checkout file to include
+all files contained in those directories (recursively) as well as
+files that are siblings of ancestor directories. The input format
+matches the output of `git ls-tree --name-only`.  This includes
+interpreting pathnames that begin with a double quote (") as C-style
+quoted strings.  This may become the default in the future; --no-cone
+can be passed to request non-cone mode.
 +
-Use the `--[no-]sparse-index` option to toggle the use of the sparse
-index format. This reduces the size of the index to be more closely
-aligned with your sparse-checkout definition. This can have significant
-performance advantages for commands such as `git status` or `git add`.
-This feature is still experimental. Some commands might be slower with
-a sparse index until they are properly integrated with the feature.
+Use the `--[no-]sparse-index` option to use a sparse index (the
+default is to not use it).  A sparse index reduces the size of the
+index to be more closely aligned with your sparse-checkout
+definition. This can have significant performance advantages for
+commands such as `git status` or `git add`.  This feature is still
+experimental. Some commands might be slower with a sparse index until
+they are properly integrated with the feature.
 +
 **WARNING:** Using a sparse index requires modifying the index in a way
 that is not completely understood by external tools. If you have trouble
@@ -60,23 +68,6 @@ to rewrite your index to not be sparse. Older versions of Git will not
 understand the sparse directory entries index extension and may fail to
 interact with your repository until it is disabled.
 
-'set'::
-	Write a set of patterns to the sparse-checkout file, as given as
-	a list of arguments following the 'set' subcommand. Update the
-	working directory to match the new patterns. Enable the
-	core.sparseCheckout config setting if it is not already enabled.
-+
-When the `--stdin` option is provided, the patterns are read from
-standard in as a newline-delimited list instead of from the arguments.
-+
-When `core.sparseCheckoutCone` is enabled, the input list is considered a
-list of directories instead of sparse-checkout patterns. The command writes
-patterns to the sparse-checkout file to include all files contained in those
-directories (recursively) as well as files that are siblings of ancestor
-directories. The input format matches the output of `git ls-tree --name-only`.
-This includes interpreting pathnames that begin with a double quote (") as
-C-style quoted strings.
-
 'add'::
 	Update the sparse-checkout file to include additional patterns.
 	By default, these patterns are read from the command-line arguments,
@@ -93,12 +84,35 @@ C-style quoted strings.
 	cases, it can make sense to run `git sparse-checkout reapply` later
 	after cleaning up affected paths (e.g. resolving conflicts, undoing
 	or committing changes, etc.).
++
+The `reapply` command can also take `--[no-]cone` and `--[no-]sparse-index`
+flags, with the same meaning as the flags from the `set` command, in order
+to change which sparsity mode you are using without needing to also respecify
+all sparsity paths.
 
 'disable'::
 	Disable the `core.sparseCheckout` config setting, and restore the
-	working directory to include all files. Leaves the sparse-checkout
-	file intact so a later 'git sparse-checkout init' command may
-	return the working directory to the same state.
+	working directory to include all files.
+
+'init'::
+	Deprecated command that behaves like `set` with no specified paths.
+	May be removed in the future.
++
+Historically, `set` did not handle all the necessary config settings,
+which meant that both `init` and `set` had to be called.  Invoking
+both meant the `init` step would first remove nearly all tracked files
+(and in cone mode, ignored files too), then the `set` step would add
+many of the tracked files (but not ignored files) back.  In addition
+to the lost files, the performance and UI of this combination was
+poor.
++
+Also, historically, `init` would not actually initialize the
+sparse-checkout file if it already existed.  This meant it was
+possible to return to a sparse-checkout without remembering which
+paths to pass to a subsequent 'set' or 'add' command.  However,
+`--cone` and `--sparse-index` options would not be remembered across
+the disable command, so the easy restore of calling a plain `init`
+decreased in utility.
 
 SPARSE CHECKOUT
 ---------------
@@ -107,7 +121,7 @@ SPARSE CHECKOUT
 It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
 Git whether a file in the working directory is worth looking at. If
 the skip-worktree bit is set, then the file is ignored in the working
-directory. Git will not populate the contents of those files, which
+directory. Git will avoid populating the contents of those files, which
 makes a sparse checkout helpful when working in a repository with many
 files, but only a few are important to the current user.
 
@@ -117,10 +131,8 @@ directory, it updates the skip-worktree bits in the index based
 on this file. The files matching the patterns in the file will
 appear in the working directory, and the rest will not.
 
-To enable the sparse-checkout feature, run `git sparse-checkout init` to
-initialize a simple sparse-checkout file and enable the `core.sparseCheckout`
-config setting. Then, run `git sparse-checkout set` to modify the patterns in
-the sparse-checkout file.
+To enable the sparse-checkout feature, run `git sparse-checkout set` to
+set the patterns you want to use.
 
 To repopulate the working directory with all files, use the
 `git sparse-checkout disable` command.
diff --git a/Documentation/git-stage.txt b/Documentation/git-stage.txt
index 25bcda936d..2f6aaa75b9 100644
--- a/Documentation/git-stage.txt
+++ b/Documentation/git-stage.txt
@@ -9,7 +9,7 @@ git-stage - Add file contents to the staging area
 SYNOPSIS
 --------
 [verse]
-'git stage' args...
+'git stage' <arg>...
 
 
 DESCRIPTION
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index be6084ccef..6e15f47525 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 'git stash' drop [-q|--quiet] [<stash>]
 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
 'git stash' branch <branchname> [<stash>]
-'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
+'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]
 	     [-u|--include-untracked] [-a|--all] [-m|--message <message>]
 	     [--pathspec-from-file=<file> [--pathspec-file-nul]]
 	     [--] [<pathspec>...]]
@@ -47,7 +47,7 @@ stash index (e.g. the integer `n` is equivalent to `stash@{n}`).
 COMMANDS
 --------
 
-push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
+push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]::
 
 	Save your local modifications to a new 'stash entry' and roll them
 	back to HEAD (in the working tree and in the index).
@@ -60,7 +60,7 @@ subcommand from making an unwanted stash entry.  The two exceptions to this
 are `stash -p` which acts as alias for `stash push -p` and pathspec elements,
 which are allowed after a double hyphen `--` for disambiguation.
 
-save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
+save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
 
 	This option is deprecated in favour of 'git stash push'.  It
 	differs from "stash push" in that it cannot take pathspec.
@@ -205,6 +205,16 @@ to learn how to operate the `--patch` mode.
 The `--patch` option implies `--keep-index`.  You can use
 `--no-keep-index` to override this.
 
+-S::
+--staged::
+	This option is only valid for `push` and `save` commands.
++
+Stash only the changes that are currently staged. This is similar to
+basic `git commit` except the state is committed to the stash instead
+of current branch.
++
+The `--patch` option has priority over this one.
+
 --pathspec-from-file=<file>::
 	This option is only valid for `push` command.
 +
@@ -341,6 +351,24 @@ $ edit/build/test remaining parts
 $ git commit foo -m 'Remaining parts'
 ----------------------------------------------------------------
 
+Saving unrelated changes for future use::
+
+When you are in the middle of massive changes and you find some
+unrelated issue that you don't want to forget to fix, you can do the
+change(s), stage them, and use `git stash push --staged` to stash them
+out for future use. This is similar to committing the staged changes,
+only the commit ends-up being in the stash and not on the current branch.
++
+----------------------------------------------------------------
+# ... hack hack hack ...
+$ git add --patch foo           # add unrelated changes to the index
+$ git stash push --staged       # save these changes to the stash
+# ... hack hack hack, finish curent changes ...
+$ git commit -m 'Massive'       # commit fully tested changes
+$ git switch fixup-branch       # switch to another branch
+$ git stash pop                 # to finish work on the saved changes
+----------------------------------------------------------------
+
 Recovering stash entries that were cleared/dropped erroneously::
 
 If you mistakenly drop or clear stash entries, they cannot be recovered
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 4a2c3e0408..54a4b29b47 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -314,6 +314,14 @@ Line                                     Notes
 ------------------------------------------------------------
 ....
 
+Stash Information
+^^^^^^^^^^^^^^^^^
+
+If `--show-stash` is given, one line is printed showing the number of stash
+entries if non-zero:
+
+    # stash <N>
+
 Changed Tracked Entries
 ^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 222b556d7a..4e92308e85 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -575,7 +575,7 @@ OPTIONS
 -------
 
 --shared[=(false|true|umask|group|all|world|everybody)]::
---template=<template_directory>::
+--template=<template-directory>::
 	Only used with the 'init' command.
 	These are passed directly to 'git init'.
 
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 5c438cd505..bbcbdceb45 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -137,8 +137,7 @@ should result in deletion of the path).
 	The same as `--merge` option above, but changes the way the
 	conflicting hunks are presented, overriding the
 	`merge.conflictStyle` configuration variable.  Possible values are
-	"merge" (default) and "diff3" (in addition to what is shown by
-	"merge" style, shows the original contents).
+	"merge" (default), "diff3", and "zdiff3".
 
 -q::
 --quiet::
@@ -152,7 +151,7 @@ should result in deletion of the path).
 	attached to a terminal, regardless of `--quiet`.
 
 -t::
---track::
+--track [direct|inherit]::
 	When creating a new branch, set up "upstream" configuration.
 	`-c` is implied. See `--track` in linkgit:git-branch[1] for
 	details.
diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 6072f936ab..387cc1b914 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -59,6 +59,9 @@ ifdef::git-default-pager[]
     The build you are using chose '{git-default-pager}' as the default.
 endif::git-default-pager[]
 
+GIT_DEFAULT_BRANCH::
+    The name of the first branch created in newly initialized repositories.
+
 SEE ALSO
 --------
 linkgit:git-commit-tree[1]
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 8d162b56c5..f2f996cbe1 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -8,7 +8,7 @@ git-web--browse - Git helper script to launch a web browser
 SYNOPSIS
 --------
 [verse]
-'git web{litdd}browse' [<options>] <url|file>...
+'git web{litdd}browse' [<options>] (<URL>|<file>)...
 
 DESCRIPTION
 -----------
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 8a7cbdd19c..9e862fbcf7 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]
-'git worktree list' [--porcelain]
+'git worktree list' [-v | --porcelain]
 'git worktree lock' [--reason <string>] <worktree>
 'git worktree move' <worktree> <new-path>
 'git worktree prune' [-n] [-v] [--expire <expire>]
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 281c5f8cae..13f83a2a3a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -832,8 +832,9 @@ for full details.
 
 `GIT_TRACE_REDACT`::
 	By default, when tracing is activated, Git redacts the values of
-	cookies, the "Authorization:" header, and the "Proxy-Authorization:"
-	header. Set this variable to `0` to prevent this redaction.
+	cookies, the "Authorization:" header, the "Proxy-Authorization:"
+	header and packfile URIs. Set this variable to `0` to prevent this
+	redaction.
 
 `GIT_LITERAL_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 758bf39ba3..80517b4eb2 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -132,7 +132,7 @@ because the hostnames differ. Nor would it match `foo.example.com`; Git
 compares hostnames exactly, without considering whether two hosts are part of
 the same domain. Likewise, a config entry for `http://example.com` would not
 match: Git compares the protocols exactly.  However, you may use wildcards in
-the domain name and other pattern matching techniques as with the `http.<url>.*`
+the domain name and other pattern matching techniques as with the `http.<URL>.*`
 options.
 
 If the "pattern" URL does include a path component, then this too must match
@@ -147,7 +147,7 @@ CONFIGURATION OPTIONS
 
 Options for a credential context can be configured either in
 `credential.*` (which applies to all credentials), or
-`credential.<url>.*`, where <url> matches the context as described
+`credential.<URL>.*`, where <URL> matches the context as described
 above.
 
 The following options are available in either location:
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 891c8da4fd..941858a6ec 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -226,7 +226,7 @@ Workflow for a third party library
 ----------------------------------
 
   # Add a submodule
-  git submodule add <url> <path>
+  git submodule add <URL> <path>
 
   # Occasionally update the submodule to a new version:
   git -C <path> checkout <new version>
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 47cf97f9be..59305265c5 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -394,7 +394,7 @@ request to do so by mail.  Such a request looks like
 
 -------------------------------------
 Please pull from
-    <url> <branch>
+    <URL> <branch>
 -------------------------------------
 
 In that case, 'git pull' can do the fetch and merge in one go, as
@@ -403,7 +403,7 @@ follows.
 .Push/pull: Merging remote topics
 [caption="Recipe: "]
 =====================================
-`git pull <url> <branch>`
+`git pull <URL> <branch>`
 =====================================
 
 Occasionally, the maintainer may get merge conflicts when they try to
@@ -440,7 +440,7 @@ merge because you cannot format-patch merges):
 .format-patch/am: Keeping topics up to date
 [caption="Recipe: "]
 =====================================
-`git pull --rebase <url> <branch>`
+`git pull --rebase <URL> <branch>`
 =====================================
 
 You can then fix the conflicts during the rebase.  Presumably you have
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index ef6bd420ae..0b4c1c8d98 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -20,7 +20,7 @@ built-in formats:
 
 * 'oneline'
 
-	  <hash> <title line>
+	  <hash> <title-line>
 +
 This is designed to be as compact as possible.
 
@@ -29,17 +29,17 @@ This is designed to be as compact as possible.
 	  commit <hash>
 	  Author: <author>
 
-	      <title line>
+	      <title-line>
 
 * 'medium'
 
 	  commit <hash>
 	  Author: <author>
-	  Date:   <author date>
+	  Date:   <author-date>
 
-	      <title line>
+	      <title-line>
 
-	      <full commit message>
+	      <full-commit-message>
 
 * 'full'
 
@@ -47,25 +47,25 @@ This is designed to be as compact as possible.
 	  Author: <author>
 	  Commit: <committer>
 
-	      <title line>
+	      <title-line>
 
-	      <full commit message>
+	      <full-commit-message>
 
 * 'fuller'
 
 	  commit <hash>
 	  Author:     <author>
-	  AuthorDate: <author date>
+	  AuthorDate: <author-date>
 	  Commit:     <committer>
-	  CommitDate: <committer date>
+	  CommitDate: <committer-date>
 
-	       <title line>
+	       <title-line>
 
-	       <full commit message>
+	       <full-commit-message>
 
 * 'reference'
 
-	  <abbrev hash> (<title line>, <short author date>)
+	  <abbrev-hash> (<title-line>, <short-author-date>)
 +
 This format is used to refer to another commit in a commit message and
 is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`.  By default,
@@ -78,10 +78,10 @@ placeholders, its output is not affected by other options like
 
 	  From <hash> <date>
 	  From: <author>
-	  Date: <author date>
-	  Subject: [PATCH] <title line>
+	  Date: <author-date>
+	  Subject: [PATCH] <title-line>
 
-	  <full commit message>
+	  <full-commit-message>
 
 * 'mboxrd'
 +
@@ -101,9 +101,9 @@ commits are displayed, but not the way the diff is shown e.g. with
 `git log --raw`. To get full object names in a raw diff format,
 use `--no-abbrev`.
 
-* 'format:<string>'
+* 'format:<format-string>'
 +
-The 'format:<string>' format allows you to specify which information
+The 'format:<format-string>' format allows you to specify which information
 you want to show. It works a little bit like printf format,
 with the notable exception that you get a newline with '%n'
 instead of '\n'.
@@ -220,6 +220,12 @@ The placeholders are:
 			  inconsistent when tags are added or removed at
 			  the same time.
 +
+** 'tags[=<bool-value>]': Instead of only considering annotated tags,
+   consider lightweight tags as well.
+** 'abbrev=<number>': Instead of using the default number of hexadecimal digits
+   (which will vary according to the number of objects in the repository with a
+   default of 7) of the abbreviated object name, use <number> digits, or as many
+   digits as needed to form a unique object name.
 ** 'match=<pattern>': Only consider tags matching the given
    `glob(7)` pattern, excluding the "refs/tags/" prefix.
 ** 'exclude=<pattern>': Do not consider tags matching the given
@@ -273,12 +279,7 @@ endif::git-rev-list[]
 			  If any option is provided multiple times the
 			  last occurrence wins.
 +
-The boolean options accept an optional value `[=<BOOL>]`. The values
-`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
-option is given with no value, it's enabled.
-+
-** 'key=<K>': only show trailers with specified key. Matching is done
+** 'key=<key>': only show trailers with specified <key>. Matching is done
    case-insensitively and trailing colon is optional. If option is
    given multiple times trailer lines matching any of the keys are
    shown. This option automatically enables the `only` option so that
@@ -286,25 +287,25 @@ option is given with no value, it's enabled.
    desired it can be disabled with `only=false`.  E.g.,
    `%(trailers:key=Reviewed-by)` shows trailer lines with key
    `Reviewed-by`.
-** 'only[=<BOOL>]': select whether non-trailer lines from the trailer
+** 'only[=<bool>]': select whether non-trailer lines from the trailer
    block should be included.
-** 'separator=<SEP>': specify a separator inserted between trailer
+** 'separator=<sep>': specify a separator inserted between trailer
    lines. When this option is not given each trailer line is
-   terminated with a line feed character. The string SEP may contain
+   terminated with a line feed character. The string <sep> may contain
    the literal formatting codes described above. To use comma as
    separator one must use `%x2C` as it would otherwise be parsed as
    next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
    shows all trailer lines whose key is "Ticket" separated by a comma
    and a space.
-** 'unfold[=<BOOL>]': make it behave as if interpret-trailer's `--unfold`
+** 'unfold[=<bool>]': make it behave as if interpret-trailer's `--unfold`
    option was given. E.g.,
    `%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
-** 'keyonly[=<BOOL>]': only show the key part of the trailer.
-** 'valueonly[=<BOOL>]': only show the value part of the trailer.
-** 'key_value_separator=<SEP>': specify a separator inserted between
+** 'keyonly[=<bool>]': only show the key part of the trailer.
+** 'valueonly[=<bool>]': only show the value part of the trailer.
+** 'key_value_separator=<sep>': specify a separator inserted between
    trailer lines. When this option is not given each trailer key-value
    pair is separated by ": ". Otherwise it shares the same semantics
-   as 'separator=<SEP>' above.
+   as 'separator=<sep>' above.
 
 NOTE: Some placeholders may depend on other options given to the
 revision traversal engine. For example, the `%g*` reflog options will
@@ -313,6 +314,11 @@ insert an empty string unless we are traversing reflog entries (e.g., by
 decoration format if `--decorate` was not already provided on the command
 line.
 
+The boolean options accept an optional value `[=<bool-value>]`. The values
+`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
+sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
+option is given with no value, it's enabled.
+
 If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
 is inserted immediately before the expansion if and only if the
 placeholder expands to a non-empty string.
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 24569b06d1..43a86fa562 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -1047,7 +1047,7 @@ omitted.
 has no effect.
 
 `--date=format:...` feeds the format `...` to your system `strftime`,
-except for %z and %Z, which are handled internally.
+except for %s, %z, and %Z, which are handled internally.
 Use `--date=format:%c` to show the date in your system locale's
 preferred format.  See the `strftime` manual for a complete list of
 format placeholders. When using `-local`, the correct syntax is
diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.txt
index 86f40f2490..b39c69da8c 100644
--- a/Documentation/technical/multi-pack-index.txt
+++ b/Documentation/technical/multi-pack-index.txt
@@ -17,12 +17,12 @@ is not feasible due to storage space or excessive repack times.
 The multi-pack-index (MIDX for short) stores a list of objects
 and their offsets into multiple packfiles. It contains:
 
-- A list of packfile names.
-- A sorted list of object IDs.
-- A list of metadata for the ith object ID including:
-  - A value j referring to the jth packfile.
-  - An offset within the jth packfile for the object.
-- If large offsets are required, we use another list of large
+* A list of packfile names.
+* A sorted list of object IDs.
+* A list of metadata for the ith object ID including:
+** A value j referring to the jth packfile.
+** An offset within the jth packfile for the object.
+* If large offsets are required, we use another list of large
   offsets similar to version 2 pack-indexes.
 
 Thus, we can provide O(log N) lookup time for any number
@@ -87,11 +87,6 @@ Future Work
   helpful to organize packfiles by object type (commit, tree, blob,
   etc.) and use this metadata to help that maintenance.
 
-- The partial clone feature records special "promisor" packs that
-  may point to objects that are not stored locally, but available
-  on request to a server. The multi-pack-index does not currently
-  track these promisor packs.
-
 Related Links
 -------------
 [0] https://bugs.chromium.org/p/git/issues/detail?id=6
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 21e8258ccf..8a877d27e2 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -125,11 +125,11 @@ command can be requested at a time.
     empty-request = flush-pkt
     command-request = command
 		      capability-list
-		      [command-args]
+		      delim-pkt
+		      command-args
 		      flush-pkt
     command = PKT-LINE("command=" key LF)
-    command-args = delim-pkt
-		   *command-specific-arg
+    command-args = *command-specific-arg
 
     command-specific-args are packet line framed arguments defined by
     each individual command.
diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt
index af5f9fc24f..35d4541433 100644
--- a/Documentation/technical/rerere.txt
+++ b/Documentation/technical/rerere.txt
@@ -14,9 +14,9 @@ conflicts before writing them to the rerere database.
 
 Different conflict styles and branch names are normalized by stripping
 the labels from the conflict markers, and removing the common ancestor
-version from the `diff3` conflict style. Branches that are merged
-in different order are normalized by sorting the conflict hunks.  More
-on each of those steps in the following sections.
+version from the `diff3` or `zdiff3` conflict styles.  Branches that
+are merged in different order are normalized by sorting the conflict
+hunks.  More on each of those steps in the following sections.
 
 Once these two normalization operations are applied, a conflict ID is
 calculated based on the normalized conflict, which is later used by
@@ -42,8 +42,8 @@ get a conflict like the following:
     >>>>>>> AC
 
 Doing the analogous with AC2 (forking a branch ABAC2 off of branch AB
-and then merging branch AC2 into it), using the diff3 conflict style,
-we get a conflict like the following:
+and then merging branch AC2 into it), using the diff3 or zdiff3
+conflict style, we get a conflict like the following:
 
     <<<<<<< HEAD
     B
diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt
index bd184cd653..86d0008f94 100644
--- a/Documentation/urls-remotes.txt
+++ b/Documentation/urls-remotes.txt
@@ -26,14 +26,14 @@ config file would appear like this:
 
 ------------
 	[remote "<name>"]
-		url = <url>
+		url = <URL>
 		pushurl = <pushurl>
 		push = <refspec>
 		fetch = <refspec>
 ------------
 
 The `<pushurl>` is used for pushes only. It is optional and defaults
-to `<url>`.
+to `<URL>`.
 
 Named file in `$GIT_DIR/remotes`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -67,10 +67,10 @@ This file should have the following format:
 
 
 ------------
-	<url>#<head>
+	<URL>#<head>
 ------------
 
-`<url>` is required; `#<head>` is optional.
+`<URL>` is required; `#<head>` is optional.
 
 Depending on the operation, git will use one of the following
 refspecs, if you don't provide one on the command line.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 3ae76105c8..002b1d7af4 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.34.3
+DEF_VER=v2.35.3
 
 LF='
 '
diff --git a/Makefile b/Makefile
index 12be39ac49..5580859afd 100644
--- a/Makefile
+++ b/Makefile
@@ -256,6 +256,8 @@ all::
 #
 # Define NO_DEFLATE_BOUND if your zlib does not have deflateBound.
 #
+# Define NO_UNCOMPRESS2 if your zlib does not have uncompress2.
+#
 # Define NO_NORETURN if using buggy versions of gcc 4.6+ and profile feedback,
 # as the compiler can crash (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49299)
 #
@@ -305,9 +307,6 @@ all::
 #
 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
 #
-# Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
-# and egrep that are pickier when their input contains non-ASCII data.
-#
 # The TCL_PATH variable governs the location of the Tcl interpreter
 # used to optimize git-gui for your system.  Only used if NO_TCLTK
 # is not set.  Defaults to the bare 'tclsh'.
@@ -735,6 +734,7 @@ TEST_BUILTINS_OBJS += test-read-cache.o
 TEST_BUILTINS_OBJS += test-read-graph.o
 TEST_BUILTINS_OBJS += test-read-midx.o
 TEST_BUILTINS_OBJS += test-ref-store.o
+TEST_BUILTINS_OBJS += test-reftable.o
 TEST_BUILTINS_OBJS += test-regex.o
 TEST_BUILTINS_OBJS += test-repository.o
 TEST_BUILTINS_OBJS += test-revision-walking.o
@@ -813,6 +813,8 @@ TEST_SHELL_PATH = $(SHELL_PATH)
 
 LIB_FILE = libgit.a
 XDIFF_LIB = xdiff/lib.a
+REFTABLE_LIB = reftable/libreftable.a
+REFTABLE_TEST_LIB = reftable/libreftable_test.a
 
 GENERATED_H += command-list.h
 GENERATED_H += config-list.h
@@ -1192,7 +1194,7 @@ THIRD_PARTY_SOURCES += compat/regex/%
 THIRD_PARTY_SOURCES += sha1collisiondetection/%
 THIRD_PARTY_SOURCES += sha1dc/%
 
-GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
+GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB)
 EXTLIBS =
 
 GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -1204,6 +1206,7 @@ endif
 # Set CFLAGS, LDFLAGS and other *FLAGS variables. These might be
 # tweaked by config.* below as well as the command-line, both of
 # which'll override these defaults.
+# Older versions of GCC may require adding "-std=gnu99" at the end.
 CFLAGS = -g -O2 -Wall
 LDFLAGS =
 CC_LD_DYNPATH = -Wl,-rpath,
@@ -1215,7 +1218,7 @@ ARFLAGS = rcs
 PTHREAD_CFLAGS =
 
 # For the 'sparse' target
-SPARSE_FLAGS ?=
+SPARSE_FLAGS ?= -std=gnu99
 SP_EXTRA_FLAGS = -Wno-universal-initializer
 
 # For informing GIT-BUILD-OPTIONS of the SANITIZE=leak target
@@ -1723,6 +1726,11 @@ ifdef NO_DEFLATE_BOUND
 	BASIC_CFLAGS += -DNO_DEFLATE_BOUND
 endif
 
+ifdef NO_UNCOMPRESS2
+	BASIC_CFLAGS += -DNO_UNCOMPRESS2
+	REFTABLE_OBJS += compat/zlib-uncompress2.o
+endif
+
 ifdef NO_POSIX_GOODIES
 	BASIC_CFLAGS += -DNO_POSIX_GOODIES
 endif
@@ -1873,7 +1881,7 @@ ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
 endif
 
 ifndef NO_MSGFMT_EXTENDED_OPTIONS
-	MSGFMT += --check --statistics
+	MSGFMT += --check
 endif
 
 ifdef HAVE_CLOCK_GETTIME
@@ -2104,11 +2112,6 @@ ifdef DEFAULT_HELP_FORMAT
 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
 endif
 
-PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
-PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
-PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
-BASIC_CFLAGS += -DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
-
 ALL_CFLAGS += $(BASIC_CFLAGS)
 ALL_LDFLAGS += $(BASIC_LDFLAGS)
 
@@ -2215,14 +2218,20 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
 		$(filter %.o,$^) $(LIBS)
 
 help.sp help.s help.o: command-list.h
-hook.sp hook.s hook.o: hook-list.h
+builtin/bugreport.sp builtin/bugreport.s builtin/bugreport.o: hook-list.h
 
-builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX
+builtin/help.sp builtin/help.s builtin/help.o: config-list.h GIT-PREFIX
 builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
 	'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
 	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
 	'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
 
+PAGER_ENV_SQ = $(subst ','\'',$(PAGER_ENV))
+PAGER_ENV_CQ = "$(subst ",\",$(subst \,\\,$(PAGER_ENV)))"
+PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
+pager.sp pager.s pager.o: EXTRA_CPPFLAGS = \
+	-DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
+
 version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
 version.sp version.s version.o: EXTRA_CPPFLAGS = \
 	'-DGIT_VERSION="$(GIT_VERSION)"' \
@@ -2252,33 +2261,30 @@ command-list.h: $(wildcard Documentation/git*.txt)
 hook-list.h: generate-hooklist.sh Documentation/githooks.txt
 	$(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh >$@
 
-SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
-	$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
-	$(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\
+SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
+	$(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
+	$(gitwebdir_SQ):$(PERL_PATH_SQ):$(PAGER_ENV):\
 	$(perllibdir_SQ)
+GIT-SCRIPT-DEFINES: FORCE
+	@FLAGS='$(SCRIPT_DEFINES)'; \
+	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
+		echo >&2 "    * new script parameters"; \
+		echo "$$FLAGS" >$@; \
+            fi
+
 define cmd_munge_script
 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
     -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
     -e 's|@@DIFF@@|$(DIFF_SQ)|' \
     -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
-    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
     -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
     -e $(BROKEN_PATH_FIX) \
     -e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
     -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
-    -e 's|@@SANE_TEXT_GREP@@|$(SANE_TEXT_GREP)|g' \
     -e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
     $@.sh >$@+
 endef
 
-GIT-SCRIPT-DEFINES: FORCE
-	@FLAGS='$(SCRIPT_DEFINES)'; \
-	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
-		echo >&2 "    * new script parameters"; \
-		echo "$$FLAGS" >$@; \
-            fi
-
-
 $(SCRIPT_SH_GEN) : % : %.sh GIT-SCRIPT-DEFINES
 	$(QUIET_GEN)$(cmd_munge_script) && \
 	chmod +x $@+ && \
@@ -2437,7 +2443,36 @@ XDIFF_OBJS += xdiff/xutils.o
 .PHONY: xdiff-objs
 xdiff-objs: $(XDIFF_OBJS)
 
+REFTABLE_OBJS += reftable/basics.o
+REFTABLE_OBJS += reftable/error.o
+REFTABLE_OBJS += reftable/block.o
+REFTABLE_OBJS += reftable/blocksource.o
+REFTABLE_OBJS += reftable/iter.o
+REFTABLE_OBJS += reftable/publicbasics.o
+REFTABLE_OBJS += reftable/merged.o
+REFTABLE_OBJS += reftable/pq.o
+REFTABLE_OBJS += reftable/reader.o
+REFTABLE_OBJS += reftable/record.o
+REFTABLE_OBJS += reftable/refname.o
+REFTABLE_OBJS += reftable/generic.o
+REFTABLE_OBJS += reftable/stack.o
+REFTABLE_OBJS += reftable/tree.o
+REFTABLE_OBJS += reftable/writer.o
+
+REFTABLE_TEST_OBJS += reftable/basics_test.o
+REFTABLE_TEST_OBJS += reftable/block_test.o
+REFTABLE_TEST_OBJS += reftable/dump.o
+REFTABLE_TEST_OBJS += reftable/merged_test.o
+REFTABLE_TEST_OBJS += reftable/pq_test.o
+REFTABLE_TEST_OBJS += reftable/record_test.o
+REFTABLE_TEST_OBJS += reftable/readwrite_test.o
+REFTABLE_TEST_OBJS += reftable/refname_test.o
+REFTABLE_TEST_OBJS += reftable/stack_test.o
+REFTABLE_TEST_OBJS += reftable/test_framework.o
+REFTABLE_TEST_OBJS += reftable/tree_test.o
+
 TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
+
 .PHONY: test-objs
 test-objs: $(TEST_OBJS)
 
@@ -2453,9 +2488,16 @@ OBJECTS += $(PROGRAM_OBJS)
 OBJECTS += $(TEST_OBJS)
 OBJECTS += $(XDIFF_OBJS)
 OBJECTS += $(FUZZ_OBJS)
+OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
+
 ifndef NO_CURL
 	OBJECTS += http.o http-walker.o remote-curl.o
 endif
+
+SCALAR_SOURCES := contrib/scalar/scalar.c
+SCALAR_OBJECTS := $(SCALAR_SOURCES:c=o)
+OBJECTS += $(SCALAR_OBJECTS)
+
 .PHONY: objects
 objects: $(OBJECTS)
 
@@ -2589,12 +2631,22 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
 
+contrib/scalar/scalar$X: $(SCALAR_OBJECTS) GIT-LDFLAGS $(GITLIBS)
+	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
+		$(filter %.o,$^) $(LIBS)
+
 $(LIB_FILE): $(LIB_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 
 $(XDIFF_LIB): $(XDIFF_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 
+$(REFTABLE_LIB): $(REFTABLE_OBJS)
+	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+
+$(REFTABLE_TEST_LIB): $(REFTABLE_TEST_OBJS)
+	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+
 export DEFAULT_EDITOR DEFAULT_PAGER
 
 Documentation/GIT-EXCLUDED-PROGRAMS: FORCE
@@ -2893,7 +2945,7 @@ perf: all
 
 t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
 
-t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS)
+t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
 
 check-sha1:: t/helper/test-tool$X
@@ -3231,7 +3283,7 @@ cocciclean:
 clean: profile-clean coverage-clean cocciclean
 	$(RM) *.res
 	$(RM) $(OBJECTS)
-	$(RM) $(LIB_FILE) $(XDIFF_LIB)
+	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
 	$(RM) $(TEST_PROGRAMS)
 	$(RM) $(FUZZ_PROGRAMS)
diff --git a/README.md b/README.md
index eb8115e6b0..f6f43e78de 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build status](https://github.com/git/git/workflows/CI/PR/badge.svg)](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush)
+[![Build status](https://github.com/git/git/workflows/CI/badge.svg)](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush)
 
 Git - fast, scalable, distributed revision control system
 =========================================================
diff --git a/RelNotes b/RelNotes
index 1065723912..e271ea5958 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.34.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.35.3.txt
\ No newline at end of file
diff --git a/add-patch.c b/add-patch.c
index 8c41cdfe39..573eef0cc4 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -413,7 +413,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
 		strvec_push(&args, ps->items[i].original);
 
 	setup_child_process(s, &cp, NULL);
-	cp.argv = args.v;
+	strvec_pushv(&cp.args, args.v);
 	res = capture_command(&cp, plain, 0);
 	if (res) {
 		strvec_clear(&args);
@@ -431,7 +431,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
 
 		setup_child_process(s, &colored_cp, NULL);
 		xsnprintf((char *)args.v[color_arg_index], 8, "--color");
-		colored_cp.argv = args.v;
+		strvec_pushv(&colored_cp.args, args.v);
 		colored = &s->colored;
 		res = capture_command(&colored_cp, colored, 0);
 		strvec_clear(&args);
diff --git a/apply.c b/apply.c
index 43a0aebf4e..7ffadc3b17 100644
--- a/apply.c
+++ b/apply.c
@@ -133,10 +133,10 @@ int check_apply_state(struct apply_state *state, int force_apply)
 	int is_not_gitdir = !startup_info->have_repository;
 
 	if (state->apply_with_reject && state->threeway)
-		return error(_("--reject and --3way cannot be used together."));
+		return error(_("options '%s' and '%s' cannot be used together"), "--reject", "--3way");
 	if (state->threeway) {
 		if (is_not_gitdir)
-			return error(_("--3way outside a repository"));
+			return error(_("'%s' outside a repository"), "--3way");
 		state->check_index = 1;
 	}
 	if (state->apply_with_reject) {
@@ -147,10 +147,10 @@ int check_apply_state(struct apply_state *state, int force_apply)
 	if (!force_apply && (state->diffstat || state->numstat || state->summary || state->check || state->fake_ancestor))
 		state->apply = 0;
 	if (state->check_index && is_not_gitdir)
-		return error(_("--index outside a repository"));
+		return error(_("'%s' outside a repository"), "--index");
 	if (state->cached) {
 		if (is_not_gitdir)
-			return error(_("--cached outside a repository"));
+			return error(_("'%s' outside a repository"), "--cached");
 		state->check_index = 1;
 	}
 	if (state->ita_only && (state->check_index || is_not_gitdir))
@@ -3582,7 +3582,9 @@ static int try_threeway(struct apply_state *state,
 
 	/* No point falling back to 3-way merge in these cases */
 	if (patch->is_delete ||
-	    S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode))
+	    S_ISGITLINK(patch->old_mode) || S_ISGITLINK(patch->new_mode) ||
+	    (patch->is_new && !patch->direct_to_threeway) ||
+	    (patch->is_rename && !patch->lines_added && !patch->lines_deleted))
 		return -1;
 
 	/* Preimage the patch was prepared for */
@@ -4752,8 +4754,10 @@ static int apply_patch(struct apply_state *state,
 	}
 
 	if (!list && !skipped_patch) {
-		error(_("unrecognized input"));
-		res = -128;
+		if (!state->allow_empty) {
+			error(_("No valid patches in input (allow with \"--allow-empty\")"));
+			res = -128;
+		}
 		goto end;
 	}
 
@@ -5071,7 +5075,7 @@ int apply_parse_options(int argc, const char **argv,
 			N_("leave the rejected hunks in corresponding *.rej files")),
 		OPT_BOOL(0, "allow-overlap", &state->allow_overlap,
 			N_("allow overlapping hunks")),
-		OPT__VERBOSE(&state->apply_verbosity, N_("be verbose")),
+		OPT__VERBOSITY(&state->apply_verbosity),
 		OPT_BIT(0, "inaccurate-eof", options,
 			N_("tolerate incorrectly detected missing new-line at the end of file"),
 			APPLY_OPT_INACCURATE_EOF),
@@ -5081,6 +5085,8 @@ int apply_parse_options(int argc, const char **argv,
 		OPT_CALLBACK(0, "directory", state, N_("root"),
 			N_("prepend <root> to all filenames"),
 			apply_option_parse_directory),
+		OPT_BOOL(0, "allow-empty", &state->allow_empty,
+			N_("don't return error for empty patches")),
 		OPT_END()
 	};
 
diff --git a/apply.h b/apply.h
index da3d95fa50..16202da160 100644
--- a/apply.h
+++ b/apply.h
@@ -66,6 +66,7 @@ struct apply_state {
 	int threeway;
 	int unidiff_zero;
 	int unsafe_paths;
+	int allow_empty;
 
 	/* Other non boolean parameters */
 	struct repository *repo;
diff --git a/archive-tar.c b/archive-tar.c
index 05d2455870..3c74db1746 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -430,7 +430,6 @@ static int write_tar_filter_archive(const struct archiver *ar,
 {
 	struct strbuf cmd = STRBUF_INIT;
 	struct child_process filter = CHILD_PROCESS_INIT;
-	const char *argv[2];
 	int r;
 
 	if (!ar->data)
@@ -440,14 +439,12 @@ static int write_tar_filter_archive(const struct archiver *ar,
 	if (args->compression_level >= 0)
 		strbuf_addf(&cmd, " -%d", args->compression_level);
 
-	argv[0] = cmd.buf;
-	argv[1] = NULL;
-	filter.argv = argv;
+	strvec_push(&filter.args, cmd.buf);
 	filter.use_shell = 1;
 	filter.in = -1;
 
 	if (start_command(&filter) < 0)
-		die_errno(_("unable to start '%s' filter"), argv[0]);
+		die_errno(_("unable to start '%s' filter"), cmd.buf);
 	close(1);
 	if (dup2(filter.in, 1) < 0)
 		die_errno(_("unable to redirect descriptor"));
@@ -457,7 +454,7 @@ static int write_tar_filter_archive(const struct archiver *ar,
 
 	close(1);
 	if (finish_command(&filter) != 0)
-		die(_("'%s' filter reported error"), argv[0]);
+		die(_("'%s' filter reported error"), cmd.buf);
 
 	strbuf_release(&cmd);
 	return r;
diff --git a/archive.c b/archive.c
index a3bbb09125..d571249cf3 100644
--- a/archive.c
+++ b/archive.c
@@ -185,7 +185,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 
 	buffer = object_file_to_archive(args, path.buf, oid, mode, &type, &size);
 	if (!buffer)
-		return error(_("cannot read %s"), oid_to_hex(oid));
+		return error(_("cannot read '%s'"), oid_to_hex(oid));
 	err = write_entry(args, oid, path.buf, path.len, mode, buffer, size);
 	free(buffer);
 	return err;
@@ -338,7 +338,7 @@ int write_archive_entries(struct archiver_args *args,
 
 		strbuf_reset(&content);
 		if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
-			err = error_errno(_("could not read '%s'"), path);
+			err = error_errno(_("cannot read '%s'"), path);
 		else
 			err = write_entry(args, &fake_oid, path_in_archive.buf,
 					  path_in_archive.len,
@@ -577,11 +577,11 @@ static int parse_archive_args(int argc, const char **argv,
 	if (remote)
 		die(_("Unexpected option --remote"));
 	if (exec)
-		die(_("Option --exec can only be used together with --remote"));
+		die(_("the option '%s' requires '%s'"), "--exec", "--remote");
 	if (output)
 		die(_("Unexpected option --output"));
 	if (is_remote && args->extra_files.nr)
-		die(_("Options --add-file and --remote cannot be used together"));
+		die(_("options '%s' and '%s' cannot be used together"), "--add-file", "--remote");
 
 	if (!base)
 		base = "";
diff --git a/branch.c b/branch.c
index 07a46430b3..5d20a2e848 100644
--- a/branch.c
+++ b/branch.c
@@ -11,7 +11,7 @@
 
 struct tracking {
 	struct refspec_item spec;
-	char *src;
+	struct string_list *srcs;
 	const char *remote;
 	int matches;
 };
@@ -22,11 +22,11 @@ static int find_tracked_branch(struct remote *remote, void *priv)
 
 	if (!remote_find_tracking(remote, &tracking->spec)) {
 		if (++tracking->matches == 1) {
-			tracking->src = tracking->spec.src;
+			string_list_append(tracking->srcs, tracking->spec.src);
 			tracking->remote = remote->name;
 		} else {
 			free(tracking->spec.src);
-			FREE_AND_NULL(tracking->src);
+			string_list_clear(tracking->srcs, 0);
 		}
 		tracking->spec.src = NULL;
 	}
@@ -49,25 +49,46 @@ static int should_setup_rebase(const char *origin)
 	return 0;
 }
 
-static const char tracking_advice[] =
-N_("\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\".");
-
-int install_branch_config(int flag, const char *local, const char *origin, const char *remote)
+/**
+ * Install upstream tracking configuration for a branch; specifically, add
+ * `branch.<name>.remote` and `branch.<name>.merge` entries.
+ *
+ * `flag` contains integer flags for options; currently only
+ * BRANCH_CONFIG_VERBOSE is checked.
+ *
+ * `local` is the name of the branch whose configuration we're installing.
+ *
+ * `origin` is the name of the remote owning the upstream branches. NULL means
+ * the upstream branches are local to this repo.
+ *
+ * `remotes` is a list of refs that are upstream of local
+ */
+static int install_branch_config_multiple_remotes(int flag, const char *local,
+		const char *origin, struct string_list *remotes)
 {
 	const char *shortname = NULL;
 	struct strbuf key = STRBUF_INIT;
+	struct string_list_item *item;
 	int rebasing = should_setup_rebase(origin);
 
-	if (skip_prefix(remote, "refs/heads/", &shortname)
-	    && !strcmp(local, shortname)
-	    && !origin) {
-		warning(_("Not setting branch %s as its own upstream."),
-			local);
-		return 0;
-	}
+	if (!remotes->nr)
+		BUG("must provide at least one remote for branch config");
+	if (rebasing && remotes->nr > 1)
+		die(_("cannot inherit upstream tracking configuration of "
+		      "multiple refs when rebasing is requested"));
+
+	/*
+	 * If the new branch is trying to track itself, something has gone
+	 * wrong. Warn the user and don't proceed any further.
+	 */
+	if (!origin)
+		for_each_string_list_item(item, remotes)
+			if (skip_prefix(item->string, "refs/heads/", &shortname)
+			    && !strcmp(local, shortname)) {
+				warning(_("not setting branch '%s' as its own upstream"),
+					local);
+				return 0;
+			}
 
 	strbuf_addf(&key, "branch.%s.remote", local);
 	if (git_config_set_gently(key.buf, origin ? origin : ".") < 0)
@@ -75,8 +96,17 @@ int install_branch_config(int flag, const char *local, const char *origin, const
 
 	strbuf_reset(&key);
 	strbuf_addf(&key, "branch.%s.merge", local);
-	if (git_config_set_gently(key.buf, remote) < 0)
+	/*
+	 * We want to overwrite any existing config with all the branches in
+	 * "remotes". Override any existing config, then write our branches. If
+	 * more than one is provided, use CONFIG_REGEX_NONE to preserve what
+	 * we've written so far.
+	 */
+	if (git_config_set_gently(key.buf, NULL) < 0)
 		goto out_err;
+	for_each_string_list_item(item, remotes)
+		if (git_config_set_multivar_gently(key.buf, item->string, CONFIG_REGEX_NONE, 0) < 0)
+			goto out_err;
 
 	if (rebasing) {
 		strbuf_reset(&key);
@@ -87,45 +117,106 @@ int install_branch_config(int flag, const char *local, const char *origin, const
 	strbuf_release(&key);
 
 	if (flag & BRANCH_CONFIG_VERBOSE) {
-		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'."),
-					  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'."),
-					  local, shortname);
+		struct strbuf tmp_ref_name = STRBUF_INIT;
+		struct string_list friendly_ref_names = STRING_LIST_INIT_DUP;
+
+		for_each_string_list_item(item, remotes) {
+			shortname = item->string;
+			skip_prefix(shortname, "refs/heads/", &shortname);
+			if (origin) {
+				strbuf_addf(&tmp_ref_name, "%s/%s",
+					    origin, shortname);
+				string_list_append_nodup(
+					&friendly_ref_names,
+					strbuf_detach(&tmp_ref_name, NULL));
+			} else {
+				string_list_append(
+					&friendly_ref_names, shortname);
+			}
+		}
+
+		if (remotes->nr == 1) {
+			/*
+			 * Rebasing is only allowed in the case of a single
+			 * upstream branch.
+			 */
+			printf_ln(rebasing ?
+				_("branch '%s' set up to track '%s' by rebasing.") :
+				_("branch '%s' set up to track '%s'."),
+				local, friendly_ref_names.items[0].string);
 		} 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'."),
-					  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'."),
-					  local, remote);
+			printf_ln(_("branch '%s' set up to track:"), local);
+			for_each_string_list_item(item, &friendly_ref_names)
+				printf_ln("  %s", item->string);
 		}
+
+		string_list_clear(&friendly_ref_names, 0);
 	}
 
 	return 0;
 
 out_err:
 	strbuf_release(&key);
-	error(_("Unable to write upstream branch configuration"));
-
-	advise(_(tracking_advice),
-	       origin ? origin : "",
-	       origin ? "/" : "",
-	       shortname ? shortname : remote);
+	error(_("unable to write upstream branch configuration"));
+
+	advise(_("\nAfter fixing the error cause you may try to fix up\n"
+		"the remote tracking information by invoking:"));
+	if (remotes->nr == 1)
+		advise("  git branch --set-upstream-to=%s%s%s",
+			origin ? origin : "",
+			origin ? "/" : "",
+			remotes->items[0].string);
+	else {
+		advise("  git config --add branch.\"%s\".remote %s",
+			local, origin ? origin : ".");
+		for_each_string_list_item(item, remotes)
+			advise("  git config --add branch.\"%s\".merge %s",
+				local, item->string);
+	}
 
 	return -1;
 }
 
+int install_branch_config(int flag, const char *local, const char *origin,
+		const char *remote)
+{
+	int ret;
+	struct string_list remotes = STRING_LIST_INIT_DUP;
+
+	string_list_append(&remotes, remote);
+	ret = install_branch_config_multiple_remotes(flag, local, origin, &remotes);
+	string_list_clear(&remotes, 0);
+	return ret;
+}
+
+static int inherit_tracking(struct tracking *tracking, const char *orig_ref)
+{
+	const char *bare_ref;
+	struct branch *branch;
+	int i;
+
+	bare_ref = orig_ref;
+	skip_prefix(orig_ref, "refs/heads/", &bare_ref);
+
+	branch = branch_get(bare_ref);
+	if (!branch->remote_name) {
+		warning(_("asked to inherit tracking from '%s', but no remote is set"),
+			bare_ref);
+		return -1;
+	}
+
+	if (branch->merge_nr < 1 || !branch->merge_name || !branch->merge_name[0]) {
+		warning(_("asked to inherit tracking from '%s', but no merge configuration is set"),
+			bare_ref);
+		return -1;
+	}
+
+	tracking->remote = xstrdup(branch->remote_name);
+	for (i = 0; i < branch->merge_nr; i++)
+		string_list_append(tracking->srcs, branch->merge_name[i]);
+	return 0;
+}
+
 /*
  * This is called when new_ref is branched off of orig_ref, and tries
  * to infer the settings for branch.<new_ref>.{remote,merge} from the
@@ -135,11 +226,15 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
 			   enum branch_track track, int quiet)
 {
 	struct tracking tracking;
+	struct string_list tracking_srcs = STRING_LIST_INIT_DUP;
 	int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
 
 	memset(&tracking, 0, sizeof(tracking));
 	tracking.spec.dst = (char *)orig_ref;
-	if (for_each_remote(find_tracked_branch, &tracking))
+	tracking.srcs = &tracking_srcs;
+	if (track != BRANCH_TRACK_INHERIT)
+		for_each_remote(find_tracked_branch, &tracking);
+	else if (inherit_tracking(&tracking, orig_ref))
 		return;
 
 	if (!tracking.matches)
@@ -147,20 +242,23 @@ static void setup_tracking(const char *new_ref, const char *orig_ref,
 		case BRANCH_TRACK_ALWAYS:
 		case BRANCH_TRACK_EXPLICIT:
 		case BRANCH_TRACK_OVERRIDE:
+		case BRANCH_TRACK_INHERIT:
 			break;
 		default:
 			return;
 		}
 
 	if (tracking.matches > 1)
-		die(_("Not tracking: ambiguous information for ref %s"),
+		die(_("not tracking: ambiguous information for ref %s"),
 		    orig_ref);
 
-	if (install_branch_config(config_flags, new_ref, tracking.remote,
-			      tracking.src ? tracking.src : orig_ref) < 0)
+	if (tracking.srcs->nr < 1)
+		string_list_append(tracking.srcs, orig_ref);
+	if (install_branch_config_multiple_remotes(config_flags, new_ref,
+				tracking.remote, tracking.srcs) < 0)
 		exit(-1);
 
-	free(tracking.src);
+	string_list_clear(tracking.srcs, 0);
 }
 
 int read_branch_desc(struct strbuf *buf, const char *branch_name)
@@ -186,7 +284,7 @@ int read_branch_desc(struct strbuf *buf, const char *branch_name)
 int validate_branchname(const char *name, struct strbuf *ref)
 {
 	if (strbuf_check_branch_ref(ref, name))
-		die(_("'%s' is not a valid branch name."), name);
+		die(_("'%s' is not a valid branch name"), name);
 
 	return ref_exists(ref->buf);
 }
@@ -199,18 +297,23 @@ int validate_branchname(const char *name, struct strbuf *ref)
  */
 int validate_new_branchname(const char *name, struct strbuf *ref, int force)
 {
-	const char *head;
+	struct worktree **worktrees;
+	const struct worktree *wt;
 
 	if (!validate_branchname(name, ref))
 		return 0;
 
 	if (!force)
-		die(_("A branch named '%s' already exists."),
+		die(_("a branch named '%s' already exists"),
 		    ref->buf + strlen("refs/heads/"));
 
-	head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
-	if (!is_bare_repository() && head && !strcmp(head, ref->buf))
-		die(_("Cannot force update the current branch."));
+	worktrees = get_worktrees();
+	wt = find_shared_symref(worktrees, "HEAD", ref->buf);
+	if (wt && !wt->is_bare)
+		die(_("cannot force update the branch '%s' "
+		      "checked out at '%s'"),
+		    ref->buf + strlen("refs/heads/"), wt->path);
+	free_worktrees(worktrees);
 
 	return 1;
 }
@@ -230,7 +333,7 @@ static int validate_remote_tracking_branch(char *ref)
 }
 
 static const char upstream_not_branch[] =
-N_("Cannot setup tracking information; starting point '%s' is not a branch.");
+N_("cannot set up tracking information; starting point '%s' is not a branch");
 static const char upstream_missing[] =
 N_("the requested upstream branch '%s' does not exist");
 static const char upstream_advice[] =
@@ -278,7 +381,7 @@ void create_branch(struct repository *r,
 			}
 			die(_(upstream_missing), start_name);
 		}
-		die(_("Not a valid object name: '%s'."), start_name);
+		die(_("not a valid object name: '%s'"), start_name);
 	}
 
 	switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) {
@@ -298,12 +401,12 @@ void create_branch(struct repository *r,
 		}
 		break;
 	default:
-		die(_("Ambiguous object name: '%s'."), start_name);
+		die(_("ambiguous object name: '%s'"), start_name);
 		break;
 	}
 
 	if ((commit = lookup_commit_reference(r, &oid)) == NULL)
-		die(_("Not a valid branch point: '%s'."), start_name);
+		die(_("not a valid branch point: '%s'"), start_name);
 	oidcpy(&oid, &commit->object.oid);
 
 	if (reflog)
@@ -357,14 +460,16 @@ void remove_branch_state(struct repository *r, int verbose)
 
 void die_if_checked_out(const char *branch, int ignore_current_worktree)
 {
+	struct worktree **worktrees = get_worktrees();
 	const struct worktree *wt;
 
-	wt = find_shared_symref("HEAD", branch);
-	if (!wt || (ignore_current_worktree && wt->is_current))
-		return;
-	skip_prefix(branch, "refs/heads/", &branch);
-	die(_("'%s' is already checked out at '%s'"),
-	    branch, wt->path);
+	wt = find_shared_symref(worktrees, "HEAD", branch);
+	if (wt && (!ignore_current_worktree || !wt->is_current)) {
+		skip_prefix(branch, "refs/heads/", &branch);
+		die(_("'%s' is already checked out at '%s'"), branch, wt->path);
+	}
+
+	free_worktrees(worktrees);
 }
 
 int replace_each_worktree_head_symref(const char *oldref, const char *newref,
diff --git a/branch.h b/branch.h
index df0be61506..815dcd40c0 100644
--- a/branch.h
+++ b/branch.h
@@ -10,7 +10,8 @@ enum branch_track {
 	BRANCH_TRACK_REMOTE,
 	BRANCH_TRACK_ALWAYS,
 	BRANCH_TRACK_EXPLICIT,
-	BRANCH_TRACK_OVERRIDE
+	BRANCH_TRACK_OVERRIDE,
+	BRANCH_TRACK_INHERIT,
 };
 
 extern enum branch_track git_branch_track;
diff --git a/builtin/add.c b/builtin/add.c
index ef6b619c45..84dff3e796 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -302,15 +302,11 @@ int interactive_add(const char **argv, const char *prefix, int patch)
 static int edit_patch(int argc, const char **argv, const char *prefix)
 {
 	char *file = git_pathdup("ADD_EDIT.patch");
-	const char *apply_argv[] = { "apply", "--recount", "--cached",
-		NULL, NULL };
 	struct child_process child = CHILD_PROCESS_INIT;
 	struct rev_info rev;
 	int out;
 	struct stat st;
 
-	apply_argv[3] = file;
-
 	git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 
 	if (read_cache() < 0)
@@ -338,7 +334,8 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
 		die(_("Empty patch. Aborted."));
 
 	child.git_cmd = 1;
-	child.argv = apply_argv;
+	strvec_pushl(&child.args, "apply", "--recount", "--cached", file,
+		     NULL);
 	if (run_command(&child))
 		die(_("Could not apply '%s'"), file);
 
@@ -510,9 +507,9 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		add_interactive = 1;
 	if (add_interactive) {
 		if (show_only)
-			die(_("--dry-run is incompatible with --interactive/--patch"));
+			die(_("options '%s' and '%s' cannot be used together"), "--dry-run", "--interactive/--patch");
 		if (pathspec_from_file)
-			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
 		exit(interactive_add(argv + 1, prefix, patch_interactive));
 	}
 	if (legacy_stash_p) {
@@ -529,7 +526,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 	if (edit_interactive) {
 		if (pathspec_from_file)
-			die(_("--pathspec-from-file is incompatible with --edit"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--edit");
 		return(edit_patch(argc, argv, prefix));
 	}
 	argc--;
@@ -541,10 +538,10 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		addremove = 0; /* "-u" was given but not "-A" */
 
 	if (addremove && take_worktree_changes)
-		die(_("-A and -u are mutually incompatible"));
+		die(_("options '%s' and '%s' cannot be used together"), "-A", "-u");
 
 	if (!show_only && ignore_missing)
-		die(_("Option --ignore-missing can only be used together with --dry-run"));
+		die(_("the option '%s' requires '%s'"), "--ignore-missing", "--dry-run");
 
 	if (chmod_arg && ((chmod_arg[0] != '-' && chmod_arg[0] != '+') ||
 			  chmod_arg[1] != 'x' || chmod_arg[2]))
@@ -569,14 +566,14 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 	if (pathspec_from_file) {
 		if (pathspec.nr)
-			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+			die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 
 		parse_pathspec_file(&pathspec, PATHSPEC_ATTR,
 				    PATHSPEC_PREFER_FULL |
 				    PATHSPEC_SYMLINK_LEADING_PATH,
 				    prefix, pathspec_from_file, pathspec_file_nul);
 	} else if (pathspec_file_nul) {
-		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 	}
 
 	if (require_pathspec && pathspec.nr == 0) {
diff --git a/builtin/am.c b/builtin/am.c
index 8677ea2348..b6be1f1cb1 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -87,6 +87,12 @@ enum show_patch_type {
 	SHOW_PATCH_DIFF = 1,
 };
 
+enum empty_action {
+	STOP_ON_EMPTY_COMMIT = 0,  /* output errors and stop in the middle of an am session */
+	DROP_EMPTY_COMMIT,         /* skip with a notice message, unless "--quiet" has been passed */
+	KEEP_EMPTY_COMMIT,         /* keep recording as empty commits */
+};
+
 struct am_state {
 	/* state directory path */
 	char *dir;
@@ -118,6 +124,7 @@ struct am_state {
 	int message_id;
 	int scissors; /* enum scissors_type */
 	int quoted_cr; /* enum quoted_cr_action */
+	int empty_type; /* enum empty_action */
 	struct strvec git_apply_opts;
 	const char *resolvemsg;
 	int committer_date_is_author_date;
@@ -178,6 +185,25 @@ static int am_option_parse_quoted_cr(const struct option *opt,
 	return 0;
 }
 
+static int am_option_parse_empty(const struct option *opt,
+				     const char *arg, int unset)
+{
+	int *opt_value = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+
+	if (!strcmp(arg, "stop"))
+		*opt_value = STOP_ON_EMPTY_COMMIT;
+	else if (!strcmp(arg, "drop"))
+		*opt_value = DROP_EMPTY_COMMIT;
+	else if (!strcmp(arg, "keep"))
+		*opt_value = KEEP_EMPTY_COMMIT;
+	else
+		return error(_("Invalid value for --empty: %s"), arg);
+
+	return 0;
+}
+
 /**
  * Returns path relative to the am_state directory.
  */
@@ -1126,6 +1152,12 @@ static void NORETURN die_user_resolve(const struct am_state *state)
 
 		printf_ln(_("When you have resolved this problem, run \"%s --continue\"."), cmdline);
 		printf_ln(_("If you prefer to skip this patch, run \"%s --skip\" instead."), cmdline);
+
+		if (advice_enabled(ADVICE_AM_WORK_DIR) &&
+		    is_empty_or_missing_file(am_path(state, "patch")) &&
+		    !repo_index_has_changes(the_repository, NULL, NULL))
+			printf_ln(_("To record the empty patch as an empty commit, run \"%s --allow-empty\"."), cmdline);
+
 		printf_ln(_("To restore the original branch and stop patching, run \"%s --abort\"."), cmdline);
 	}
 
@@ -1248,11 +1280,6 @@ static int parse_mail(struct am_state *state, const char *mail)
 		goto finish;
 	}
 
-	if (is_empty_or_missing_file(am_path(state, "patch"))) {
-		printf_ln(_("Patch is empty."));
-		die_user_resolve(state);
-	}
-
 	strbuf_addstr(&msg, "\n\n");
 	strbuf_addbuf(&msg, &mi.log_message);
 	strbuf_stripspace(&msg, 0);
@@ -1763,6 +1790,7 @@ static void am_run(struct am_state *state, int resume)
 	while (state->cur <= state->last) {
 		const char *mail = am_path(state, msgnum(state));
 		int apply_status;
+		int to_keep;
 
 		reset_ident_date();
 
@@ -1792,8 +1820,29 @@ static void am_run(struct am_state *state, int resume)
 		if (state->interactive && do_interactive(state))
 			goto next;
 
+		to_keep = 0;
+		if (is_empty_or_missing_file(am_path(state, "patch"))) {
+			switch (state->empty_type) {
+			case DROP_EMPTY_COMMIT:
+				say(state, stdout, _("Skipping: %.*s"), linelen(state->msg), state->msg);
+				goto next;
+				break;
+			case KEEP_EMPTY_COMMIT:
+				to_keep = 1;
+				say(state, stdout, _("Creating an empty commit: %.*s"),
+					linelen(state->msg), state->msg);
+				break;
+			case STOP_ON_EMPTY_COMMIT:
+				printf_ln(_("Patch is empty."));
+				die_user_resolve(state);
+				break;
+			}
+		}
+
 		if (run_applypatch_msg_hook(state))
 			exit(1);
+		if (to_keep)
+			goto commit;
 
 		say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
 
@@ -1827,6 +1876,7 @@ static void am_run(struct am_state *state, int resume)
 			die_user_resolve(state);
 		}
 
+commit:
 		do_commit(state);
 
 next:
@@ -1856,19 +1906,24 @@ next:
 /**
  * Resume the current am session after patch application failure. The user did
  * all the hard work, and we do not have to do any patch application. Just
- * trust and commit what the user has in the index and working tree.
+ * trust and commit what the user has in the index and working tree. If `allow_empty`
+ * is true, commit as an empty commit when index has not changed and lacking a patch.
  */
-static void am_resolve(struct am_state *state)
+static void am_resolve(struct am_state *state, int allow_empty)
 {
 	validate_resume_state(state);
 
 	say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg);
 
 	if (!repo_index_has_changes(the_repository, NULL, NULL)) {
-		printf_ln(_("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."));
-		die_user_resolve(state);
+		if (allow_empty && is_empty_or_missing_file(am_path(state, "patch"))) {
+			printf_ln(_("No changes - recorded it as an empty commit."));
+		} else {
+			printf_ln(_("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."));
+			die_user_resolve(state);
+		}
 	}
 
 	if (unmerged_cache()) {
@@ -2195,7 +2250,8 @@ enum resume_type {
 	RESUME_SKIP,
 	RESUME_ABORT,
 	RESUME_QUIT,
-	RESUME_SHOW_PATCH
+	RESUME_SHOW_PATCH,
+	RESUME_ALLOW_EMPTY,
 };
 
 struct resume_mode {
@@ -2230,9 +2286,9 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar
 	}
 
 	if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode)
-		return error(_("--show-current-patch=%s is incompatible with "
-			       "--show-current-patch=%s"),
-			     arg, valid_modes[resume->sub_mode]);
+		return error(_("options '%s=%s' and '%s=%s' "
+					   "cannot be used together"),
+					 "--show-current-patch", "--show-current-patch", arg, valid_modes[resume->sub_mode]);
 
 	resume->mode = RESUME_SHOW_PATCH;
 	resume->sub_mode = new_value;
@@ -2348,6 +2404,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		  N_("show the patch being applied"),
 		  PARSE_OPT_CMDMODE | PARSE_OPT_OPTARG | PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 		  parse_opt_show_current_patch, RESUME_SHOW_PATCH },
+		OPT_CMDMODE(0, "allow-empty", &resume.mode,
+			N_("record the empty patch as an empty commit"),
+			RESUME_ALLOW_EMPTY),
 		OPT_BOOL(0, "committer-date-is-author-date",
 			&state.committer_date_is_author_date,
 			N_("lie about committer date")),
@@ -2357,6 +2416,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		{ OPTION_STRING, 'S', "gpg-sign", &state.sign_commit, N_("key-id"),
 		  N_("GPG-sign commits"),
 		  PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+		OPT_CALLBACK_F(STOP_ON_EMPTY_COMMIT, "empty", &state.empty_type, "{stop,drop,keep}",
+		  N_("how to handle empty patches"),
+		  PARSE_OPT_NONEG, am_option_parse_empty),
 		OPT_HIDDEN_BOOL(0, "rebasing", &state.rebasing,
 			N_("(internal use for git-rebase)")),
 		OPT_END()
@@ -2453,7 +2515,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		am_run(&state, 1);
 		break;
 	case RESUME_RESOLVED:
-		am_resolve(&state);
+	case RESUME_ALLOW_EMPTY:
+		am_resolve(&state, resume.mode == RESUME_ALLOW_EMPTY ? 1 : 0);
 		break;
 	case RESUME_SKIP:
 		am_skip(&state);
diff --git a/builtin/blame.c b/builtin/blame.c
index f9ee3f8c68..7fafeac408 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -939,6 +939,9 @@ parse_done:
 	revs.diffopt.flags.follow_renames = 0;
 	argc = parse_options_end(&ctx);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	if (incremental || (output_option & OUTPUT_PORCELAIN)) {
 		if (show_progress > 0)
 			die(_("--progress can't be used with --incremental or porcelain formats"));
diff --git a/builtin/branch.c b/builtin/branch.c
index 7a1d1eeb07..4ce2a24754 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -77,12 +77,11 @@ define_list_config_array(color_branch_slots);
 static int git_branch_config(const char *var, const char *value, void *cb)
 {
 	const char *slot_name;
-	struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
 
 	if (!strcmp(var, "branch.sort")) {
 		if (!value)
 			return config_error_nonbool(var);
-		parse_ref_sorting(sorting_tail, value);
+		string_list_append(cb, value);
 		return 0;
 	}
 
@@ -193,6 +192,7 @@ static void delete_branch_config(const char *branchname)
 static int delete_branches(int argc, const char **argv, int force, int kinds,
 			   int quiet)
 {
+	struct worktree **worktrees;
 	struct commit *head_rev = NULL;
 	struct object_id oid;
 	char *name = NULL;
@@ -229,6 +229,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 		if (!head_rev)
 			die(_("Couldn't look up commit object for HEAD"));
 	}
+
+	worktrees = get_worktrees();
+
 	for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
 		char *target = NULL;
 		int flags = 0;
@@ -239,7 +242,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 
 		if (kinds == FILTER_REFS_BRANCHES) {
 			const struct worktree *wt =
-				find_shared_symref("HEAD", name);
+				find_shared_symref(worktrees, "HEAD", name);
 			if (wt) {
 				error(_("Cannot delete branch '%s' "
 					"checked out at '%s'"),
@@ -300,6 +303,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 
 	free(name);
 	strbuf_release(&bname);
+	free_worktrees(worktrees);
 
 	return ret;
 }
@@ -625,7 +629,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	enum branch_track track;
 	struct ref_filter filter;
 	int icase = 0;
-	static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+	static struct ref_sorting *sorting;
+	struct string_list sorting_options = STRING_LIST_INIT_DUP;
 	struct ref_format format = REF_FORMAT_INIT;
 
 	struct option options[] = {
@@ -633,8 +638,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		OPT__VERBOSE(&filter.verbose,
 			N_("show hash and subject, give twice for upstream branch")),
 		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_CALLBACK_F('t', "track",  &track, "(direct|inherit)",
+			N_("set branch tracking configuration"),
+			PARSE_OPT_OPTARG,
+			parse_opt_tracking_mode),
 		OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"),
 			BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN),
 		OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
@@ -666,7 +673,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		OPT_MERGED(&filter, N_("print only branches that are merged")),
 		OPT_NO_MERGED(&filter, N_("print only branches that are not merged")),
 		OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
-		OPT_REF_SORT(sorting_tail),
+		OPT_REF_SORT(&sorting_options),
 		OPT_CALLBACK(0, "points-at", &filter.points_at, N_("object"),
 			N_("print only branches of the object"), parse_opt_object_name),
 		OPT_BOOL('i', "ignore-case", &icase, N_("sorting and filtering are case insensitive")),
@@ -683,7 +690,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_branch_usage, options);
 
-	git_config(git_branch_config, sorting_tail);
+	git_config(git_branch_config, &sorting_options);
 
 	track = git_branch_track;
 
@@ -717,7 +724,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	finalize_colopts(&colopts, -1);
 	if (filter.verbose) {
 		if (explicitly_enable_column(colopts))
-			die(_("--column and --verbose are incompatible"));
+			die(_("options '%s' and '%s' cannot be used together"), "--column", "--verbose");
 		colopts = 0;
 	}
 
@@ -749,8 +756,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		 * local branches 'refs/heads/...' and finally remote-tracking
 		 * branches 'refs/remotes/...'.
 		 */
-		if (!sorting)
-			sorting = ref_default_sorting();
+		sorting = ref_sorting_options(&sorting_options);
 		ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
 		ref_sorting_set_sort_flags_all(
 			sorting, REF_SORTING_DETACHED_HEAD_FIRST, 1);
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 86fc03242b..d94050e6c1 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -729,7 +729,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 	}
 
 	if (force_path && batch.enabled) {
-		error("--path=<path> incompatible with --batch");
+		error("options '--path=<path>' and '--batch' cannot be used together");
 		usage_with_options(cat_file_usage, options);
 	}
 
diff --git a/builtin/checkout.c b/builtin/checkout.c
index cbf73b8c9f..cc804ba8e1 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -91,8 +91,8 @@ struct checkout_opts {
 };
 
 struct branch_info {
-	const char *name; /* The short name used */
-	const char *path; /* The full name of a real branch */
+	char *name; /* The short name used */
+	char *path; /* The full name of a real branch */
 	struct commit *commit; /* The named commit */
 	char *refname; /* The full name of the ref being checked out. */
 	struct object_id oid; /* The object ID of the commit being checked out. */
@@ -103,6 +103,14 @@ struct branch_info {
 	char *checkout;
 };
 
+static void branch_info_release(struct branch_info *info)
+{
+	free(info->name);
+	free(info->path);
+	free(info->refname);
+	free(info->checkout);
+}
+
 static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
 			      int changed)
 {
@@ -456,10 +464,10 @@ static int checkout_paths(const struct checkout_opts *opts,
 		die(_("'%s' cannot be used with updating paths"), "--detach");
 
 	if (opts->merge && opts->patch_mode)
-		die(_("'%s' cannot be used with %s"), "--merge", "--patch");
+		die(_("options '%s' and '%s' cannot be used together"), "--merge", "--patch");
 
 	if (opts->ignore_unmerged && opts->merge)
-		die(_("'%s' cannot be used with %s"),
+		die(_("options '%s' and '%s' cannot be used together"),
 		    opts->ignore_unmerged_opt, "-m");
 
 	if (opts->new_branch)
@@ -688,9 +696,12 @@ static void setup_branch_path(struct branch_info *branch)
 		repo_get_oid_committish(the_repository, branch->name, &branch->oid);
 
 	strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL);
-	if (strcmp(buf.buf, branch->name))
+	if (strcmp(buf.buf, branch->name)) {
+		free(branch->name);
 		branch->name = xstrdup(buf.buf);
+	}
 	strbuf_splice(&buf, 0, 0, "refs/heads/", 11);
+	free(branch->path);
 	branch->path = strbuf_detach(&buf, NULL);
 }
 
@@ -874,7 +885,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 				int ret;
 				struct strbuf err = STRBUF_INIT;
 
-				ret = safe_create_reflog(refname, 1, &err);
+				ret = safe_create_reflog(refname, &err);
 				if (ret) {
 					fprintf(stderr, _("Can not do reflog for '%s': %s\n"),
 						opts->new_orphan_branch, err.buf);
@@ -894,7 +905,9 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 				      opts->new_branch_log,
 				      opts->quiet,
 				      opts->track);
-		new_branch_info->name = opts->new_branch;
+		free(new_branch_info->name);
+		free(new_branch_info->refname);
+		new_branch_info->name = xstrdup(opts->new_branch);
 		setup_branch_path(new_branch_info);
 	}
 
@@ -1062,8 +1075,7 @@ static int switch_branches(const struct checkout_opts *opts,
 			   struct branch_info *new_branch_info)
 {
 	int ret = 0;
-	struct branch_info old_branch_info;
-	void *path_to_free;
+	struct branch_info old_branch_info = { 0 };
 	struct object_id rev;
 	int flag, writeout_error = 0;
 	int do_merge = 1;
@@ -1071,25 +1083,29 @@ static int switch_branches(const struct checkout_opts *opts,
 	trace2_cmd_mode("branch");
 
 	memset(&old_branch_info, 0, sizeof(old_branch_info));
-	old_branch_info.path = path_to_free = resolve_refdup("HEAD", 0, &rev, &flag);
+	old_branch_info.path = resolve_refdup("HEAD", 0, &rev, &flag);
 	if (old_branch_info.path)
 		old_branch_info.commit = lookup_commit_reference_gently(the_repository, &rev, 1);
 	if (!(flag & REF_ISSYMREF))
-		old_branch_info.path = NULL;
+		FREE_AND_NULL(old_branch_info.path);
 
-	if (old_branch_info.path)
-		skip_prefix(old_branch_info.path, "refs/heads/", &old_branch_info.name);
+	if (old_branch_info.path) {
+		const char *const prefix = "refs/heads/";
+		const char *p;
+		if (skip_prefix(old_branch_info.path, prefix, &p))
+			old_branch_info.name = xstrdup(p);
+	}
 
 	if (opts->new_orphan_branch && opts->orphan_from_empty_tree) {
 		if (new_branch_info->name)
 			BUG("'switch --orphan' should never accept a commit as starting point");
 		new_branch_info->commit = NULL;
-		new_branch_info->name = "(empty)";
+		new_branch_info->name = xstrdup("(empty)");
 		do_merge = 1;
 	}
 
 	if (!new_branch_info->name) {
-		new_branch_info->name = "HEAD";
+		new_branch_info->name = xstrdup("HEAD");
 		new_branch_info->commit = old_branch_info.commit;
 		if (!new_branch_info->commit)
 			die(_("You are on a branch yet to be born"));
@@ -1102,7 +1118,7 @@ static int switch_branches(const struct checkout_opts *opts,
 	if (do_merge) {
 		ret = merge_working_tree(opts, &old_branch_info, new_branch_info, &writeout_error);
 		if (ret) {
-			free(path_to_free);
+			branch_info_release(&old_branch_info);
 			return ret;
 		}
 	}
@@ -1113,7 +1129,8 @@ static int switch_branches(const struct checkout_opts *opts,
 	update_refs_for_switch(opts, &old_branch_info, new_branch_info);
 
 	ret = post_checkout_hook(old_branch_info.commit, new_branch_info->commit, 1);
-	free(path_to_free);
+	branch_info_release(&old_branch_info);
+
 	return ret || writeout_error;
 }
 
@@ -1145,16 +1162,15 @@ static void setup_new_branch_info_and_source_tree(
 	struct tree **source_tree = &opts->source_tree;
 	struct object_id branch_rev;
 
-	new_branch_info->name = arg;
+	new_branch_info->name = xstrdup(arg);
 	setup_branch_path(new_branch_info);
 
 	if (!check_refname_format(new_branch_info->path, 0) &&
 	    !read_ref(new_branch_info->path, &branch_rev))
 		oidcpy(rev, &branch_rev);
-	else {
-		free((char *)new_branch_info->path);
-		new_branch_info->path = NULL; /* not an existing branch */
-	}
+	else
+		/* not an existing branch */
+		FREE_AND_NULL(new_branch_info->path);
 
 	new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
 	if (!new_branch_info->commit) {
@@ -1517,7 +1533,7 @@ static struct option *add_common_options(struct checkout_opts *opts,
 		OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")),
 		OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")),
 		OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"),
-			   N_("conflict style (merge or diff3)")),
+			   N_("conflict style (merge, diff3, or zdiff3)")),
 		OPT_END()
 	};
 	struct option *newopts = parse_options_concat(prevopts, options);
@@ -1530,8 +1546,10 @@ static struct option *add_common_switch_branch_options(
 {
 	struct option options[] = {
 		OPT_BOOL('d', "detach", &opts->force_detach, N_("detach HEAD at named commit")),
-		OPT_SET_INT('t', "track",  &opts->track, N_("set upstream info for new branch"),
-			BRANCH_TRACK_EXPLICIT),
+		OPT_CALLBACK_F('t', "track",  &opts->track, "(direct|inherit)",
+			N_("set branch tracking configuration"),
+			PARSE_OPT_OPTARG,
+			parse_opt_tracking_mode),
 		OPT__FORCE(&opts->force, N_("force checkout (throw away local modifications)"),
 			   PARSE_OPT_NOCOMPLETE),
 		OPT_STRING(0, "orphan", &opts->new_orphan_branch, N_("new-branch"), N_("new unparented branch")),
@@ -1574,12 +1592,11 @@ static char cb_option = 'b';
 
 static int checkout_main(int argc, const char **argv, const char *prefix,
 			 struct checkout_opts *opts, struct option *options,
-			 const char * const usagestr[])
+			 const char * const usagestr[],
+			 struct branch_info *new_branch_info)
 {
-	struct branch_info new_branch_info;
 	int parseopt_flags = 0;
 
-	memset(&new_branch_info, 0, sizeof(new_branch_info));
 	opts->overwrite_ignore = 1;
 	opts->prefix = prefix;
 	opts->show_progress = -1;
@@ -1617,11 +1634,11 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	}
 
 	if ((!!opts->new_branch + !!opts->new_branch_force + !!opts->new_orphan_branch) > 1)
-		die(_("-%c, -%c and --orphan are mutually exclusive"),
-				cb_option, toupper(cb_option));
+		die(_("options '-%c', '-%c', and '%s' cannot be used together"),
+			cb_option, toupper(cb_option), "--orphan");
 
 	if (opts->overlay_mode == 1 && opts->patch_mode)
-		die(_("-p and --overlay are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "-p", "--overlay");
 
 	if (opts->checkout_index >= 0 || opts->checkout_worktree >= 0) {
 		if (opts->checkout_index < 0)
@@ -1688,7 +1705,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 			opts->track == BRANCH_TRACK_UNSPECIFIED &&
 			!opts->new_branch;
 		int n = parse_branchname_arg(argc, argv, dwim_ok,
-					     &new_branch_info, opts, &rev);
+					     new_branch_info, opts, &rev);
 		argv += n;
 		argc -= n;
 	} else if (!opts->accept_ref && opts->from_treeish) {
@@ -1697,7 +1714,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 		if (get_oid_mb(opts->from_treeish, &rev))
 			die(_("could not resolve %s"), opts->from_treeish);
 
-		setup_new_branch_info_and_source_tree(&new_branch_info,
+		setup_new_branch_info_and_source_tree(new_branch_info,
 						      opts, &rev,
 						      opts->from_treeish);
 
@@ -1717,7 +1734,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 		 * Try to give more helpful suggestion.
 		 * new_branch && argc > 1 will be caught later.
 		 */
-		if (opts->new_branch && argc == 1 && !new_branch_info.commit)
+		if (opts->new_branch && argc == 1 && !new_branch_info->commit)
 			die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
 				argv[0], opts->new_branch);
 
@@ -1728,19 +1745,19 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 
 	if (opts->pathspec_from_file) {
 		if (opts->pathspec.nr)
-			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+			die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 
 		if (opts->force_detach)
-			die(_("--pathspec-from-file is incompatible with --detach"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--detach");
 
 		if (opts->patch_mode)
-			die(_("--pathspec-from-file is incompatible with --patch"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
 
 		parse_pathspec_file(&opts->pathspec, 0,
 				    0,
 				    prefix, opts->pathspec_from_file, opts->pathspec_file_nul);
 	} else if (opts->pathspec_file_nul) {
-		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 	}
 
 	opts->pathspec.recursive = 1;
@@ -1766,11 +1783,10 @@ static int checkout_main(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_branch_info);
+		return checkout_paths(opts, new_branch_info);
 	else
-		return checkout_branch(opts, &new_branch_info);
+		return checkout_branch(opts, new_branch_info);
 }
 
 int cmd_checkout(int argc, const char **argv, const char *prefix)
@@ -1789,6 +1805,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 	int ret;
+	struct branch_info new_branch_info = { 0 };
 
 	memset(&opts, 0, sizeof(opts));
 	opts.dwim_new_local_branch = 1;
@@ -1819,7 +1836,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 	options = add_checkout_path_options(&opts, options);
 
 	ret = checkout_main(argc, argv, prefix, &opts,
-			    options, checkout_usage);
+			    options, checkout_usage, &new_branch_info);
+	branch_info_release(&new_branch_info);
+	clear_pathspec(&opts.pathspec);
 	FREE_AND_NULL(options);
 	return ret;
 }
@@ -1840,6 +1859,7 @@ int cmd_switch(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 	int ret;
+	struct branch_info new_branch_info = { 0 };
 
 	memset(&opts, 0, sizeof(opts));
 	opts.dwim_new_local_branch = 1;
@@ -1859,7 +1879,8 @@ int cmd_switch(int argc, const char **argv, const char *prefix)
 	cb_option = 'c';
 
 	ret = checkout_main(argc, argv, prefix, &opts,
-			    options, switch_branch_usage);
+			    options, switch_branch_usage, &new_branch_info);
+	branch_info_release(&new_branch_info);
 	FREE_AND_NULL(options);
 	return ret;
 }
@@ -1881,6 +1902,7 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 	int ret;
+	struct branch_info new_branch_info = { 0 };
 
 	memset(&opts, 0, sizeof(opts));
 	opts.accept_ref = 0;
@@ -1896,7 +1918,8 @@ int cmd_restore(int argc, const char **argv, const char *prefix)
 	options = add_checkout_path_options(&opts, options);
 
 	ret = checkout_main(argc, argv, prefix, &opts,
-			    options, restore_usage);
+			    options, restore_usage, &new_branch_info);
+	branch_info_release(&new_branch_info);
 	FREE_AND_NULL(options);
 	return ret;
 }
diff --git a/builtin/clean.c b/builtin/clean.c
index 98a2860409..3ff02bbbff 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -36,6 +36,8 @@ 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 const char *msg_warn_lstat_failed = N_("could not lstat %s\n");
+static const char *msg_skip_cwd = N_("Refusing to remove current working directory\n");
+static const char *msg_would_skip_cwd = N_("Would refuse to remove current working directory\n");
 
 enum color_clean {
 	CLEAN_COLOR_RESET = 0,
@@ -153,6 +155,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 {
 	DIR *dir;
 	struct strbuf quoted = STRBUF_INIT;
+	struct strbuf realpath = STRBUF_INIT;
+	struct strbuf real_ocwd = STRBUF_INIT;
 	struct dirent *e;
 	int res = 0, ret = 0, gone = 1, original_len = path->len, len;
 	struct string_list dels = STRING_LIST_INIT_DUP;
@@ -231,16 +235,36 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 	strbuf_setlen(path, original_len);
 
 	if (*dir_gone) {
-		res = dry_run ? 0 : rmdir(path->buf);
-		if (!res)
-			*dir_gone = 1;
-		else {
-			int saved_errno = errno;
-			quote_path(path->buf, prefix, &quoted, 0);
-			errno = saved_errno;
-			warning_errno(_(msg_warn_remove_failed), quoted.buf);
+		/*
+		 * Normalize path components in path->buf, e.g. change '\' to
+		 * '/' on Windows.
+		 */
+		strbuf_realpath(&realpath, path->buf, 1);
+
+		/*
+		 * path and realpath are absolute; for comparison, we would
+		 * like to transform startup_info->original_cwd to an absolute
+		 * path too.
+		 */
+		 if (startup_info->original_cwd)
+			 strbuf_realpath(&real_ocwd,
+					 startup_info->original_cwd, 1);
+
+		if (!strbuf_cmp(&realpath, &real_ocwd)) {
+			printf("%s", dry_run ? _(msg_would_skip_cwd) : _(msg_skip_cwd));
 			*dir_gone = 0;
-			ret = 1;
+		} else {
+			res = dry_run ? 0 : rmdir(path->buf);
+			if (!res)
+				*dir_gone = 1;
+			else {
+				int saved_errno = errno;
+				quote_path(path->buf, prefix, &quoted, 0);
+				errno = saved_errno;
+				warning_errno(_(msg_warn_remove_failed), quoted.buf);
+				*dir_gone = 0;
+				ret = 1;
+			}
 		}
 	}
 
@@ -250,6 +274,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			printf(dry_run ?  _(msg_would_remove) : _(msg_remove), dels.items[i].string);
 	}
 out:
+	strbuf_release(&realpath);
+	strbuf_release(&real_ocwd);
 	strbuf_release(&quoted);
 	string_list_clear(&dels, 0);
 	return ret;
diff --git a/builtin/clone.c b/builtin/clone.c
index fb377b2765..727e16e0ae 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -633,7 +633,7 @@ static int git_sparse_checkout_init(const char *repo)
 {
 	struct strvec argv = STRVEC_INIT;
 	int result = 0;
-	strvec_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL);
+	strvec_pushl(&argv, "-C", repo, "sparse-checkout", "set", NULL);
 
 	/*
 	 * We must apply the setting in the current process
@@ -900,10 +900,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 	if (option_bare) {
 		if (option_origin)
-			die(_("--bare and --origin %s options are incompatible."),
-			    option_origin);
+			die(_("options '%s' and '%s %s' cannot be used together"),
+			    "--bare", "--origin", option_origin);
 		if (real_git_dir)
-			die(_("--bare and --separate-git-dir are incompatible."));
+			die(_("options '%s' and '%s' cannot be used together"), "--bare", "--separate-git-dir");
 		option_no_checkout = 1;
 	}
 
@@ -1290,7 +1290,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	 */
 	submodule_progress = transport->progress;
 
-	transport_unlock_pack(transport);
+	transport_unlock_pack(transport, 0);
 	transport_disconnect(transport);
 
 	if (option_dissociate) {
diff --git a/builtin/commit.c b/builtin/commit.c
index 883c16256c..b9ed0374e3 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -355,19 +355,19 @@ static const char *prepare_index(const char **argv, const char *prefix,
 
 	if (pathspec_from_file) {
 		if (interactive)
-			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch");
 
 		if (all)
-			die(_("--pathspec-from-file with -a does not make sense"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "-a");
 
 		if (pathspec.nr)
-			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+			die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 
 		parse_pathspec_file(&pathspec, 0,
 				    PATHSPEC_PREFER_FULL,
 				    prefix, pathspec_from_file, pathspec_file_nul);
 	} else if (pathspec_file_nul) {
-		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 	}
 
 	if (!pathspec.nr && (also || (only && !allow_empty &&
@@ -799,7 +799,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 
 		if (!strcmp(fixup_prefix, "amend")) {
 			if (have_option_m)
-				die(_("cannot combine -m with --fixup:%s"), fixup_message);
+				die(_("options '%s' and '%s:%s' cannot be used together"), "-m", "--fixup", fixup_message);
 			prepare_amend_commit(commit, &sb, &ctx);
 		}
 	} else if (!stat(git_path_merge_msg(the_repository), &statbuf)) {
@@ -1193,7 +1193,7 @@ static void finalize_deferred_config(struct wt_status *s)
 		    status_format == STATUS_FORMAT_UNSPECIFIED)
 			status_format = STATUS_FORMAT_PORCELAIN;
 		else if (status_format == STATUS_FORMAT_LONG)
-			die(_("--long and -z are incompatible"));
+			die(_("options '%s' and '%s' cannot be used together"), "--long", "-z");
 	}
 
 	if (use_deferred_config && status_format == STATUS_FORMAT_UNSPECIFIED)
@@ -1229,9 +1229,10 @@ static void check_fixup_reword_options(int argc, const char *argv[]) {
 			die(_("You are in the middle of a cherry-pick -- cannot reword."));
 	}
 	if (argc)
-		die(_("cannot combine reword option of --fixup with path '%s'"), *argv);
+		die(_("reword option of '%s' and path '%s' cannot be used together"), "--fixup", *argv);
 	if (patch_interactive || interactive || all || also || only)
-		die(_("reword option of --fixup is mutually exclusive with --patch/--interactive/--all/--include/--only"));
+		die(_("reword option of '%s' and '%s' cannot be used together"),
+			"--fixup", "--patch/--interactive/--all/--include/--only");
 }
 
 static int parse_and_validate_options(int argc, const char *argv[],
diff --git a/builtin/credential.c b/builtin/credential.c
index d75dcdc64a..d7b304fa08 100644
--- a/builtin/credential.c
+++ b/builtin/credential.c
@@ -4,7 +4,7 @@
 #include "config.h"
 
 static const char usage_msg[] =
-	"git credential [fill|approve|reject]";
+	"git credential (fill|approve|reject)";
 
 int cmd_credential(int argc, const char **argv, const char *prefix)
 {
diff --git a/builtin/describe.c b/builtin/describe.c
index e912ba50d7..42159cd26b 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -590,7 +590,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 	save_commit_buffer = 0;
 
 	if (longformat && abbrev == 0)
-		die(_("--long is incompatible with --abbrev=0"));
+		die(_("options '%s' and '%s' cannot be used together"), "--long", "--abbrev=0");
 
 	if (contains) {
 		struct string_list_item *item;
@@ -670,9 +670,9 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 		}
 		describe("HEAD", 1);
 	} else if (dirty) {
-		die(_("--dirty is incompatible with commit-ishes"));
+		die(_("option '%s' and commit-ishes cannot be used together"), "--dirty");
 	} else if (broken) {
-		die(_("--broken is incompatible with commit-ishes"));
+		die(_("option '%s' and commit-ishes cannot be used together"), "--broken");
 	} else {
 		while (argc-- > 0)
 			describe(*argv++, argc == 0);
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index f33d30d57b..0e0ac1f167 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -152,7 +152,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 	}
 
 	if (read_stdin && merge_base)
-		die(_("--stdin and --merge-base are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "--stdin", "--merge-base");
 	if (merge_base && opt->pending.nr != 2)
 		die(_("--merge-base only works with two commits"));
 
diff --git a/builtin/diff.c b/builtin/diff.c
index dd8ce688ba..fa4683377e 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -437,6 +437,11 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 
 	prefix = setup_git_directory_gently(&nongit);
 
+	if (!nongit) {
+		prepare_repo_settings(the_repository);
+		the_repository->settings.command_requires_full_index = 0;
+	}
+
 	if (!no_index) {
 		/*
 		 * Treat git diff with at least one path outside of the
diff --git a/builtin/difftool.c b/builtin/difftool.c
index 4931c10845..c79fbbf67e 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -202,15 +202,10 @@ static void changed_files(struct hashmap *result, const char *index_path,
 {
 	struct child_process update_index = CHILD_PROCESS_INIT;
 	struct child_process diff_files = CHILD_PROCESS_INIT;
-	struct strbuf index_env = STRBUF_INIT, buf = STRBUF_INIT;
-	const char *git_dir = absolute_path(get_git_dir()), *env[] = {
-		NULL, NULL
-	};
+	struct strbuf buf = STRBUF_INIT;
+	const char *git_dir = absolute_path(get_git_dir());
 	FILE *fp;
 
-	strbuf_addf(&index_env, "GIT_INDEX_FILE=%s", index_path);
-	env[0] = index_env.buf;
-
 	strvec_pushl(&update_index.args,
 		     "--git-dir", git_dir, "--work-tree", workdir,
 		     "update-index", "--really-refresh", "-q",
@@ -222,7 +217,7 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	update_index.use_shell = 0;
 	update_index.clean_on_exit = 1;
 	update_index.dir = workdir;
-	update_index.env = env;
+	strvec_pushf(&update_index.env_array, "GIT_INDEX_FILE=%s", index_path);
 	/* Ignore any errors of update-index */
 	run_command(&update_index);
 
@@ -235,7 +230,7 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	diff_files.clean_on_exit = 1;
 	diff_files.out = -1;
 	diff_files.dir = workdir;
-	diff_files.env = env;
+	strvec_pushf(&diff_files.env_array, "GIT_INDEX_FILE=%s", index_path);
 	if (start_command(&diff_files))
 		die("could not obtain raw diff");
 	fp = xfdopen(diff_files.out, "r");
@@ -248,7 +243,6 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	fclose(fp);
 	if (finish_command(&diff_files))
 		die("diff-files did not exit properly");
-	strbuf_release(&index_env);
 	strbuf_release(&buf);
 }
 
@@ -736,10 +730,10 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
 		setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
 		setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
 	} else if (dir_diff)
-		die(_("--dir-diff is incompatible with --no-index"));
+		die(_("options '%s' and '%s' cannot be used together"), "--dir-diff", "--no-index");
 
 	if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
-		die(_("--gui, --tool and --extcmd are mutually exclusive"));
+		die(_("options '%s', '%s', and '%s' cannot be used together"), "--gui", "--tool", "--extcmd");
 
 	if (use_gui_tool)
 		setenv("GIT_MERGETOOL_GUI", "true", 1);
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8e2caf7281..9f1c730e58 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -107,18 +107,6 @@ static int parse_opt_reencode_mode(const struct option *opt,
 
 static struct decoration idnums;
 static uint32_t last_idnum;
-
-static int has_unshown_parent(struct commit *commit)
-{
-	struct commit_list *parent;
-
-	for (parent = commit->parents; parent; parent = parent->next)
-		if (!(parent->item->object.flags & SHOWN) &&
-		    !(parent->item->object.flags & UNINTERESTING))
-			return 1;
-	return 0;
-}
-
 struct anonymized_entry {
 	struct hashmap_entry hash;
 	const char *anon;
@@ -752,20 +740,6 @@ static char *anonymize_tag(void *data)
 	return strbuf_detach(&out, NULL);
 }
 
-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 *)object_array_pop(commits);
-		if (has_unshown_parent(commit)) {
-			/* Queue again, to be handled later */
-			add_object_array(&commit->object, NULL, commits);
-			return;
-		}
-		handle_commit(commit, revs, paths_of_changed_objects);
-	}
-}
 
 static void handle_tag(const char *name, struct tag *tag)
 {
@@ -1185,7 +1159,6 @@ static int parse_opt_anonymize_map(const struct option *opt,
 int cmd_fast_export(int argc, const char **argv, const char *prefix)
 {
 	struct rev_info revs;
-	struct object_array commits = OBJECT_ARRAY_INIT;
 	struct commit *commit;
 	char *export_filename = NULL,
 	     *import_filename = NULL,
@@ -1254,7 +1227,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 		usage_with_options (fast_export_usage, options);
 
 	if (anonymized_seeds.cmpfn && !anonymize)
-		die(_("--anonymize-map without --anonymize does not make sense"));
+		die(_("the option '%s' requires '%s'"), "--anonymize-map", "--anonymize");
 
 	if (refspecs_list.nr) {
 		int i;
@@ -1269,7 +1242,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 		printf("feature done\n");
 
 	if (import_filename && import_filename_if_exists)
-		die(_("Cannot pass both --import-marks and --import-marks-if-exists"));
+		die(_("options '%s' and '%s' cannot be used together"), "--import-marks", "--import-marks-if-exists");
 	if (import_filename)
 		import_marks(import_filename, 0);
 	else if (import_filename_if_exists)
@@ -1283,18 +1256,13 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 
 	if (prepare_revision_walk(&revs))
 		die("revision walk setup failed");
+
+	revs.reverse = 1;
 	revs.diffopt.format_callback = show_filemodify;
 	revs.diffopt.format_callback_data = &paths_of_changed_objects;
 	revs.diffopt.flags.recursive = 1;
-	while ((commit = get_revision(&revs))) {
-		if (has_unshown_parent(commit)) {
-			add_object_array(&commit->object, NULL, &commits);
-		}
-		else {
-			handle_commit(commit, &revs, &paths_of_changed_objects);
-			handle_tail(&commits, &revs, &paths_of_changed_objects);
-		}
-	}
+	while ((commit = get_revision(&revs)))
+		handle_commit(commit, &revs, &paths_of_changed_objects);
 
 	handle_tags_and_duplicates(&extra_refs);
 	handle_tags_and_duplicates(&tag_refs);
diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index 20406f6775..2b2e28bad7 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -401,16 +401,18 @@ static void dump_marks(void);
 
 static NORETURN void die_nicely(const char *err, va_list params)
 {
+	va_list cp;
 	static int zombie;
-	char message[2 * PATH_MAX];
+	report_fn die_message_fn = get_die_message_routine();
 
-	vsnprintf(message, sizeof(message), err, params);
-	fputs("fatal: ", stderr);
-	fputs(message, stderr);
-	fputc('\n', stderr);
+	va_copy(cp, params);
+	die_message_fn(err, params);
 
 	if (!zombie) {
+		char message[2 * PATH_MAX];
+
 		zombie = 1;
+		vsnprintf(message, sizeof(message), err, cp);
 		write_crash_report(message);
 		end_packfile();
 		unkeep_all_packs();
diff --git a/builtin/fetch.c b/builtin/fetch.c
index f7abbc31ff..5f06b21f8e 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -28,6 +28,7 @@
 #include "promisor-remote.h"
 #include "commit-graph.h"
 #include "shallow.h"
+#include "worktree.h"
 
 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
 
@@ -222,17 +223,22 @@ static struct option builtin_fetch_options[] = {
 	OPT_END()
 };
 
-static void unlock_pack(void)
+static void unlock_pack(unsigned int flags)
 {
 	if (gtransport)
-		transport_unlock_pack(gtransport);
+		transport_unlock_pack(gtransport, flags);
 	if (gsecondary)
-		transport_unlock_pack(gsecondary);
+		transport_unlock_pack(gsecondary, flags);
+}
+
+static void unlock_pack_atexit(void)
+{
+	unlock_pack(0);
 }
 
 static void unlock_pack_on_signal(int signo)
 {
-	unlock_pack();
+	unlock_pack(TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER);
 	sigchain_pop(signo);
 	raise(signo);
 }
@@ -552,7 +558,7 @@ static struct ref *get_ref_map(struct remote *remote,
 		for (i = 0; i < fetch_refspec->nr; i++)
 			get_fetch_map(ref_map, &fetch_refspec->items[i], &oref_tail, 1);
 	} else if (refmap.nr) {
-		die("--refmap option is only meaningful with command-line refspec(s).");
+		die("--refmap option is only meaningful with command-line refspec(s)");
 	} else {
 		/* Use the defaults */
 		struct branch *branch = branch_get(NULL);
@@ -583,7 +589,7 @@ static struct ref *get_ref_map(struct remote *remote,
 		} else if (!prefetch) {
 			ref_map = get_remote_ref(remote_refs, "HEAD");
 			if (!ref_map)
-				die(_("Couldn't find remote ref HEAD"));
+				die(_("couldn't find remote ref HEAD"));
 			ref_map->fetch_head_status = FETCH_HEAD_MERGE;
 			tail = &ref_map->next;
 		}
@@ -848,13 +854,12 @@ static void format_display(struct strbuf *display, char code,
 
 static int update_local_ref(struct ref *ref,
 			    struct ref_transaction *transaction,
-			    const char *remote,
-			    const struct ref *remote_ref,
-			    struct strbuf *display,
-			    int summary_width)
+			    const char *remote, const struct ref *remote_ref,
+			    struct strbuf *display, int summary_width,
+			    struct worktree **worktrees)
 {
 	struct commit *current = NULL, *updated;
-	struct branch *current_branch = branch_get(NULL);
+	const struct worktree *wt;
 	const char *pretty_ref = prettify_refname(ref->name);
 	int fast_forward = 0;
 
@@ -868,16 +873,17 @@ static int update_local_ref(struct ref *ref,
 		return 0;
 	}
 
-	if (current_branch &&
-	    !strcmp(ref->name, current_branch->name) &&
-	    !(update_head_ok || is_bare_repository()) &&
-	    !is_null_oid(&ref->old_oid)) {
+	if (!update_head_ok &&
+	    (wt = find_shared_symref(worktrees, "HEAD", ref->name)) &&
+	    !wt->is_bare && !is_null_oid(&ref->old_oid)) {
 		/*
 		 * If this is the head, and it's not okay to update
 		 * the head, and the old value of the head isn't empty...
 		 */
 		format_display(display, '!', _("[rejected]"),
-			       _("can't fetch in current branch"),
+			       wt->is_current ?
+				       _("can't fetch in current branch") :
+				       _("checked out in another worktree"),
 			       remote, pretty_ref, summary_width);
 		return 1;
 	}
@@ -995,7 +1001,7 @@ static int open_fetch_head(struct fetch_head *fetch_head)
 	if (write_fetch_head) {
 		fetch_head->fp = fopen(filename, "a");
 		if (!fetch_head->fp)
-			return error_errno(_("cannot open %s"), filename);
+			return error_errno(_("cannot open '%s'"), filename);
 		strbuf_init(&fetch_head->buf, 0);
 	} else {
 		fetch_head->fp = NULL;
@@ -1067,16 +1073,17 @@ static void close_fetch_head(struct fetch_head *fetch_head)
 }
 
 static const char warn_show_forced_updates[] =
-N_("Fetch normally indicates which branches had a forced update,\n"
-   "but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-   "flag or run 'git config fetch.showForcedUpdates true'.");
+N_("fetch normally indicates which branches had a forced update,\n"
+   "but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+   "flag or run 'git config fetch.showForcedUpdates true'");
 static const char warn_time_show_forced_updates[] =
-N_("It took %.2f seconds to check forced updates. You can use\n"
+N_("it took %.2f seconds to check forced updates; you can use\n"
    "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
-   " to avoid this check.\n");
+   "to avoid this check\n");
 
 static int store_updated_refs(const char *raw_url, const char *remote_name,
-			      int connectivity_checked, struct ref *ref_map)
+			      int connectivity_checked, struct ref *ref_map,
+			      struct worktree **worktrees)
 {
 	struct fetch_head fetch_head;
 	int url_len, i, rc = 0;
@@ -1205,7 +1212,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 			strbuf_reset(&note);
 			if (ref) {
 				rc |= update_local_ref(ref, transaction, what,
-						       rm, &note, summary_width);
+						       rm, &note, summary_width,
+						       worktrees);
 				free(ref);
 			} else if (write_fetch_head || dry_run) {
 				/*
@@ -1298,7 +1306,9 @@ static int check_exist_and_connected(struct ref *ref_map)
 	return check_connected(iterate_ref_map, &rm, &opt);
 }
 
-static int fetch_and_consume_refs(struct transport *transport, struct ref *ref_map)
+static int fetch_and_consume_refs(struct transport *transport,
+				  struct ref *ref_map,
+				  struct worktree **worktrees)
 {
 	int connectivity_checked = 1;
 	int ret;
@@ -1319,14 +1329,12 @@ static int fetch_and_consume_refs(struct transport *transport, struct ref *ref_m
 	}
 
 	trace2_region_enter("fetch", "consume_refs", the_repository);
-	ret = store_updated_refs(transport->url,
-				 transport->remote->name,
-				 connectivity_checked,
-				 ref_map);
+	ret = store_updated_refs(transport->url, transport->remote->name,
+				 connectivity_checked, ref_map, worktrees);
 	trace2_region_leave("fetch", "consume_refs", the_repository);
 
 out:
-	transport_unlock_pack(transport);
+	transport_unlock_pack(transport, 0);
 	return ret;
 }
 
@@ -1385,18 +1393,18 @@ static int prune_refs(struct refspec *rs, struct ref *ref_map,
 	return result;
 }
 
-static void check_not_current_branch(struct ref *ref_map)
+static void check_not_current_branch(struct ref *ref_map,
+				     struct worktree **worktrees)
 {
-	struct branch *current_branch = branch_get(NULL);
-
-	if (is_bare_repository() || !current_branch)
-		return;
-
+	const struct worktree *wt;
 	for (; ref_map; ref_map = ref_map->next)
-		if (ref_map->peer_ref && !strcmp(current_branch->refname,
-					ref_map->peer_ref->name))
-			die(_("Refusing to fetch into current branch %s "
-			    "of non-bare repository"), current_branch->refname);
+		if (ref_map->peer_ref &&
+		    (wt = find_shared_symref(worktrees, "HEAD",
+					     ref_map->peer_ref->name)) &&
+		    !wt->is_bare)
+			die(_("refusing to fetch into branch '%s' "
+			      "checked out at '%s'"),
+			    ref_map->peer_ref->name, wt->path);
 }
 
 static int truncate_fetch_head(void)
@@ -1405,7 +1413,7 @@ static int truncate_fetch_head(void)
 	FILE *fp = fopen_for_writing(filename);
 
 	if (!fp)
-		return error_errno(_("cannot open %s"), filename);
+		return error_errno(_("cannot open '%s'"), filename);
 	fclose(fp);
 	return 0;
 }
@@ -1414,10 +1422,10 @@ static void set_option(struct transport *transport, const char *name, const char
 {
 	int r = transport_set_option(transport, name, value);
 	if (r < 0)
-		die(_("Option \"%s\" value \"%s\" is not valid for %s"),
+		die(_("option \"%s\" value \"%s\" is not valid for %s"),
 		    name, value, transport->url);
 	if (r > 0)
-		warning(_("Option \"%s\" is ignored for %s\n"),
+		warning(_("option \"%s\" is ignored for %s\n"),
 			name, transport->url);
 }
 
@@ -1451,7 +1459,7 @@ static void add_negotiation_tips(struct git_transport_options *smart_options)
 		old_nr = oids->nr;
 		for_each_glob_ref(add_oid, s, oids);
 		if (old_nr == oids->nr)
-			warning("Ignoring --negotiation-tip=%s because it does not match any refs",
+			warning("ignoring --negotiation-tip=%s because it does not match any refs",
 				s);
 	}
 	smart_options->negotiation_tips = oids;
@@ -1489,12 +1497,13 @@ static struct transport *prepare_transport(struct remote *remote, int deepen)
 		if (transport->smart_options)
 			add_negotiation_tips(transport->smart_options);
 		else
-			warning("Ignoring --negotiation-tip because the protocol does not support it.");
+			warning("ignoring --negotiation-tip because the protocol does not support it");
 	}
 	return transport;
 }
 
-static void backfill_tags(struct transport *transport, struct ref *ref_map)
+static void backfill_tags(struct transport *transport, struct ref *ref_map,
+			  struct worktree **worktrees)
 {
 	int cannot_reuse;
 
@@ -1515,7 +1524,7 @@ static void backfill_tags(struct transport *transport, struct ref *ref_map)
 	transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL);
 	transport_set_option(transport, TRANS_OPT_DEPTH, "0");
 	transport_set_option(transport, TRANS_OPT_DEEPEN_RELATIVE, NULL);
-	fetch_and_consume_refs(transport, ref_map);
+	fetch_and_consume_refs(transport, ref_map, worktrees);
 
 	if (gsecondary) {
 		transport_disconnect(gsecondary);
@@ -1533,6 +1542,7 @@ static int do_fetch(struct transport *transport,
 	struct transport_ls_refs_options transport_ls_refs_options =
 		TRANSPORT_LS_REFS_OPTIONS_INIT;
 	int must_list_refs = 1;
+	struct worktree **worktrees = get_worktrees();
 
 	if (tags == TAGS_DEFAULT) {
 		if (transport->remote->fetch_tags == 2)
@@ -1588,7 +1598,7 @@ static int do_fetch(struct transport *transport,
 	ref_map = get_ref_map(transport->remote, remote_refs, rs,
 			      tags, &autotags);
 	if (!update_head_ok)
-		check_not_current_branch(ref_map);
+		check_not_current_branch(ref_map, worktrees);
 
 	if (tags == TAGS_DEFAULT && autotags)
 		transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
@@ -1606,7 +1616,7 @@ static int do_fetch(struct transport *transport,
 				   transport->url);
 		}
 	}
-	if (fetch_and_consume_refs(transport, ref_map)) {
+	if (fetch_and_consume_refs(transport, ref_map, worktrees)) {
 		free_refs(ref_map);
 		retcode = 1;
 		goto cleanup;
@@ -1638,6 +1648,16 @@ static int do_fetch(struct transport *transport,
 			}
 		}
 		if (source_ref) {
+			if (!branch) {
+				const char *shortname = source_ref->name;
+				skip_prefix(shortname, "refs/heads/", &shortname);
+
+				warning(_("could not set upstream of HEAD to '%s' from '%s' when "
+					  "it does not point to any branch."),
+					shortname, transport->remote->name);
+				goto skip;
+			}
+
 			if (!strcmp(source_ref->name, "HEAD") ||
 			    starts_with(source_ref->name, "refs/heads/"))
 				install_branch_config(0,
@@ -1651,11 +1671,11 @@ static int do_fetch(struct transport *transport,
 			else
 				warning(_("unknown branch type"));
 		} else {
-			warning(_("no source branch found.\n"
-				"you need to specify exactly one branch with the --set-upstream option."));
+			warning(_("no source branch found;\n"
+				  "you need to specify exactly one branch with the --set-upstream option"));
 		}
 	}
- skip:
+skip:
 	free_refs(ref_map);
 
 	/* if neither --no-tags nor --tags was specified, do automated tag
@@ -1665,11 +1685,12 @@ static int do_fetch(struct transport *transport,
 		ref_map = NULL;
 		find_non_local_tags(remote_refs, &ref_map, &tail);
 		if (ref_map)
-			backfill_tags(transport, ref_map);
+			backfill_tags(transport, ref_map, worktrees);
 		free_refs(ref_map);
 	}
 
- cleanup:
+cleanup:
+	free_worktrees(worktrees);
 	return retcode;
 }
 
@@ -1790,7 +1811,7 @@ static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb)
 	struct parallel_fetch_state *state = cb;
 	const char *remote = task_cb;
 
-	state->result = error(_("Could not fetch %s"), remote);
+	state->result = error(_("could not fetch %s"), remote);
 
 	return 0;
 }
@@ -1845,7 +1866,7 @@ static int fetch_multiple(struct string_list *list, int max_children)
 			if (verbosity >= 0)
 				printf(_("Fetching %s\n"), name);
 			if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
-				error(_("Could not fetch %s"), name);
+				error(_("could not fetch %s"), name);
 				result = 1;
 			}
 			strvec_pop(&argv);
@@ -1906,8 +1927,8 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
 	int remote_via_config = remote_is_configured(remote, 0);
 
 	if (!remote)
-		die(_("No remote repository specified.  Please, specify either a URL or a\n"
-		    "remote name from which new revisions should be fetched."));
+		die(_("no remote repository specified; please specify either a URL or a\n"
+		      "remote name from which new revisions should be fetched"));
 
 	gtransport = prepare_transport(remote, 1);
 
@@ -1942,7 +1963,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
 		if (!strcmp(argv[i], "tag")) {
 			i++;
 			if (i >= argc)
-				die(_("You need to specify a tag name."));
+				die(_("you need to specify a tag name"));
 
 			refspec_appendf(&rs, "refs/tags/%s:refs/tags/%s",
 					argv[i], argv[i]);
@@ -1962,7 +1983,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
 		gtransport->server_options = &server_options;
 
 	sigchain_push_common(unlock_pack_on_signal);
-	atexit(unlock_pack);
+	atexit(unlock_pack_atexit);
 	sigchain_push(SIGPIPE, SIG_IGN);
 	exit_code = do_fetch(gtransport, &rs);
 	sigchain_pop(SIGPIPE);
@@ -1993,6 +2014,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	}
 
 	git_config(git_fetch_config, NULL);
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
 
 	argc = parse_options(argc, argv, prefix,
 			     builtin_fetch_options, builtin_fetch_usage, 0);
@@ -2010,14 +2033,14 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 
 	if (deepen_relative) {
 		if (deepen_relative < 0)
-			die(_("Negative depth in --deepen is not supported"));
+			die(_("negative depth in --deepen is not supported"));
 		if (depth)
-			die(_("--deepen and --depth are mutually exclusive"));
+			die(_("options '%s' and '%s' cannot be used together"), "--deepen", "--depth");
 		depth = xstrfmt("%d", deepen_relative);
 	}
 	if (unshallow) {
 		if (depth)
-			die(_("--depth and --unshallow cannot be used together"));
+			die(_("options '%s' and '%s' cannot be used together"), "--depth", "--unshallow");
 		else if (!is_repository_shallow(the_repository))
 			die(_("--unshallow on a complete repository does not make sense"));
 		else
@@ -2047,14 +2070,15 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		/* All arguments are assumed to be remotes or groups */
 		for (i = 0; i < argc; i++)
 			if (!add_remote_or_group(argv[i], &list))
-				die(_("No such remote or remote group: %s"), argv[i]);
+				die(_("no such remote or remote group: %s"),
+				    argv[i]);
 	} else {
 		/* Single remote or group */
 		(void) add_remote_or_group(argv[0], &list);
 		if (list.nr > 1) {
 			/* More than one remote */
 			if (argc > 1)
-				die(_("Fetching a group and specifying refspecs does not make sense"));
+				die(_("fetching a group and specifying refspecs does not make sense"));
 		} else {
 			/* Zero or one remotes */
 			remote = remote_get(argv[0]);
@@ -2075,7 +2099,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		if (gtransport->smart_options) {
 			gtransport->smart_options->acked_commits = &acked_commits;
 		} else {
-			warning(_("Protocol does not support --negotiate-only, exiting."));
+			warning(_("protocol does not support --negotiate-only, exiting"));
 			return 1;
 		}
 		if (server_options.nr)
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 48a8699de7..8d8fd393f8 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -12,6 +12,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 {
 	const char *inpath = NULL;
 	const char *message = NULL;
+	char *into_name = NULL;
 	int shortlog_len = -1;
 	struct option options[] = {
 		{ OPTION_INTEGER, 0, "log", &shortlog_len, N_("n"),
@@ -23,6 +24,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 		  DEFAULT_MERGE_LOG_LEN },
 		OPT_STRING('m', "message", &message, N_("text"),
 			N_("use <text> as start of message")),
+		OPT_STRING(0, "into-name", &into_name, N_("name"),
+			   N_("use <name> instead of the real target branch")),
 		OPT_FILENAME('F', "file", &inpath, N_("file to read from")),
 		OPT_END()
 	};
@@ -56,6 +59,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 	opts.add_title = !message;
 	opts.credit_people = 1;
 	opts.shortlog_len = shortlog_len;
+	opts.into_name = into_name;
 
 	ret = fmt_merge_msg(&input, &output, &opts);
 	if (ret)
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 16a2c7d57c..6f62f40d12 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -17,7 +17,8 @@ static char const * const for_each_ref_usage[] = {
 int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 {
 	int i;
-	struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+	struct ref_sorting *sorting;
+	struct string_list sorting_options = STRING_LIST_INIT_DUP;
 	int maxcount = 0, icase = 0;
 	struct ref_array array;
 	struct ref_filter filter;
@@ -39,7 +40,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 		OPT_INTEGER( 0 , "count", &maxcount, N_("show only <n> matched refs")),
 		OPT_STRING(  0 , "format", &format.format, N_("format"), N_("format to use for the output")),
 		OPT__COLOR(&format.use_color, N_("respect format colors")),
-		OPT_REF_SORT(sorting_tail),
+		OPT_REF_SORT(&sorting_options),
 		OPT_CALLBACK(0, "points-at", &filter.points_at,
 			     N_("object"), N_("print only refs which points at the given object"),
 			     parse_opt_object_name),
@@ -70,8 +71,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 	if (verify_ref_format(&format))
 		usage_with_options(for_each_ref_usage, opts);
 
-	if (!sorting)
-		sorting = ref_default_sorting();
+	sorting = ref_sorting_options(&sorting_options);
 	ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
 	filter.ignore_case = icase;
 
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 27b9e78094..9e54892311 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -944,15 +944,13 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 
 	if (the_repository->settings.core_commit_graph) {
 		struct child_process commit_graph_verify = CHILD_PROCESS_INIT;
-		const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL };
 
 		prepare_alt_odb(the_repository);
 		for (odb = the_repository->objects->odb; odb; odb = odb->next) {
 			child_process_init(&commit_graph_verify);
-			commit_graph_verify.argv = verify_argv;
 			commit_graph_verify.git_cmd = 1;
-			verify_argv[2] = "--object-dir";
-			verify_argv[3] = odb->path;
+			strvec_pushl(&commit_graph_verify.args, "commit-graph",
+				     "verify", "--object-dir", odb->path, NULL);
 			if (run_command(&commit_graph_verify))
 				errors_found |= ERROR_COMMIT_GRAPH;
 		}
@@ -960,15 +958,13 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 
 	if (the_repository->settings.core_multi_pack_index) {
 		struct child_process midx_verify = CHILD_PROCESS_INIT;
-		const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL };
 
 		prepare_alt_odb(the_repository);
 		for (odb = the_repository->objects->odb; odb; odb = odb->next) {
 			child_process_init(&midx_verify);
-			midx_verify.argv = midx_argv;
 			midx_verify.git_cmd = 1;
-			midx_argv[2] = "--object-dir";
-			midx_argv[3] = odb->path;
+			strvec_pushl(&midx_verify.args, "multi-pack-index",
+				     "verify", "--object-dir", odb->path, NULL);
 			if (run_command(&midx_verify))
 				errors_found |= ERROR_MULTI_PACK_INDEX;
 		}
diff --git a/builtin/gc.c b/builtin/gc.c
index bcef6a4c8d..8e60ef1eab 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -470,7 +470,8 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
 /*
  * Returns 0 if there was no previous error and gc can proceed, 1 if
  * gc should not proceed due to an error in the last run. Prints a
- * message and returns -1 if an error occurred while reading gc.log
+ * message and returns with a non-[01] status code if an error occurred
+ * while reading gc.log
  */
 static int report_last_gc_error(void)
 {
@@ -484,7 +485,7 @@ static int report_last_gc_error(void)
 		if (errno == ENOENT)
 			goto done;
 
-		ret = error_errno(_("cannot stat '%s'"), gc_log_path);
+		ret = die_message_errno(_("cannot stat '%s'"), gc_log_path);
 		goto done;
 	}
 
@@ -493,7 +494,7 @@ static int report_last_gc_error(void)
 
 	len = strbuf_read_file(&sb, gc_log_path, 0);
 	if (len < 0)
-		ret = error_errno(_("cannot read '%s'"), gc_log_path);
+		ret = die_message_errno(_("cannot read '%s'"), gc_log_path);
 	else if (len > 0) {
 		/*
 		 * A previous gc failed.  Report the error, and don't
@@ -611,12 +612,13 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		}
 		if (detach_auto) {
 			int ret = report_last_gc_error();
-			if (ret < 0)
-				/* an I/O error occurred, already reported */
-				exit(128);
+
 			if (ret == 1)
 				/* Last gc --auto failed. Skip this one. */
 				return 0;
+			else if (ret)
+				/* an I/O error occurred, already reported */
+				return ret;
 
 			if (lock_repo_for_gc(force, &pid))
 				return 0;
diff --git a/builtin/help.c b/builtin/help.c
index 75cd2fb407..d387131dd8 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -212,11 +212,10 @@ static int check_emacsclient_version(void)
 {
 	struct strbuf buffer = STRBUF_INIT;
 	struct child_process ec_process = CHILD_PROCESS_INIT;
-	const char *argv_ec[] = { "emacsclient", "--version", NULL };
 	int version;
 
 	/* emacsclient prints its version number on stderr */
-	ec_process.argv = argv_ec;
+	strvec_pushl(&ec_process.args, "emacsclient", "--version", NULL);
 	ec_process.err = -1;
 	ec_process.stdout_to_stderr = 1;
 	if (start_command(&ec_process))
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index c23d01de7d..3c2e6aee3c 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1845,11 +1845,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	if (!pack_name && !from_stdin)
 		usage(index_pack_usage);
 	if (fix_thin_pack && !from_stdin)
-		die(_("--fix-thin cannot be used without --stdin"));
+		die(_("the option '%s' requires '%s'"), "--fix-thin", "--stdin");
 	if (from_stdin && !startup_info->have_repository)
 		die(_("--stdin requires a git repository"));
 	if (from_stdin && hash_algo)
-		die(_("--object-format cannot be used with --stdin"));
+		die(_("options '%s' and '%s' cannot be used together"), "--object-format", "--stdin");
 	if (!index_name && pack_name)
 		index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);
 
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 2167796ff2..546f9c595e 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -557,7 +557,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, init_db_options, init_db_usage, 0);
 
 	if (real_git_dir && is_bare_repository_cfg == 1)
-		die(_("--separate-git-dir and --bare are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "--separate-git-dir", "--bare");
 
 	if (real_git_dir && !is_absolute_path(real_git_dir))
 		real_git_dir = real_pathdup(real_git_dir, 1);
diff --git a/builtin/log.c b/builtin/log.c
index f75d87e8d7..4b493408cc 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -245,10 +245,24 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 			rev->abbrev_commit = 0;
 	}
 
-	if (rev->commit_format == CMIT_FMT_USERFORMAT && !w.decorate)
-		decoration_style = 0;
+	if (rev->commit_format == CMIT_FMT_USERFORMAT) {
+		if (!w.decorate) {
+			/*
+			 * Disable decoration loading if the format will not
+			 * show them anyway.
+			 */
+			decoration_style = 0;
+		} else if (!decoration_style) {
+			/*
+			 * If we are going to show them, make sure we do load
+			 * them here, but taking care not to override a
+			 * specific style set by config or --decorate.
+			 */
+			decoration_style = DECORATE_SHORT_REFS;
+		}
+	}
 
-	if (decoration_style) {
+	if (decoration_style || rev->simplify_by_decoration) {
 		const struct string_list *config_exclude =
 			repo_config_get_value_multi(the_repository,
 						    "log.excludeDecoration");
@@ -260,7 +274,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 						   item->string);
 		}
 
-		rev->show_decorations = 1;
+		if (decoration_style)
+			rev->show_decorations = 1;
 
 		load_ref_decorations(&decoration_filter, decoration_style);
 	}
@@ -1928,9 +1943,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		numbered = 0;
 
 	if (numbered && keep_subject)
-		die(_("-n and -k are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "-n", "-k");
 	if (keep_subject && subject_prefix)
-		die(_("--subject-prefix/--rfc and -k are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "--subject-prefix/--rfc", "-k");
 	rev.preserve_subject = keep_subject;
 
 	argc = setup_revisions(argc, argv, &rev, &s_r_opt);
@@ -1964,7 +1979,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		load_display_notes(&rev.notes_opt);
 
 	if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
-		die(_("--stdout, --output, and --output-directory are mutually exclusive"));
+		die(_("options '%s', '%s', and '%s' cannot be used together"), "--stdout", "--output", "--output-directory");
 
 	if (use_stdout) {
 		setup_pager();
@@ -2097,7 +2112,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	if (creation_factor < 0)
 		creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
 	else if (!rdiff_prev)
-		die(_("--creation-factor requires --range-diff"));
+		die(_("the option '%s' requires '%s'"), "--creation-factor", "--range-diff");
 
 	if (rdiff_prev) {
 		if (!cover_letter && total != 1)
@@ -2241,6 +2256,7 @@ done:
 	strbuf_release(&rdiff1);
 	strbuf_release(&rdiff2);
 	strbuf_release(&rdiff_title);
+	UNLEAK(rev);
 	return 0;
 }
 
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 031fef1bca..f7ea56cc63 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -37,6 +37,7 @@ static int debug_mode;
 static int show_eol;
 static int recurse_submodules;
 static int skipping_duplicates;
+static int show_sparse_dirs;
 
 static const char *prefix;
 static int max_prefix_len;
@@ -315,8 +316,10 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
 
 	if (!(show_cached || show_stage || show_deleted || show_modified))
 		return;
-	/* TODO: audit for interaction with sparse-index. */
-	ensure_full_index(repo->index);
+
+	if (!show_sparse_dirs)
+		ensure_full_index(repo->index);
+
 	for (i = 0; i < repo->index->cache_nr; i++) {
 		const struct cache_entry *ce = repo->index->cache[i];
 		struct stat st;
@@ -670,6 +673,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 		OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
 		OPT_BOOL(0, "deduplicate", &skipping_duplicates,
 			 N_("suppress duplicate entries")),
+		OPT_BOOL(0, "sparse", &show_sparse_dirs,
+			 N_("show sparse directories in the presence of a sparse index")),
 		OPT_END()
 	};
 	int ret = 0;
@@ -677,6 +682,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(ls_files_usage, builtin_ls_files_options);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	prefix = cmd_prefix;
 	if (prefix)
 		prefix_len = strlen(prefix);
@@ -767,7 +775,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 		 * would not make any sense with this option.
 		 */
 		if (show_stage || show_unmerged)
-			die("ls-files --with-tree is incompatible with -s or -u");
+			die(_("options '%s' and '%s' cannot be used together"), "ls-files --with-tree", "-s/-u");
 		overlay_tree_on_index(the_repository->index, with_tree, max_prefix);
 	}
 
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 318949c3d7..44448fa61d 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -54,7 +54,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	struct transport *transport;
 	const struct ref *ref;
 	struct ref_array ref_array;
-	static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+	struct string_list sorting_options = STRING_LIST_INIT_DUP;
 
 	struct option options[] = {
 		OPT__QUIET(&quiet, N_("do not print remote URL")),
@@ -68,7 +68,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
 		OPT_BOOL(0, "get-url", &get_url,
 			 N_("take url.<base>.insteadOf into account")),
-		OPT_REF_SORT(sorting_tail),
+		OPT_REF_SORT(&sorting_options),
 		OPT_SET_INT_F(0, "exit-code", &status,
 			      N_("exit with exit code 2 if no matching refs are found"),
 			      2, PARSE_OPT_NOCOMPLETE),
@@ -86,8 +86,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 
 	packet_trace_identity("ls-remote");
 
-	UNLEAK(sorting);
-
 	if (argc > 1) {
 		int i;
 		CALLOC_ARRAY(pattern, argc);
@@ -139,8 +137,13 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		item->symref = xstrdup_or_null(ref->symref);
 	}
 
-	if (sorting)
+	if (sorting_options.nr) {
+		struct ref_sorting *sorting;
+
+		sorting = ref_sorting_options(&sorting_options);
 		ref_array_sort(sorting, &ref_array);
+		ref_sorting_release(sorting);
+	}
 
 	for (i = 0; i < ref_array.nr; i++) {
 		const struct ref_array_item *ref = ref_array.items[i];
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 06a2f90c48..e695867ee5 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -34,6 +34,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 	struct option options[] = {
 		OPT_BOOL('p', "stdout", &to_stdout, N_("send results to standard output")),
 		OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3),
+		OPT_SET_INT(0, "zdiff3", &xmp.style, N_("use a zealous diff3 based merge"),
+				XDL_MERGE_ZEALOUS_DIFF3),
 		OPT_SET_INT(0, "ours", &xmp.favor, N_("for conflicts, use our version"),
 			    XDL_MERGE_FAVOR_OURS),
 		OPT_SET_INT(0, "theirs", &xmp.favor, N_("for conflicts, use their version"),
diff --git a/builtin/merge.c b/builtin/merge.c
index ea3112e0c0..74e53cf20a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -87,6 +87,7 @@ static int signoff;
 static const char *sign_commit;
 static int autostash;
 static int no_verify;
+static char *into_name;
 
 static struct strategy all_strategy[] = {
 	{ "recursive",  NO_TRIVIAL },
@@ -286,6 +287,8 @@ static struct option builtin_merge_options[] = {
 	{ OPTION_LOWLEVEL_CALLBACK, 'F', "file", &merge_msg, N_("path"),
 		N_("read message from file"), PARSE_OPT_NONEG,
 		NULL, 0, option_read_message },
+	OPT_STRING(0, "into-name", &into_name, N_("name"),
+		   N_("use <name> instead of the real target")),
 	OPT__VERBOSITY(&verbosity),
 	OPT_BOOL(0, "abort", &abort_current_merge,
 		N_("abort the current in-progress merge")),
@@ -310,10 +313,9 @@ static int save_state(struct object_id *stash)
 	int len;
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct strbuf buffer = STRBUF_INIT;
-	const char *argv[] = {"stash", "create", NULL};
 	int rc = -1;
 
-	cp.argv = argv;
+	strvec_pushl(&cp.args, "stash", "create", NULL);
 	cp.out = -1;
 	cp.git_cmd = 1;
 
@@ -1122,6 +1124,7 @@ static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *mer
 	opts.add_title = !have_message;
 	opts.shortlog_len = shortlog_len;
 	opts.credit_people = (0 < option_edit);
+	opts.into_name = into_name;
 
 	fmt_merge_msg(merge_names, merge_msg, &opts);
 	if (merge_msg->len)
@@ -1397,9 +1400,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 	if (squash) {
 		if (fast_forward == FF_NO)
-			die(_("You cannot combine --squash with --no-ff."));
+			die(_("options '%s' and '%s' cannot be used together"), "--squash", "--no-ff.");
 		if (option_commit > 0)
-			die(_("You cannot combine --squash with --commit."));
+			die(_("options '%s' and '%s' cannot be used together"), "--squash", "--commit.");
 		/*
 		 * squash can now silently disable option_commit - this is not
 		 * a problem as it is only overriding the default, not a user
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 075d15d706..4480ba3982 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -167,6 +167,8 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)
 		usage_with_options(builtin_multi_pack_index_verify_usage,
 				   options);
 
+	FREE_AND_NULL(options);
+
 	return verify_midx_file(the_repository, opts.object_dir, opts.flags);
 }
 
@@ -191,6 +193,8 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv)
 		usage_with_options(builtin_multi_pack_index_expire_usage,
 				   options);
 
+	FREE_AND_NULL(options);
+
 	return expire_midx_packs(the_repository, opts.object_dir, opts.flags);
 }
 
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index b221d30014..27f60153a6 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -44,11 +44,20 @@ static struct rev_name *get_commit_rev_name(const struct commit *commit)
 	return is_valid_rev_name(name) ? name : NULL;
 }
 
+static int effective_distance(int distance, int generation)
+{
+	return distance + (generation > 0 ? MERGE_TRAVERSAL_WEIGHT : 0);
+}
+
 static int is_better_name(struct rev_name *name,
 			  timestamp_t taggerdate,
+			  int generation,
 			  int distance,
 			  int from_tag)
 {
+	int name_distance = effective_distance(name->distance, name->generation);
+	int new_distance = effective_distance(distance, generation);
+
 	/*
 	 * When comparing names based on tags, prefer names
 	 * based on the older tag, even if it is farther away.
@@ -56,7 +65,7 @@ static int is_better_name(struct rev_name *name,
 	if (from_tag && name->from_tag)
 		return (name->taggerdate > taggerdate ||
 			(name->taggerdate == taggerdate &&
-			 name->distance > distance));
+			 name_distance > new_distance));
 
 	/*
 	 * We know that at least one of them is a non-tag at this point.
@@ -69,8 +78,8 @@ static int is_better_name(struct rev_name *name,
 	 * We are now looking at two non-tags.  Tiebreak to favor
 	 * shorter hops.
 	 */
-	if (name->distance != distance)
-		return name->distance > distance;
+	if (name_distance != new_distance)
+		return name_distance > new_distance;
 
 	/* ... or tiebreak to favor older date */
 	if (name->taggerdate != taggerdate)
@@ -88,7 +97,7 @@ static struct rev_name *create_or_update_name(struct commit *commit,
 	struct rev_name *name = commit_rev_name_at(&rev_names, commit);
 
 	if (is_valid_rev_name(name)) {
-		if (!is_better_name(name, taggerdate, distance, from_tag))
+		if (!is_better_name(name, taggerdate, generation, distance, from_tag))
 			return NULL;
 
 		/*
diff --git a/builtin/notes.c b/builtin/notes.c
index 71c59583a1..05d60483e8 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -134,14 +134,13 @@ static void copy_obj_to_fd(int fd, const struct object_id *oid)
 
 static void write_commented_object(int fd, const struct object_id *object)
 {
-	const char *show_args[5] =
-		{"show", "--stat", "--no-notes", oid_to_hex(object), NULL};
 	struct child_process show = CHILD_PROCESS_INIT;
 	struct strbuf buf = STRBUF_INIT;
 	struct strbuf cbuf = STRBUF_INIT;
 
 	/* Invoke "git show --stat --no-notes $object" */
-	show.argv = show_args;
+	strvec_pushl(&show.args, "show", "--stat", "--no-notes",
+		     oid_to_hex(object), NULL);
 	show.no_stdin = 1;
 	show.out = -1;
 	show.err = 0;
@@ -201,11 +200,12 @@ static void prepare_note_data(const struct object_id *object, struct note_data *
 static void write_note_data(struct note_data *d, struct object_id *oid)
 {
 	if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) {
-		error(_("unable to write note object"));
+		int status = die_message(_("unable to write note object"));
+
 		if (d->edit_path)
-			error(_("the note contents have been left in %s"),
-				d->edit_path);
-		exit(128);
+			die_message(_("the note contents have been left in %s"),
+				    d->edit_path);
+		exit(status);
 	}
 }
 
@@ -861,15 +861,19 @@ static int merge(int argc, const char **argv, const char *prefix)
 		update_ref(msg.buf, default_notes_ref(), &result_oid, NULL, 0,
 			   UPDATE_REFS_DIE_ON_ERR);
 	else { /* Merge has unresolved conflicts */
+		struct worktree **worktrees;
 		const struct worktree *wt;
 		/* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
 		update_ref(msg.buf, "NOTES_MERGE_PARTIAL", &result_oid, NULL,
 			   0, UPDATE_REFS_DIE_ON_ERR);
 		/* Store ref-to-be-updated into .git/NOTES_MERGE_REF */
-		wt = find_shared_symref("NOTES_MERGE_REF", default_notes_ref());
+		worktrees = get_worktrees();
+		wt = find_shared_symref(worktrees, "NOTES_MERGE_REF",
+					default_notes_ref());
 		if (wt)
 			die(_("a notes merge into %s is already in-progress at %s"),
 			    default_notes_ref(), wt->path);
+		free_worktrees(worktrees);
 		if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
 			die(_("failed to store link to current notes ref (%s)"),
 			    default_notes_ref());
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 1a3dd445f8..ba2006f221 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3397,7 +3397,7 @@ static void read_object_list_from_stdin(void)
 			if (feof(stdin))
 				break;
 			if (!ferror(stdin))
-				die("BUG: fgets returned NULL, not EOF, not error!");
+				BUG("fgets returned NULL, not EOF, not error!");
 			if (errno != EINTR)
 				die_errno("fgets");
 			clearerr(stdin);
@@ -4070,7 +4070,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		die(_("--thin cannot be used to build an indexable pack"));
 
 	if (keep_unreachable && unpack_unreachable)
-		die(_("--keep-unreachable and --unpack-unreachable are incompatible"));
+		die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "--unpack-unreachable");
 	if (!rev_list_all || !rev_list_reflog || !rev_list_index)
 		unpack_unreachable_expiration = 0;
 
@@ -4148,11 +4148,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		read_packs_list_from_stdin();
 		if (rev_list_unpacked)
 			add_unreachable_loose_objects();
-	} else if (!use_internal_rev_list)
+	} else if (!use_internal_rev_list) {
 		read_object_list_from_stdin();
-	else {
+	} else {
 		get_object_list(rp.nr, rp.v);
-		strvec_clear(&rp);
 	}
 	cleanup_preferred_base();
 	if (include_tag && nr_result)
@@ -4162,7 +4161,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			    the_repository);
 
 	if (non_empty && !nr_result)
-		return 0;
+		goto cleanup;
 	if (nr_result) {
 		trace2_region_enter("pack-objects", "prepare-pack",
 				    the_repository);
@@ -4183,5 +4182,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			     " pack-reused %"PRIu32),
 			   written, written_delta, reused, reused_delta,
 			   reuse_packfile_objects);
+
+cleanup:
+	strvec_clear(&rp);
+
 	return 0;
 }
diff --git a/builtin/prune.c b/builtin/prune.c
index 485c9a3c56..c2bcdc07db 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -26,10 +26,22 @@ static int prune_tmp_file(const char *fullpath)
 		return error("Could not stat '%s'", fullpath);
 	if (st.st_mtime > expire)
 		return 0;
-	if (show_only || verbose)
-		printf("Removing stale temporary file %s\n", fullpath);
-	if (!show_only)
-		unlink_or_warn(fullpath);
+	if (S_ISDIR(st.st_mode)) {
+		if (show_only || verbose)
+			printf("Removing stale temporary directory %s\n", fullpath);
+		if (!show_only) {
+			struct strbuf remove_dir_buf = STRBUF_INIT;
+
+			strbuf_addstr(&remove_dir_buf, fullpath);
+			remove_dir_recursively(&remove_dir_buf, 0);
+			strbuf_release(&remove_dir_buf);
+		}
+	} else {
+		if (show_only || verbose)
+			printf("Removing stale temporary file %s\n", fullpath);
+		if (!show_only)
+			unlink_or_warn(fullpath);
+	}
 	return 0;
 }
 
diff --git a/builtin/pull.c b/builtin/pull.c
index 1cfaf9f343..100cbf9fb8 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -970,7 +970,7 @@ static void show_advice_pull_non_ff(void)
 		 "You can do so by running one of the following commands sometime before\n"
 		 "your next pull:\n"
 		 "\n"
-		 "  git config pull.rebase false  # merge (the default strategy)\n"
+		 "  git config pull.rebase false  # merge\n"
 		 "  git config pull.rebase true   # rebase\n"
 		 "  git config pull.ff only       # fast-forward only\n"
 		 "\n"
@@ -994,6 +994,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 		set_reflog_message(argc, argv);
 
 	git_config(git_pull_config, NULL);
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
 
 	argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
 
diff --git a/builtin/push.c b/builtin/push.c
index 4b026ce6c6..359db90321 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -589,7 +589,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 	set_push_cert_flags(&flags, push_cert);
 
 	if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
-		die(_("--delete is incompatible with --all, --mirror and --tags"));
+		die(_("options '%s' and '%s' cannot be used together"), "--delete", "--all/--mirror/--tags");
 	if (deleterefs && argc < 2)
 		die(_("--delete doesn't make sense without any refs"));
 
@@ -627,18 +627,18 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 
 	if (flags & TRANSPORT_PUSH_ALL) {
 		if (tags)
-			die(_("--all and --tags are incompatible"));
+			die(_("options '%s' and '%s' cannot be used together"), "--all", "--tags");
 		if (argc >= 2)
 			die(_("--all can't be combined with refspecs"));
 	}
 	if (flags & TRANSPORT_PUSH_MIRROR) {
 		if (tags)
-			die(_("--mirror and --tags are incompatible"));
+			die(_("options '%s' and '%s' cannot be used together"), "--mirror", "--tags");
 		if (argc >= 2)
 			die(_("--mirror can't be combined with refspecs"));
 	}
 	if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
-		die(_("--all and --mirror are incompatible"));
+		die(_("options '%s' and '%s' cannot be used together"), "--all", "--mirror");
 
 	if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
 		cas.use_force_if_includes = 1;
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 34b4744e5f..36490d06c8 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1190,13 +1190,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 	if (keep_base) {
 		if (options.onto_name)
-			die(_("cannot combine '--keep-base' with '--onto'"));
+			die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--onto");
 		if (options.root)
-			die(_("cannot combine '--keep-base' with '--root'"));
+			die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root");
 	}
 
 	if (options.root && options.fork_point > 0)
-		die(_("cannot combine '--root' with '--fork-point'"));
+		die(_("options '%s' and '%s' cannot be used together"), "--root", "--fork-point");
 
 	if (action != ACTION_NONE && !in_progress)
 		die(_("No rebase in progress?"));
@@ -1460,8 +1460,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 		if (i >= 0) {
 			if (is_merge(&options))
-				die(_("cannot combine apply options with "
-				      "merge options"));
+				die(_("apply options and merge options "
+					  "cannot be used together"));
 			else
 				options.type = REBASE_APPLY;
 		}
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 49b846d960..9f4a0b816c 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -175,7 +175,7 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
 			strbuf_addf(&fsck_msg_types, "%c%s=%s",
 				fsck_msg_types.len ? ',' : '=', var, value);
 		else
-			warning("Skipping unknown msg id '%s'", var);
+			warning("skipping unknown msg id '%s'", var);
 		return 0;
 	}
 
@@ -769,8 +769,10 @@ static void prepare_push_cert_sha1(struct child_process *proc)
 		memset(&sigcheck, '\0', sizeof(sigcheck));
 
 		bogs = parse_signed_buffer(push_cert.buf, push_cert.len);
-		check_signature(push_cert.buf, bogs, push_cert.buf + bogs,
-				push_cert.len - bogs, &sigcheck);
+		sigcheck.payload = xmemdupz(push_cert.buf, bogs);
+		sigcheck.payload_len = bogs;
+		check_signature(&sigcheck, push_cert.buf + bogs,
+				push_cert.len - bogs);
 
 		nonce_status = check_nonce(push_cert.buf, bogs);
 	}
@@ -812,16 +814,13 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
 	struct async muxer;
-	const char *argv[2];
 	int code;
+	const char *hook_path = find_hook(hook_name);
 
-	argv[0] = find_hook(hook_name);
-	if (!argv[0])
+	if (!hook_path)
 		return 0;
 
-	argv[1] = NULL;
-
-	proc.argv = argv;
+	strvec_push(&proc.args, hook_path);
 	proc.in = -1;
 	proc.stdout_to_stderr = 1;
 	proc.trace2_hook_name = hook_name;
@@ -943,23 +942,21 @@ static int run_receive_hook(struct command *commands,
 
 static int run_update_hook(struct command *cmd)
 {
-	const char *argv[5];
 	struct child_process proc = CHILD_PROCESS_INIT;
 	int code;
+	const char *hook_path = find_hook("update");
 
-	argv[0] = find_hook("update");
-	if (!argv[0])
+	if (!hook_path)
 		return 0;
 
-	argv[1] = cmd->ref_name;
-	argv[2] = oid_to_hex(&cmd->old_oid);
-	argv[3] = oid_to_hex(&cmd->new_oid);
-	argv[4] = NULL;
+	strvec_push(&proc.args, hook_path);
+	strvec_push(&proc.args, cmd->ref_name);
+	strvec_push(&proc.args, oid_to_hex(&cmd->old_oid));
+	strvec_push(&proc.args, oid_to_hex(&cmd->new_oid));
 
 	proc.no_stdin = 1;
 	proc.stdout_to_stderr = 1;
 	proc.err = use_sideband ? -1 : 0;
-	proc.argv = argv;
 	proc.trace2_hook_name = "update";
 
 	code = start_command(&proc);
@@ -1117,22 +1114,20 @@ static int run_proc_receive_hook(struct command *commands,
 	struct child_process proc = CHILD_PROCESS_INIT;
 	struct async muxer;
 	struct command *cmd;
-	const char *argv[2];
 	struct packet_reader reader;
 	struct strbuf cap = STRBUF_INIT;
 	struct strbuf errmsg = STRBUF_INIT;
 	int hook_use_push_options = 0;
 	int version = 0;
 	int code;
+	const char *hook_path = find_hook("proc-receive");
 
-	argv[0] = find_hook("proc-receive");
-	if (!argv[0]) {
+	if (!hook_path) {
 		rp_error("cannot find hook 'proc-receive'");
 		return -1;
 	}
-	argv[1] = NULL;
 
-	proc.argv = argv;
+	strvec_push(&proc.args, hook_path);
 	proc.in = -1;
 	proc.out = -1;
 	proc.trace2_hook_name = "proc-receive";
@@ -1370,23 +1365,11 @@ static const char *push_to_deploy(unsigned char *sha1,
 				  struct strvec *env,
 				  const char *work_tree)
 {
-	const char *update_refresh[] = {
-		"update-index", "-q", "--ignore-submodules", "--refresh", NULL
-	};
-	const char *diff_files[] = {
-		"diff-files", "--quiet", "--ignore-submodules", "--", NULL
-	};
-	const char *diff_index[] = {
-		"diff-index", "--quiet", "--cached", "--ignore-submodules",
-		NULL, "--", NULL
-	};
-	const char *read_tree[] = {
-		"read-tree", "-u", "-m", NULL, NULL
-	};
 	struct child_process child = CHILD_PROCESS_INIT;
 
-	child.argv = update_refresh;
-	child.env = env->v;
+	strvec_pushl(&child.args, "update-index", "-q", "--ignore-submodules",
+		     "--refresh", NULL);
+	strvec_pushv(&child.env_array, env->v);
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.stdout_to_stderr = 1;
@@ -1396,8 +1379,9 @@ static const char *push_to_deploy(unsigned char *sha1,
 
 	/* run_command() does not clean up completely; reinitialize */
 	child_process_init(&child);
-	child.argv = diff_files;
-	child.env = env->v;
+	strvec_pushl(&child.args, "diff-files", "--quiet",
+		     "--ignore-submodules", "--", NULL);
+	strvec_pushv(&child.env_array, env->v);
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.stdout_to_stderr = 1;
@@ -1405,12 +1389,13 @@ static const char *push_to_deploy(unsigned char *sha1,
 	if (run_command(&child))
 		return "Working directory has unstaged changes";
 
-	/* diff-index with either HEAD or an empty tree */
-	diff_index[4] = head_has_history() ? "HEAD" : empty_tree_oid_hex();
-
 	child_process_init(&child);
-	child.argv = diff_index;
-	child.env = env->v;
+	strvec_pushl(&child.args, "diff-index", "--quiet", "--cached",
+		     "--ignore-submodules",
+		     /* diff-index with either HEAD or an empty tree */
+		     head_has_history() ? "HEAD" : empty_tree_oid_hex(),
+		     "--", NULL);
+	strvec_pushv(&child.env_array, env->v);
 	child.no_stdin = 1;
 	child.no_stdout = 1;
 	child.stdout_to_stderr = 0;
@@ -1418,10 +1403,10 @@ static const char *push_to_deploy(unsigned char *sha1,
 	if (run_command(&child))
 		return "Working directory has staged changes";
 
-	read_tree[3] = hash_to_hex(sha1);
 	child_process_init(&child);
-	child.argv = read_tree;
-	child.env = env->v;
+	strvec_pushl(&child.args, "read-tree", "-u", "-m", hash_to_hex(sha1),
+		     NULL);
+	strvec_pushv(&child.env_array, env->v);
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.no_stdout = 1;
@@ -1449,29 +1434,22 @@ static const char *push_to_checkout(unsigned char *hash,
 
 static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree)
 {
-	const char *retval, *work_tree, *git_dir = NULL;
+	const char *retval, *git_dir;
 	struct strvec env = STRVEC_INIT;
 
-	if (worktree && worktree->path)
-		work_tree = worktree->path;
-	else if (git_work_tree_cfg)
-		work_tree = git_work_tree_cfg;
-	else
-		work_tree = "..";
+	if (!worktree || !worktree->path)
+		BUG("worktree->path must be non-NULL");
 
-	if (is_bare_repository())
+	if (worktree->is_bare)
 		return "denyCurrentBranch = updateInstead needs a worktree";
-	if (worktree)
-		git_dir = get_worktree_git_dir(worktree);
-	if (!git_dir)
-		git_dir = get_git_dir();
+	git_dir = get_worktree_git_dir(worktree);
 
 	strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir));
 
 	if (!hook_exists(push_to_checkout_hook))
-		retval = push_to_deploy(sha1, &env, work_tree);
+		retval = push_to_deploy(sha1, &env, worktree->path);
 	else
-		retval = push_to_checkout(sha1, &env, work_tree);
+		retval = push_to_checkout(sha1, &env, worktree->path);
 
 	strvec_clear(&env);
 	return retval;
@@ -1486,19 +1464,22 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	struct object_id *old_oid = &cmd->old_oid;
 	struct object_id *new_oid = &cmd->new_oid;
 	int do_update_worktree = 0;
-	const struct worktree *worktree = is_bare_repository() ? NULL : find_shared_symref("HEAD", name);
+	struct worktree **worktrees = get_worktrees();
+	const struct worktree *worktree =
+		find_shared_symref(worktrees, "HEAD", name);
 
 	/* only refs/... are allowed */
 	if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {
 		rp_error("refusing to create funny ref '%s' remotely", name);
-		return "funny refname";
+		ret = "funny refname";
+		goto out;
 	}
 
 	strbuf_addf(&namespaced_name_buf, "%s%s", get_git_namespace(), name);
 	free(namespaced_name);
 	namespaced_name = strbuf_detach(&namespaced_name_buf, NULL);
 
-	if (worktree) {
+	if (worktree && !worktree->is_bare) {
 		switch (deny_current_branch) {
 		case DENY_IGNORE:
 			break;
@@ -1510,7 +1491,8 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 			rp_error("refusing to update checked out branch: %s", name);
 			if (deny_current_branch == DENY_UNCONFIGURED)
 				refuse_unconfigured_deny();
-			return "branch is currently checked out";
+			ret = "branch is currently checked out";
+			goto out;
 		case DENY_UPDATE_INSTEAD:
 			/* pass -- let other checks intervene first */
 			do_update_worktree = 1;
@@ -1521,13 +1503,15 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	if (!is_null_oid(new_oid) && !has_object_file(new_oid)) {
 		error("unpack should have generated %s, "
 		      "but I can't find it!", oid_to_hex(new_oid));
-		return "bad pack";
+		ret = "bad pack";
+		goto out;
 	}
 
 	if (!is_null_oid(old_oid) && is_null_oid(new_oid)) {
 		if (deny_deletes && starts_with(name, "refs/heads/")) {
 			rp_error("denying ref deletion for %s", name);
-			return "deletion prohibited";
+			ret = "deletion prohibited";
+			goto out;
 		}
 
 		if (worktree || (head_name && !strcmp(namespaced_name, head_name))) {
@@ -1543,9 +1527,11 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 				if (deny_delete_current == DENY_UNCONFIGURED)
 					refuse_unconfigured_deny_delete_current();
 				rp_error("refusing to delete the current branch: %s", name);
-				return "deletion of the current branch prohibited";
+				ret = "deletion of the current branch prohibited";
+				goto out;
 			default:
-				return "Invalid denyDeleteCurrent setting";
+				ret = "Invalid denyDeleteCurrent setting";
+				goto out;
 			}
 		}
 	}
@@ -1563,25 +1549,28 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 		    old_object->type != OBJ_COMMIT ||
 		    new_object->type != OBJ_COMMIT) {
 			error("bad sha1 objects for %s", name);
-			return "bad ref";
+			ret = "bad ref";
+			goto out;
 		}
 		old_commit = (struct commit *)old_object;
 		new_commit = (struct commit *)new_object;
 		if (!in_merge_bases(old_commit, new_commit)) {
 			rp_error("denying non-fast-forward %s"
 				 " (you should pull first)", name);
-			return "non-fast-forward";
+			ret = "non-fast-forward";
+			goto out;
 		}
 	}
 	if (run_update_hook(cmd)) {
 		rp_error("hook declined to update %s", name);
-		return "hook declined";
+		ret = "hook declined";
+		goto out;
 	}
 
 	if (do_update_worktree) {
-		ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name));
+		ret = update_worktree(new_oid->hash, worktree);
 		if (ret)
-			return ret;
+			goto out;
 	}
 
 	if (is_null_oid(new_oid)) {
@@ -1589,9 +1578,9 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 		if (!parse_object(the_repository, old_oid)) {
 			old_oid = NULL;
 			if (ref_exists(name)) {
-				rp_warning("Allowing deletion of corrupt ref.");
+				rp_warning("allowing deletion of corrupt ref");
 			} else {
-				rp_warning("Deleting a non-existent ref.");
+				rp_warning("deleting a non-existent ref");
 				cmd->did_not_exist = 1;
 			}
 		}
@@ -1600,17 +1589,19 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 					   old_oid,
 					   0, "push", &err)) {
 			rp_error("%s", err.buf);
-			strbuf_release(&err);
-			return "failed to delete";
+			ret = "failed to delete";
+		} else {
+			ret = NULL; /* good */
 		}
 		strbuf_release(&err);
-		return NULL; /* good */
 	}
 	else {
 		struct strbuf err = STRBUF_INIT;
 		if (shallow_update && si->shallow_ref[cmd->index] &&
-		    update_shallow_ref(cmd, si))
-			return "shallow error";
+		    update_shallow_ref(cmd, si)) {
+			ret = "shallow error";
+			goto out;
+		}
 
 		if (ref_transaction_update(transaction,
 					   namespaced_name,
@@ -1618,14 +1609,16 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 					   0, "push",
 					   &err)) {
 			rp_error("%s", err.buf);
-			strbuf_release(&err);
-
-			return "failed to update ref";
+			ret = "failed to update ref";
+		} else {
+			ret = NULL; /* good */
 		}
 		strbuf_release(&err);
-
-		return NULL; /* good */
 	}
+
+out:
+	free_worktrees(worktrees);
+	return ret;
 }
 
 static void run_update_post_hook(struct command *commands)
@@ -2213,13 +2206,14 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 		strvec_push(&child.args, alt_shallow_file);
 	}
 
-	tmp_objdir = tmp_objdir_create();
+	tmp_objdir = tmp_objdir_create("incoming");
 	if (!tmp_objdir) {
 		if (err_fd > 0)
 			close(err_fd);
 		return "unable to create temporary object directory";
 	}
-	child.env = tmp_objdir_env(tmp_objdir);
+	if (tmp_objdir)
+		strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));
 
 	/*
 	 * Normally we just pass the tmp_objdir environment to the child
@@ -2490,9 +2484,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options, receive_pack_usage, 0);
 
 	if (argc > 1)
-		usage_msg_opt(_("Too many arguments."), receive_pack_usage, options);
+		usage_msg_opt(_("too many arguments"), receive_pack_usage, options);
 	if (argc == 0)
-		usage_msg_opt(_("You must specify a directory."), receive_pack_usage, options);
+		usage_msg_opt(_("you must specify a directory"), receive_pack_usage, options);
 
 	service_dir = argv[0];
 
@@ -2566,25 +2560,25 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 				 &push_options);
 		if (pack_lockfile)
 			unlink_or_warn(pack_lockfile);
+		sigchain_push(SIGPIPE, SIG_IGN);
 		if (report_status_v2)
 			report_v2(commands, unpack_status);
 		else if (report_status)
 			report(commands, unpack_status);
+		sigchain_pop(SIGPIPE);
 		run_receive_hook(commands, "post-receive", 1,
 				 &push_options);
 		run_update_post_hook(commands);
 		string_list_clear(&push_options, 0);
 		if (auto_gc) {
-			const char *argv_gc_auto[] = {
-				"gc", "--auto", "--quiet", NULL,
-			};
 			struct child_process proc = CHILD_PROCESS_INIT;
 
 			proc.no_stdin = 1;
 			proc.stdout_to_stderr = 1;
 			proc.err = use_sideband ? -1 : 0;
 			proc.git_cmd = proc.close_object_store = 1;
-			proc.argv = argv_gc_auto;
+			strvec_pushl(&proc.args, "gc", "--auto", "--quiet",
+				     NULL);
 
 			if (!start_command(&proc)) {
 				if (use_sideband)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 175c83e7cc..a4b1dd27e1 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -28,7 +28,6 @@ static timestamp_t default_reflog_expire;
 static timestamp_t default_reflog_expire_unreachable;
 
 struct cmd_reflog_expire_cb {
-	struct rev_info revs;
 	int stalefix;
 	timestamp_t expire_total;
 	timestamp_t expire_unreachable;
@@ -46,18 +45,12 @@ struct expire_reflog_policy_cb {
 	struct cmd_reflog_expire_cb cmd;
 	struct commit *tip_commit;
 	struct commit_list *tips;
+	unsigned int dry_run:1;
 };
 
-struct collected_reflog {
-	struct object_id oid;
-	char reflog[FLEX_ARRAY];
-};
-
-struct collect_reflog_cb {
-	struct collected_reflog **e;
-	int alloc;
-	int nr;
-	struct worktree *wt;
+struct worktree_reflogs {
+	struct worktree *worktree;
+	struct string_list reflogs;
 };
 
 /* Remember to update object flag allocation in object.h */
@@ -310,10 +303,15 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no
 		return 1;
 
 	if (timestamp < cb->cmd.expire_unreachable) {
-		if (cb->unreachable_expire_kind == UE_ALWAYS)
-			return 1;
-		if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
+		switch (cb->unreachable_expire_kind) {
+		case UE_ALWAYS:
 			return 1;
+		case UE_NORMAL:
+		case UE_HEAD:
+			if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
+				return 1;
+			break;
+		}
 	}
 
 	if (cb->cmd.recno && --(cb->cmd.recno) == 0)
@@ -322,6 +320,28 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no
 	return 0;
 }
 
+static int should_expire_reflog_ent_verbose(struct object_id *ooid,
+					    struct object_id *noid,
+					    const char *email,
+					    timestamp_t timestamp, int tz,
+					    const char *message, void *cb_data)
+{
+	struct expire_reflog_policy_cb *cb = cb_data;
+	int expire;
+
+	expire = should_expire_reflog_ent(ooid, noid, email, timestamp, tz,
+					  message, cb);
+
+	if (!expire)
+		printf("keep %s", message);
+	else if (cb->dry_run)
+		printf("would prune %s", message);
+	else
+		printf("prune %s", message);
+
+	return expire;
+}
+
 static int push_tip_to_list(const char *refname, const struct object_id *oid,
 			    int flags, void *cb_data)
 {
@@ -355,75 +375,71 @@ static void reflog_expiry_prepare(const char *refname,
 				  void *cb_data)
 {
 	struct expire_reflog_policy_cb *cb = cb_data;
+	struct commit_list *elem;
+	struct commit *commit = NULL;
 
 	if (!cb->cmd.expire_unreachable || is_head(refname)) {
-		cb->tip_commit = NULL;
 		cb->unreachable_expire_kind = UE_HEAD;
 	} else {
-		cb->tip_commit = lookup_commit_reference_gently(the_repository,
-								oid, 1);
-		if (!cb->tip_commit)
-			cb->unreachable_expire_kind = UE_ALWAYS;
-		else
-			cb->unreachable_expire_kind = UE_NORMAL;
+		commit = lookup_commit(the_repository, oid);
+		cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
 	}
 
 	if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
 		cb->unreachable_expire_kind = UE_ALWAYS;
 
-	cb->mark_list = NULL;
-	cb->tips = NULL;
-	if (cb->unreachable_expire_kind != UE_ALWAYS) {
-		if (cb->unreachable_expire_kind == UE_HEAD) {
-			struct commit_list *elem;
-
-			for_each_ref(push_tip_to_list, &cb->tips);
-			for (elem = cb->tips; elem; elem = elem->next)
-				commit_list_insert(elem->item, &cb->mark_list);
-		} else {
-			commit_list_insert(cb->tip_commit, &cb->mark_list);
-		}
-		cb->mark_limit = cb->cmd.expire_total;
-		mark_reachable(cb);
+	switch (cb->unreachable_expire_kind) {
+	case UE_ALWAYS:
+		return;
+	case UE_HEAD:
+		for_each_ref(push_tip_to_list, &cb->tips);
+		for (elem = cb->tips; elem; elem = elem->next)
+			commit_list_insert(elem->item, &cb->mark_list);
+		break;
+	case UE_NORMAL:
+		commit_list_insert(commit, &cb->mark_list);
+		/* For reflog_expiry_cleanup() below */
+		cb->tip_commit = commit;
 	}
+	cb->mark_limit = cb->cmd.expire_total;
+	mark_reachable(cb);
 }
 
 static void reflog_expiry_cleanup(void *cb_data)
 {
 	struct expire_reflog_policy_cb *cb = cb_data;
+	struct commit_list *elem;
 
-	if (cb->unreachable_expire_kind != UE_ALWAYS) {
-		if (cb->unreachable_expire_kind == UE_HEAD) {
-			struct commit_list *elem;
-			for (elem = cb->tips; elem; elem = elem->next)
-				clear_commit_marks(elem->item, REACHABLE);
-			free_commit_list(cb->tips);
-		} else {
-			clear_commit_marks(cb->tip_commit, REACHABLE);
-		}
+	switch (cb->unreachable_expire_kind) {
+	case UE_ALWAYS:
+		return;
+	case UE_HEAD:
+		for (elem = cb->tips; elem; elem = elem->next)
+			clear_commit_marks(elem->item, REACHABLE);
+		free_commit_list(cb->tips);
+		break;
+	case UE_NORMAL:
+		clear_commit_marks(cb->tip_commit, REACHABLE);
+		break;
 	}
 }
 
 static int collect_reflog(const char *ref, const struct object_id *oid, int unused, void *cb_data)
 {
-	struct collected_reflog *e;
-	struct collect_reflog_cb *cb = cb_data;
+	struct worktree_reflogs *cb = cb_data;
+	struct worktree *worktree = cb->worktree;
 	struct strbuf newref = STRBUF_INIT;
 
 	/*
 	 * Avoid collecting the same shared ref multiple times because
 	 * they are available via all worktrees.
 	 */
-	if (!cb->wt->is_current && ref_type(ref) == REF_TYPE_NORMAL)
+	if (!worktree->is_current && ref_type(ref) == REF_TYPE_NORMAL)
 		return 0;
 
-	strbuf_worktree_ref(cb->wt, &newref, ref);
-	FLEX_ALLOC_STR(e, reflog, newref.buf);
-	strbuf_release(&newref);
+	strbuf_worktree_ref(worktree, &newref, ref);
+	string_list_append_nodup(&cb->reflogs, strbuf_detach(&newref, NULL));
 
-	oidcpy(&e->oid, oid);
-	ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
-	cb->e[cb->nr++] = e;
 	return 0;
 }
 
@@ -541,11 +557,13 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, c
 
 static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 {
-	struct expire_reflog_policy_cb cb;
+	struct cmd_reflog_expire_cb cmd = { 0 };
 	timestamp_t now = time(NULL);
 	int i, status, do_all, all_worktrees = 1;
 	int explicit_expiry = 0;
 	unsigned int flags = 0;
+	int verbose = 0;
+	reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
 
 	default_reflog_expire_unreachable = now - 30 * 24 * 3600;
 	default_reflog_expire = now - 90 * 24 * 3600;
@@ -553,10 +571,9 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 
 	save_commit_buffer = 0;
 	do_all = status = 0;
-	memset(&cb, 0, sizeof(cb));
 
-	cb.cmd.expire_total = default_reflog_expire;
-	cb.cmd.expire_unreachable = default_reflog_expire_unreachable;
+	cmd.expire_total = default_reflog_expire;
+	cmd.expire_unreachable = default_reflog_expire_unreachable;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -564,17 +581,17 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n"))
 			flags |= EXPIRE_REFLOGS_DRY_RUN;
 		else if (skip_prefix(arg, "--expire=", &arg)) {
-			if (parse_expiry_date(arg, &cb.cmd.expire_total))
+			if (parse_expiry_date(arg, &cmd.expire_total))
 				die(_("'%s' is not a valid timestamp"), arg);
 			explicit_expiry |= EXPIRE_TOTAL;
 		}
 		else if (skip_prefix(arg, "--expire-unreachable=", &arg)) {
-			if (parse_expiry_date(arg, &cb.cmd.expire_unreachable))
+			if (parse_expiry_date(arg, &cmd.expire_unreachable))
 				die(_("'%s' is not a valid timestamp"), arg);
 			explicit_expiry |= EXPIRE_UNREACH;
 		}
 		else if (!strcmp(arg, "--stale-fix"))
-			cb.cmd.stalefix = 1;
+			cmd.stalefix = 1;
 		else if (!strcmp(arg, "--rewrite"))
 			flags |= EXPIRE_REFLOGS_REWRITE;
 		else if (!strcmp(arg, "--updateref"))
@@ -584,7 +601,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		else if (!strcmp(arg, "--single-worktree"))
 			all_worktrees = 0;
 		else if (!strcmp(arg, "--verbose"))
-			flags |= EXPIRE_REFLOGS_VERBOSE;
+			verbose = 1;
 		else if (!strcmp(arg, "--")) {
 			i++;
 			break;
@@ -595,54 +612,65 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 			break;
 	}
 
+	if (verbose)
+		should_prune_fn = should_expire_reflog_ent_verbose;
+
 	/*
 	 * We can trust the commits and objects reachable from refs
 	 * even in older repository.  We cannot trust what's reachable
 	 * from reflog if the repository was pruned with older git.
 	 */
-	if (cb.cmd.stalefix) {
-		repo_init_revisions(the_repository, &cb.cmd.revs, prefix);
-		cb.cmd.revs.do_not_die_on_missing_tree = 1;
-		cb.cmd.revs.ignore_missing = 1;
-		cb.cmd.revs.ignore_missing_links = 1;
-		if (flags & EXPIRE_REFLOGS_VERBOSE)
+	if (cmd.stalefix) {
+		struct rev_info revs;
+
+		repo_init_revisions(the_repository, &revs, prefix);
+		revs.do_not_die_on_missing_tree = 1;
+		revs.ignore_missing = 1;
+		revs.ignore_missing_links = 1;
+		if (verbose)
 			printf(_("Marking reachable objects..."));
-		mark_reachable_objects(&cb.cmd.revs, 0, 0, NULL);
-		if (flags & EXPIRE_REFLOGS_VERBOSE)
+		mark_reachable_objects(&revs, 0, 0, NULL);
+		if (verbose)
 			putchar('\n');
 	}
 
 	if (do_all) {
-		struct collect_reflog_cb collected;
+		struct worktree_reflogs collected = {
+			.reflogs = STRING_LIST_INIT_DUP,
+		};
+		struct string_list_item *item;
 		struct worktree **worktrees, **p;
-		int i;
 
-		memset(&collected, 0, sizeof(collected));
 		worktrees = get_worktrees();
 		for (p = worktrees; *p; p++) {
 			if (!all_worktrees && !(*p)->is_current)
 				continue;
-			collected.wt = *p;
+			collected.worktree = *p;
 			refs_for_each_reflog(get_worktree_ref_store(*p),
 					     collect_reflog, &collected);
 		}
 		free_worktrees(worktrees);
-		for (i = 0; i < collected.nr; i++) {
-			struct collected_reflog *e = collected.e[i];
 
-			set_reflog_expiry_param(&cb.cmd, explicit_expiry, e->reflog);
-			status |= reflog_expire(e->reflog, flags,
+		for_each_string_list_item(item, &collected.reflogs) {
+			struct expire_reflog_policy_cb cb = {
+				.cmd = cmd,
+				.dry_run = !!(flags & EXPIRE_REFLOGS_DRY_RUN),
+			};
+
+			set_reflog_expiry_param(&cb.cmd, explicit_expiry, item->string);
+			status |= reflog_expire(item->string, flags,
 						reflog_expiry_prepare,
-						should_expire_reflog_ent,
+						should_prune_fn,
 						reflog_expiry_cleanup,
 						&cb);
-			free(e);
 		}
-		free(collected.e);
+		string_list_clear(&collected.reflogs, 0);
 	}
 
 	for (; i < argc; i++) {
 		char *ref;
+		struct expire_reflog_policy_cb cb = { .cmd = cmd };
+
 		if (!dwim_log(argv[i], strlen(argv[i]), NULL, &ref)) {
 			status |= error(_("%s points nowhere!"), argv[i]);
 			continue;
@@ -650,7 +678,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
 		status |= reflog_expire(ref, flags,
 					reflog_expiry_prepare,
-					should_expire_reflog_ent,
+					should_prune_fn,
 					reflog_expiry_cleanup,
 					&cb);
 		free(ref);
@@ -662,19 +690,19 @@ static int count_reflog_ent(struct object_id *ooid, struct object_id *noid,
 		const char *email, timestamp_t timestamp, int tz,
 		const char *message, void *cb_data)
 {
-	struct expire_reflog_policy_cb *cb = cb_data;
-	if (!cb->cmd.expire_total || timestamp < cb->cmd.expire_total)
-		cb->cmd.recno++;
+	struct cmd_reflog_expire_cb *cb = cb_data;
+	if (!cb->expire_total || timestamp < cb->expire_total)
+		cb->recno++;
 	return 0;
 }
 
 static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 {
-	struct expire_reflog_policy_cb cb;
+	struct cmd_reflog_expire_cb cmd = { 0 };
 	int i, status = 0;
 	unsigned int flags = 0;
-
-	memset(&cb, 0, sizeof(cb));
+	int verbose = 0;
+	reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -685,7 +713,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 		else if (!strcmp(arg, "--updateref"))
 			flags |= EXPIRE_REFLOGS_UPDATE_REF;
 		else if (!strcmp(arg, "--verbose"))
-			flags |= EXPIRE_REFLOGS_VERBOSE;
+			verbose = 1;
 		else if (!strcmp(arg, "--")) {
 			i++;
 			break;
@@ -696,6 +724,9 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 			break;
 	}
 
+	if (verbose)
+		should_prune_fn = should_expire_reflog_ent_verbose;
+
 	if (argc - i < 1)
 		return error(_("no reflog specified to delete"));
 
@@ -703,6 +734,9 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 		const char *spec = strstr(argv[i], "@{");
 		char *ep, *ref;
 		int recno;
+		struct expire_reflog_policy_cb cb = {
+			.dry_run = !!(flags & EXPIRE_REFLOGS_DRY_RUN),
+		};
 
 		if (!spec) {
 			status |= error(_("not a reflog: %s"), argv[i]);
@@ -716,17 +750,18 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 
 		recno = strtoul(spec + 2, &ep, 10);
 		if (*ep == '}') {
-			cb.cmd.recno = -recno;
-			for_each_reflog_ent(ref, count_reflog_ent, &cb);
+			cmd.recno = -recno;
+			for_each_reflog_ent(ref, count_reflog_ent, &cmd);
 		} else {
-			cb.cmd.expire_total = approxidate(spec + 2);
-			for_each_reflog_ent(ref, count_reflog_ent, &cb);
-			cb.cmd.expire_total = 0;
+			cmd.expire_total = approxidate(spec + 2);
+			for_each_reflog_ent(ref, count_reflog_ent, &cmd);
+			cmd.expire_total = 0;
 		}
 
+		cb.cmd = cmd;
 		status |= reflog_expire(ref, flags,
 					reflog_expiry_prepare,
-					should_expire_reflog_ent,
+					should_prune_fn,
 					reflog_expiry_cleanup,
 					&cb);
 		free(ref);
diff --git a/builtin/repack.c b/builtin/repack.c
index 0b2d1e5d82..da1e364a75 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -258,9 +258,11 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
 	for_each_packed_object(write_oid, &cmd,
 			       FOR_EACH_OBJECT_PROMISOR_ONLY);
 
-	if (cmd.in == -1)
+	if (cmd.in == -1) {
 		/* No packed objects; cmd was never started */
+		child_process_clear(&cmd);
 		return;
+	}
 
 	close(cmd.in);
 
@@ -610,7 +612,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	struct tempfile *refs_snapshot = NULL;
 	int i, ext, ret;
 	FILE *out;
-	int show_progress = isatty(2);
+	int show_progress;
 
 	/* variables to be filled by option parsing */
 	int pack_everything = 0;
@@ -679,7 +681,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 
 	if (keep_unreachable &&
 	    (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
-		die(_("--keep-unreachable and -A are incompatible"));
+		die(_("options '%s' and '%s' cannot be used together"), "--keep-unreachable", "-A");
 
 	if (write_bitmaps < 0) {
 		if (!write_midx &&
@@ -691,7 +693,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		write_bitmaps = 0;
 	}
 	if (pack_kept_objects < 0)
-		pack_kept_objects = write_bitmaps > 0;
+		pack_kept_objects = write_bitmaps > 0 && !write_midx;
 
 	if (write_bitmaps && !(pack_everything & ALL_INTO_ONE) && !write_midx)
 		die(_(incremental_bitmap_conflict_error));
@@ -710,7 +712,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 
 	if (geometric_factor) {
 		if (pack_everything)
-			die(_("--geometric is incompatible with -A, -a"));
+			die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");
 		init_pack_geometry(&geometry);
 		split_pack_geometry(geometry, geometric_factor);
 	}
@@ -723,6 +725,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 
 	prepare_pack_objects(&cmd, &po_args);
 
+	show_progress = !po_args.quiet && isatty(2);
+
 	strvec_push(&cmd.args, "--keep-true-parents");
 	if (!pack_kept_objects)
 		strvec_push(&cmd.args, "--honor-pack-keep");
@@ -842,7 +846,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			fname_old = mkpathdup("%s-%s%s",
 					packtmp, item->string, exts[ext].name);
 
-			if (((uintptr_t)item->util) & (1 << ext)) {
+			if (((uintptr_t)item->util) & ((uintptr_t)1 << ext)) {
 				struct stat statbuffer;
 				if (!stat(fname_old, &statbuffer)) {
 					statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
@@ -924,7 +928,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			}
 			strbuf_release(&buf);
 		}
-		if (!po_args.quiet && show_progress)
+		if (show_progress)
 			opts |= PRUNE_PACKED_VERBOSE;
 		prune_packed_objects(opts);
 
diff --git a/builtin/replace.c b/builtin/replace.c
index 946938d011..6ff1734d58 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -258,11 +258,10 @@ static int import_object(struct object_id *oid, enum object_type type,
 		return error_errno(_("unable to open %s for reading"), filename);
 
 	if (!raw && type == OBJ_TREE) {
-		const char *argv[] = { "mktree", NULL };
 		struct child_process cmd = CHILD_PROCESS_INIT;
 		struct strbuf result = STRBUF_INIT;
 
-		cmd.argv = argv;
+		strvec_push(&cmd.args, "mktree");
 		cmd.git_cmd = 1;
 		cmd.in = fd;
 		cmd.out = -1;
diff --git a/builtin/reset.c b/builtin/reset.c
index 7393595349..b97745ee94 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -25,6 +25,7 @@
 #include "cache-tree.h"
 #include "submodule.h"
 #include "submodule-config.h"
+#include "dir.h"
 
 #define REFRESH_INDEX_DELAY_WARNING_IN_MS (2 * 1000)
 
@@ -136,21 +137,36 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 	int intent_to_add = *(int *)data;
 
 	for (i = 0; i < q->nr; i++) {
+		int pos;
 		struct diff_filespec *one = q->queue[i]->one;
-		int is_missing = !(one->mode && !is_null_oid(&one->oid));
+		int is_in_reset_tree = one->mode && !is_null_oid(&one->oid);
 		struct cache_entry *ce;
 
-		if (is_missing && !intent_to_add) {
+		if (!is_in_reset_tree && !intent_to_add) {
 			remove_file_from_cache(one->path);
 			continue;
 		}
 
 		ce = make_cache_entry(&the_index, one->mode, &one->oid, one->path,
 				      0, 0);
+
+		/*
+		 * If the file 1) corresponds to an existing index entry with
+		 * skip-worktree set, or 2) does not exist in the index but is
+		 * outside the sparse checkout definition, add a skip-worktree bit
+		 * to the new index entry. Note that a sparse index will be expanded
+		 * if this entry is outside the sparse cone - this is necessary
+		 * to properly construct the reset sparse directory.
+		 */
+		pos = cache_name_pos(one->path, strlen(one->path));
+		if ((pos >= 0 && ce_skip_worktree(active_cache[pos])) ||
+		    (pos < 0 && !path_in_sparse_checkout(one->path, &the_index)))
+			ce->ce_flags |= CE_SKIP_WORKTREE;
+
 		if (!ce)
 			die(_("make_cache_entry failed for path '%s'"),
 			    one->path);
-		if (is_missing) {
+		if (!is_in_reset_tree) {
 			ce->ce_flags |= CE_INTENT_TO_ADD;
 			set_object_name_for_intent_to_add_entry(ce);
 		}
@@ -158,6 +174,82 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 	}
 }
 
+static int pathspec_needs_expanded_index(const struct pathspec *pathspec)
+{
+	unsigned int i, pos;
+	int res = 0;
+	char *skip_worktree_seen = NULL;
+
+	/*
+	 * When using a magic pathspec, assume for the sake of simplicity that
+	 * the index needs to be expanded to match all matchable files.
+	 */
+	if (pathspec->magic)
+		return 1;
+
+	for (i = 0; i < pathspec->nr; i++) {
+		struct pathspec_item item = pathspec->items[i];
+
+		/*
+		 * If the pathspec item has a wildcard, the index should be expanded
+		 * if the pathspec has the possibility of matching a subset of entries inside
+		 * of a sparse directory (but not the entire directory).
+		 *
+		 * If the pathspec item is a literal path, the index only needs to be expanded
+		 * if a) the pathspec isn't in the sparse checkout cone (to make sure we don't
+		 * expand for in-cone files) and b) it doesn't match any sparse directories
+		 * (since we can reset whole sparse directories without expanding them).
+		 */
+		if (item.nowildcard_len < item.len) {
+			/*
+			 * Special case: if the pattern is a path inside the cone
+			 * followed by only wildcards, the pattern cannot match
+			 * partial sparse directories, so we don't expand the index.
+			 */
+			if (path_in_cone_mode_sparse_checkout(item.original, &the_index) &&
+			    strspn(item.original + item.nowildcard_len, "*") == item.len - item.nowildcard_len)
+				continue;
+
+			for (pos = 0; pos < active_nr; pos++) {
+				struct cache_entry *ce = active_cache[pos];
+
+				if (!S_ISSPARSEDIR(ce->ce_mode))
+					continue;
+
+				/*
+				 * If the pre-wildcard length is longer than the sparse
+				 * directory name and the sparse directory is the first
+				 * component of the pathspec, need to expand the index.
+				 */
+				if (item.nowildcard_len > ce_namelen(ce) &&
+				    !strncmp(item.original, ce->name, ce_namelen(ce))) {
+					res = 1;
+					break;
+				}
+
+				/*
+				 * If the pre-wildcard length is shorter than the sparse
+				 * directory and the pathspec does not match the whole
+				 * directory, need to expand the index.
+				 */
+				if (!strncmp(item.original, ce->name, item.nowildcard_len) &&
+				    wildmatch(item.original, ce->name, 0)) {
+					res = 1;
+					break;
+				}
+			}
+		} else if (!path_in_cone_mode_sparse_checkout(item.original, &the_index) &&
+			   !matches_skip_worktree(pathspec, i, &skip_worktree_seen))
+			res = 1;
+
+		if (res > 0)
+			break;
+	}
+
+	free(skip_worktree_seen);
+	return res;
+}
+
 static int read_from_tree(const struct pathspec *pathspec,
 			  struct object_id *tree_oid,
 			  int intent_to_add)
@@ -170,7 +262,13 @@ static int read_from_tree(const struct pathspec *pathspec,
 	opt.format_callback = update_index_from_diff;
 	opt.format_callback_data = &intent_to_add;
 	opt.flags.override_submodule_config = 1;
+	opt.flags.recursive = 1;
 	opt.repo = the_repository;
+	opt.change = diff_change;
+	opt.add_remove = diff_addremove;
+
+	if (pathspec->nr && the_index.sparse_index && pathspec_needs_expanded_index(pathspec))
+		ensure_full_index(&the_index);
 
 	if (do_diff_cache(tree_oid, &opt))
 		return 1;
@@ -249,9 +347,6 @@ static void parse_args(struct pathspec *pathspec,
 	}
 	*rev_ret = rev;
 
-	if (read_cache() < 0)
-		die(_("index file corrupt"));
-
 	parse_pathspec(pathspec, 0,
 		       PATHSPEC_PREFER_FULL |
 		       (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
@@ -328,16 +423,16 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 
 	if (pathspec_from_file) {
 		if (patch_mode)
-			die(_("--pathspec-from-file is incompatible with --patch"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
 
 		if (pathspec.nr)
-			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+			die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 
 		parse_pathspec_file(&pathspec, 0,
 				    PATHSPEC_PREFER_FULL,
 				    prefix, pathspec_from_file, pathspec_file_nul);
 	} else if (pathspec_file_nul) {
-		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 	}
 
 	unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
@@ -364,7 +459,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 
 	if (patch_mode) {
 		if (reset_type != NONE)
-			die(_("--patch is incompatible with --{hard,mixed,soft}"));
+			die(_("options '%s' and '%s' cannot be used together"), "--patch", "--{hard,mixed,soft}");
 		trace2_cmd_mode("patch-interactive");
 		return run_add_interactive(rev, "--patch=reset", &pathspec);
 	}
@@ -395,7 +490,13 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 		    _(reset_type_names[reset_type]));
 
 	if (intent_to_add && reset_type != MIXED)
-		die(_("-N can only be used with --mixed"));
+		die(_("the option '%s' requires '%s'"), "-N", "--mixed");
+
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
+	if (read_cache() < 0)
+		die(_("index file corrupt"));
 
 	/* Soft reset does not touch the index file nor the working tree
 	 * at all, but requires them in a good order.  Other resets reset
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 36cb909eba..777558e9b0 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -538,7 +538,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 		const char *arg = argv[i];
 		if (skip_prefix(arg, "--missing=", &arg)) {
 			if (revs.exclude_promisor_objects)
-				die(_("cannot combine --exclude-promisor-objects and --missing"));
+				die(_("options '%s' and '%s' cannot be used together"), "--exclude-promisor-objects", "--missing");
 			if (parse_missing_action_value(arg))
 				break;
 		}
@@ -676,7 +676,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (revs.count &&
 	    (revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
 	    (revs.left_right || revs.cherry_mark))
-		die(_("marked counting is incompatible with --objects"));
+		die(_("marked counting and '%s' cannot be used together"), "--objects");
 
 	save_commit_buffer = (revs.verbose_header ||
 			      revs.grep_filter.pattern_list ||
diff --git a/builtin/rm.c b/builtin/rm.c
index 3d0967cdc1..84a935a16e 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -272,13 +272,13 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
 	if (pathspec_from_file) {
 		if (pathspec.nr)
-			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+			die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 
 		parse_pathspec_file(&pathspec, 0,
 				    PATHSPEC_PREFER_CWD,
 				    prefix, pathspec_from_file, pathspec_file_nul);
 	} else if (pathspec_file_nul) {
-		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 	}
 
 	if (!pathspec.nr)
@@ -399,12 +399,13 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	if (!index_only) {
 		int removed = 0, gitmodules_modified = 0;
 		struct strbuf buf = STRBUF_INIT;
+		int flag = force ? REMOVE_DIR_PURGE_ORIGINAL_CWD : 0;
 		for (i = 0; i < list.nr; i++) {
 			const char *path = list.entry[i].name;
 			if (list.entry[i].is_submodule) {
 				strbuf_reset(&buf);
 				strbuf_addstr(&buf, path);
-				if (remove_dir_recursively(&buf, 0))
+				if (remove_dir_recursively(&buf, flag))
 					die(_("could not remove '%s'"), path);
 
 				removed = 1;
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 082449293b..e12c5e80e3 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -707,8 +707,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 			 *
 			 * Also --all and --remotes do not make sense either.
 			 */
-			die(_("--reflog is incompatible with --all, --remotes, "
-			      "--independent or --merge-base"));
+			die(_("options '%s' and '%s' cannot be used together"), "--reflog",
+				"--all/--remotes/--independent/--merge-base");
 	}
 
 	/* If nothing is specified, show all branches by default */
@@ -761,6 +761,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 			char *logmsg;
 			char *nth_desc;
 			const char *msg;
+			char *end;
 			timestamp_t timestamp;
 			int tz;
 
@@ -770,11 +771,12 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 				reflog = i;
 				break;
 			}
-			msg = strchr(logmsg, '\t');
-			if (!msg)
-				msg = "(none)";
-			else
-				msg++;
+
+			end = strchr(logmsg, '\n');
+			if (end)
+				*end = '\0';
+
+			msg = (*logmsg == '\0') ? "(none)" : logmsg;
 			reflog_msg[i] = xstrfmt("(%s) %s",
 						show_date(timestamp, tz,
 							  DATE_MODE(RELATIVE)),
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index d0f5c4702b..679c107036 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -56,6 +56,9 @@ static int sparse_checkout_list(int argc, const char **argv)
 	char *sparse_filename;
 	int res;
 
+	if (!core_apply_sparse_checkout)
+		die(_("this worktree is not sparse"));
+
 	argc = parse_options(argc, argv, NULL,
 			     builtin_sparse_checkout_list_options,
 			     builtin_sparse_checkout_list_usage, 0);
@@ -380,6 +383,41 @@ static int set_config(enum sparse_checkout_mode mode)
 	return 0;
 }
 
+static int update_modes(int *cone_mode, int *sparse_index)
+{
+	int mode, record_mode;
+
+	/* Determine if we need to record the mode; ensure sparse checkout on */
+	record_mode = (*cone_mode != -1) || !core_apply_sparse_checkout;
+
+	/* If not specified, use previous definition of cone mode */
+	if (*cone_mode == -1 && core_apply_sparse_checkout)
+		*cone_mode = core_sparse_checkout_cone;
+
+	/* Set cone/non-cone mode appropriately */
+	core_apply_sparse_checkout = 1;
+	if (*cone_mode == 1) {
+		mode = MODE_CONE_PATTERNS;
+		core_sparse_checkout_cone = 1;
+	} else {
+		mode = MODE_ALL_PATTERNS;
+	}
+	if (record_mode && set_config(mode))
+		return 1;
+
+	/* Set sparse-index/non-sparse-index mode if specified */
+	if (*sparse_index >= 0) {
+		if (set_sparse_index_config(the_repository, *sparse_index) < 0)
+			die(_("failed to modify sparse-index config"));
+
+		/* force an index rewrite */
+		repo_read_index(the_repository);
+		the_repository->index->updated_workdir = 1;
+	}
+
+	return 0;
+}
+
 static char const * const builtin_sparse_checkout_init_usage[] = {
 	N_("git sparse-checkout init [--cone] [--[no-]sparse-index]"),
 	NULL
@@ -396,7 +434,6 @@ static int sparse_checkout_init(int argc, const char **argv)
 	char *sparse_filename;
 	int res;
 	struct object_id oid;
-	int mode;
 	struct strbuf pattern = STRBUF_INIT;
 
 	static struct option builtin_sparse_checkout_init_options[] = {
@@ -409,19 +446,14 @@ static int sparse_checkout_init(int argc, const char **argv)
 
 	repo_read_index(the_repository);
 
+	init_opts.cone_mode = -1;
 	init_opts.sparse_index = -1;
 
 	argc = parse_options(argc, argv, NULL,
 			     builtin_sparse_checkout_init_options,
 			     builtin_sparse_checkout_init_usage, 0);
 
-	if (init_opts.cone_mode) {
-		mode = MODE_CONE_PATTERNS;
-		core_sparse_checkout_cone = 1;
-	} else
-		mode = MODE_ALL_PATTERNS;
-
-	if (set_config(mode))
+	if (update_modes(&init_opts.cone_mode, &init_opts.sparse_index))
 		return 1;
 
 	memset(&pl, 0, sizeof(pl));
@@ -429,17 +461,6 @@ static int sparse_checkout_init(int argc, const char **argv)
 	sparse_filename = get_sparse_checkout_filename();
 	res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL, 0);
 
-	if (init_opts.sparse_index >= 0) {
-		if (set_sparse_index_config(the_repository, init_opts.sparse_index) < 0)
-			die(_("failed to modify sparse-index config"));
-
-		/* force an index rewrite */
-		repo_read_index(the_repository);
-		the_repository->index->updated_workdir = 1;
-	}
-
-	core_apply_sparse_checkout = 1;
-
 	/* If we already have a sparse-checkout file, use it. */
 	if (res >= 0) {
 		free(sparse_filename);
@@ -483,7 +504,7 @@ static void insert_recursive_pattern(struct pattern_list *pl, struct strbuf *pat
 		char *oldpattern = e->pattern;
 		size_t newlen;
 
-		if (slash == e->pattern)
+		if (!slash || slash == e->pattern)
 			break;
 
 		newlen = slash - e->pattern;
@@ -515,17 +536,9 @@ static void strbuf_to_cone_pattern(struct strbuf *line, struct pattern_list *pl)
 	insert_recursive_pattern(pl, line);
 }
 
-static char const * const builtin_sparse_checkout_set_usage[] = {
-	N_("git sparse-checkout (set|add) (--stdin | <patterns>)"),
-	NULL
-};
-
-static struct sparse_checkout_set_opts {
-	int use_stdin;
-} set_opts;
-
 static void add_patterns_from_input(struct pattern_list *pl,
-				    int argc, const char **argv)
+				    int argc, const char **argv,
+				    int use_stdin)
 {
 	int i;
 	if (core_sparse_checkout_cone) {
@@ -535,7 +548,7 @@ static void add_patterns_from_input(struct pattern_list *pl,
 		hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
 		pl->use_cone_patterns = 1;
 
-		if (set_opts.use_stdin) {
+		if (use_stdin) {
 			struct strbuf unquoted = STRBUF_INIT;
 			while (!strbuf_getline(&line, stdin)) {
 				if (line.buf[0] == '"') {
@@ -559,7 +572,7 @@ static void add_patterns_from_input(struct pattern_list *pl,
 			}
 		}
 	} else {
-		if (set_opts.use_stdin) {
+		if (use_stdin) {
 			struct strbuf line = STRBUF_INIT;
 
 			while (!strbuf_getline(&line, stdin)) {
@@ -580,7 +593,8 @@ enum modify_type {
 };
 
 static void add_patterns_cone_mode(int argc, const char **argv,
-				   struct pattern_list *pl)
+				   struct pattern_list *pl,
+				   int use_stdin)
 {
 	struct strbuf buffer = STRBUF_INIT;
 	struct pattern_entry *pe;
@@ -588,7 +602,7 @@ static void add_patterns_cone_mode(int argc, const char **argv,
 	struct pattern_list existing;
 	char *sparse_filename = get_sparse_checkout_filename();
 
-	add_patterns_from_input(pl, argc, argv);
+	add_patterns_from_input(pl, argc, argv, use_stdin);
 
 	memset(&existing, 0, sizeof(existing));
 	existing.use_cone_patterns = core_sparse_checkout_cone;
@@ -598,6 +612,9 @@ static void add_patterns_cone_mode(int argc, const char **argv,
 		die(_("unable to load existing sparse-checkout patterns"));
 	free(sparse_filename);
 
+	if (!existing.use_cone_patterns)
+		die(_("existing sparse-checkout patterns do not use cone mode"));
+
 	hashmap_for_each_entry(&existing.recursive_hashmap, &iter, pe, ent) {
 		if (!hashmap_contains_parent(&pl->recursive_hashmap,
 					pe->pattern, &buffer) ||
@@ -614,17 +631,19 @@ static void add_patterns_cone_mode(int argc, const char **argv,
 }
 
 static void add_patterns_literal(int argc, const char **argv,
-				 struct pattern_list *pl)
+				 struct pattern_list *pl,
+				 int use_stdin)
 {
 	char *sparse_filename = get_sparse_checkout_filename();
 	if (add_patterns_from_file_to_list(sparse_filename, "", 0,
 					   pl, NULL, 0))
 		die(_("unable to load existing sparse-checkout patterns"));
 	free(sparse_filename);
-	add_patterns_from_input(pl, argc, argv);
+	add_patterns_from_input(pl, argc, argv, use_stdin);
 }
 
-static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
+static int modify_pattern_list(int argc, const char **argv, int use_stdin,
+			       enum modify_type m)
 {
 	int result;
 	int changed_config = 0;
@@ -633,13 +652,13 @@ static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
 	switch (m) {
 	case ADD:
 		if (core_sparse_checkout_cone)
-			add_patterns_cone_mode(argc, argv, pl);
+			add_patterns_cone_mode(argc, argv, pl, use_stdin);
 		else
-			add_patterns_literal(argc, argv, pl);
+			add_patterns_literal(argc, argv, pl, use_stdin);
 		break;
 
 	case REPLACE:
-		add_patterns_from_input(pl, argc, argv);
+		add_patterns_from_input(pl, argc, argv, use_stdin);
 		break;
 	}
 
@@ -659,41 +678,124 @@ static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
 	return result;
 }
 
-static int sparse_checkout_set(int argc, const char **argv, const char *prefix,
-			       enum modify_type m)
+static char const * const builtin_sparse_checkout_add_usage[] = {
+	N_("git sparse-checkout add (--stdin | <patterns>)"),
+	NULL
+};
+
+static struct sparse_checkout_add_opts {
+	int use_stdin;
+} add_opts;
+
+static int sparse_checkout_add(int argc, const char **argv, const char *prefix)
 {
-	static struct option builtin_sparse_checkout_set_options[] = {
-		OPT_BOOL(0, "stdin", &set_opts.use_stdin,
+	static struct option builtin_sparse_checkout_add_options[] = {
+		OPT_BOOL(0, "stdin", &add_opts.use_stdin,
 			 N_("read patterns from standard in")),
 		OPT_END(),
 	};
 
+	if (!core_apply_sparse_checkout)
+		die(_("no sparse-checkout to add to"));
+
 	repo_read_index(the_repository);
 
 	argc = parse_options(argc, argv, prefix,
+			     builtin_sparse_checkout_add_options,
+			     builtin_sparse_checkout_add_usage,
+			     PARSE_OPT_KEEP_UNKNOWN);
+
+	return modify_pattern_list(argc, argv, add_opts.use_stdin, ADD);
+}
+
+static char const * const builtin_sparse_checkout_set_usage[] = {
+	N_("git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | <patterns>)"),
+	NULL
+};
+
+static struct sparse_checkout_set_opts {
+	int cone_mode;
+	int sparse_index;
+	int use_stdin;
+} set_opts;
+
+static int sparse_checkout_set(int argc, const char **argv, const char *prefix)
+{
+	int default_patterns_nr = 2;
+	const char *default_patterns[] = {"/*", "!/*/", NULL};
+
+	static struct option builtin_sparse_checkout_set_options[] = {
+		OPT_BOOL(0, "cone", &set_opts.cone_mode,
+			 N_("initialize the sparse-checkout in cone mode")),
+		OPT_BOOL(0, "sparse-index", &set_opts.sparse_index,
+			 N_("toggle the use of a sparse index")),
+		OPT_BOOL_F(0, "stdin", &set_opts.use_stdin,
+			   N_("read patterns from standard in"),
+			   PARSE_OPT_NONEG),
+		OPT_END(),
+	};
+
+	repo_read_index(the_repository);
+
+	set_opts.cone_mode = -1;
+	set_opts.sparse_index = -1;
+
+	argc = parse_options(argc, argv, prefix,
 			     builtin_sparse_checkout_set_options,
 			     builtin_sparse_checkout_set_usage,
 			     PARSE_OPT_KEEP_UNKNOWN);
 
-	return modify_pattern_list(argc, argv, m);
+	if (update_modes(&set_opts.cone_mode, &set_opts.sparse_index))
+		return 1;
+
+	/*
+	 * Cone mode automatically specifies the toplevel directory.  For
+	 * non-cone mode, if nothing is specified, manually select just the
+	 * top-level directory (much as 'init' would do).
+	 */
+	if (!core_sparse_checkout_cone && argc == 0) {
+		argv = default_patterns;
+		argc = default_patterns_nr;
+	}
+
+	return modify_pattern_list(argc, argv, set_opts.use_stdin, REPLACE);
 }
 
 static char const * const builtin_sparse_checkout_reapply_usage[] = {
-	N_("git sparse-checkout reapply"),
+	N_("git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"),
 	NULL
 };
 
+static struct sparse_checkout_reapply_opts {
+	int cone_mode;
+	int sparse_index;
+} reapply_opts;
+
 static int sparse_checkout_reapply(int argc, const char **argv)
 {
 	static struct option builtin_sparse_checkout_reapply_options[] = {
+		OPT_BOOL(0, "cone", &reapply_opts.cone_mode,
+			 N_("initialize the sparse-checkout in cone mode")),
+		OPT_BOOL(0, "sparse-index", &reapply_opts.sparse_index,
+			 N_("toggle the use of a sparse index")),
 		OPT_END(),
 	};
 
+	if (!core_apply_sparse_checkout)
+		die(_("must be in a sparse-checkout to reapply sparsity patterns"));
+
 	argc = parse_options(argc, argv, NULL,
 			     builtin_sparse_checkout_reapply_options,
 			     builtin_sparse_checkout_reapply_usage, 0);
 
 	repo_read_index(the_repository);
+
+	reapply_opts.cone_mode = -1;
+	reapply_opts.sparse_index = -1;
+
+	if (update_modes(&reapply_opts.cone_mode, &reapply_opts.sparse_index))
+		return 1;
+
 	return update_working_directory(NULL);
 }
 
@@ -710,6 +812,17 @@ static int sparse_checkout_disable(int argc, const char **argv)
 	struct pattern_list pl;
 	struct strbuf match_all = STRBUF_INIT;
 
+	/*
+	 * We do not exit early if !core_apply_sparse_checkout; due to the
+	 * ability for users to manually muck things up between
+	 *   direct editing of .git/info/sparse-checkout
+	 *   running read-tree -m u HEAD or update-index --skip-worktree
+	 *   direct toggling of config options
+	 * users might end up with an index with SKIP_WORKTREE bit set on
+	 * some files and not know how to undo it.  So, here we just
+	 * forcibly return to a dense checkout regardless of initial state.
+	 */
+
 	argc = parse_options(argc, argv, NULL,
 			     builtin_sparse_checkout_disable_options,
 			     builtin_sparse_checkout_disable_usage, 0);
@@ -758,9 +871,9 @@ int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
 		if (!strcmp(argv[0], "init"))
 			return sparse_checkout_init(argc, argv);
 		if (!strcmp(argv[0], "set"))
-			return sparse_checkout_set(argc, argv, prefix, REPLACE);
+			return sparse_checkout_set(argc, argv, prefix);
 		if (!strcmp(argv[0], "add"))
-			return sparse_checkout_set(argc, argv, prefix, ADD);
+			return sparse_checkout_add(argc, argv, prefix);
 		if (!strcmp(argv[0], "reapply"))
 			return sparse_checkout_reapply(argc, argv);
 		if (!strcmp(argv[0], "disable"))
diff --git a/builtin/stash.c b/builtin/stash.c
index a0ccc8654d..86cd0b456e 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -27,11 +27,11 @@ static const char * const git_stash_usage[] = {
 	N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
 	N_("git stash branch <branchname> [<stash>]"),
 	"git stash clear",
-	N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+	N_("git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
 	   "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 	   "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 	   "          [--] [<pathspec>...]]"),
-	N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+	N_("git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
 	   "          [-u|--include-untracked] [-a|--all] [<message>]"),
 	NULL
 };
@@ -561,18 +561,19 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		if (index)
 			fprintf_ln(stderr, _("Index was not unstashed."));
 
-		return ret;
+		goto restore_untracked;
 	}
 
 	if (has_index) {
 		if (reset_tree(&index_tree, 0, 0))
-			return -1;
+			ret = -1;
 	} else {
 		unstage_changes_unless_new(&c_tree);
 	}
 
+restore_untracked:
 	if (info->has_u && restore_untracked(&info->u_tree))
-		return error(_("could not restore untracked files from stash"));
+		ret = error(_("could not restore untracked files from stash"));
 
 	if (!quiet) {
 		struct child_process cp = CHILD_PROCESS_INIT;
@@ -592,7 +593,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		run_command(&cp);
 	}
 
-	return 0;
+	return ret;
 }
 
 static int apply_stash(int argc, const char **argv, const char *prefix)
@@ -1132,6 +1133,38 @@ done:
 	return ret;
 }
 
+static int stash_staged(struct stash_info *info, struct strbuf *out_patch,
+			int quiet)
+{
+	int ret = 0;
+	struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
+	struct index_state istate = { NULL };
+
+	if (write_index_as_tree(&info->w_tree, &istate, the_repository->index_file,
+				0, NULL)) {
+		ret = -1;
+		goto done;
+	}
+
+	cp_diff_tree.git_cmd = 1;
+	strvec_pushl(&cp_diff_tree.args, "diff-tree", "-p", "-U1", "HEAD",
+		     oid_to_hex(&info->w_tree), "--", NULL);
+	if (pipe_command(&cp_diff_tree, NULL, 0, out_patch, 0, NULL, 0)) {
+		ret = -1;
+		goto done;
+	}
+
+	if (!out_patch->len) {
+		if (!quiet)
+			fprintf_ln(stderr, _("No staged changes"));
+		ret = 1;
+	}
+
+done:
+	discard_index(&istate);
+	return ret;
+}
+
 static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 		       struct strbuf *out_patch, int quiet)
 {
@@ -1258,7 +1291,7 @@ done:
 }
 
 static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_buf,
-			   int include_untracked, int patch_mode,
+			   int include_untracked, int patch_mode, int only_staged,
 			   struct stash_info *info, struct strbuf *patch,
 			   int quiet)
 {
@@ -1337,6 +1370,16 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b
 		} else if (ret > 0) {
 			goto done;
 		}
+	} else if (only_staged) {
+		ret = stash_staged(info, patch, quiet);
+		if (ret < 0) {
+			if (!quiet)
+				fprintf_ln(stderr, _("Cannot save the current "
+						     "staged state"));
+			goto done;
+		} else if (ret > 0) {
+			goto done;
+		}
 	} else {
 		if (stash_working_tree(info, ps)) {
 			if (!quiet)
@@ -1395,7 +1438,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
 	if (!check_changes_tracked_files(&ps))
 		return 0;
 
-	ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, &info,
+	ret = do_create_stash(&ps, &stash_msg_buf, 0, 0, 0, &info,
 			      NULL, 0);
 	if (!ret)
 		printf_ln("%s", oid_to_hex(&info.w_commit));
@@ -1405,7 +1448,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
 }
 
 static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int quiet,
-			 int keep_index, int patch_mode, int include_untracked)
+			 int keep_index, int patch_mode, int include_untracked, int only_staged)
 {
 	int ret = 0;
 	struct stash_info info;
@@ -1423,6 +1466,17 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 		goto done;
 	}
 
+	/* --patch overrides --staged */
+	if (patch_mode)
+		only_staged = 0;
+
+	if (only_staged && include_untracked) {
+		fprintf_ln(stderr, _("Can't use --staged and --include-untracked"
+				     " or --all at the same time"));
+		ret = -1;
+		goto done;
+	}
+
 	read_cache_preload(NULL);
 	if (!include_untracked && ps->nr) {
 		int i;
@@ -1463,7 +1517,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 
 	if (stash_msg)
 		strbuf_addstr(&stash_msg_buf, stash_msg);
-	if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
+	if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode, only_staged,
 			    &info, &patch, quiet)) {
 		ret = -1;
 		goto done;
@@ -1480,13 +1534,19 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 		printf_ln(_("Saved working directory and index state %s"),
 			  stash_msg_buf.buf);
 
-	if (!patch_mode) {
+	if (!(patch_mode || only_staged)) {
 		if (include_untracked && !ps->nr) {
 			struct child_process cp = CHILD_PROCESS_INIT;
 
 			cp.git_cmd = 1;
+			if (startup_info->original_cwd) {
+				cp.dir = startup_info->original_cwd;
+				strvec_pushf(&cp.env_array, "%s=%s",
+					     GIT_WORK_TREE_ENVIRONMENT,
+					     the_repository->worktree);
+			}
 			strvec_pushl(&cp.args, "clean", "--force",
-				     "--quiet", "-d", NULL);
+				     "--quiet", "-d", ":/", NULL);
 			if (include_untracked == INCLUDE_ALL_FILES)
 				strvec_push(&cp.args, "-x");
 			if (run_command(&cp)) {
@@ -1598,6 +1658,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
 {
 	int force_assume = 0;
 	int keep_index = -1;
+	int only_staged = 0;
 	int patch_mode = 0;
 	int include_untracked = 0;
 	int quiet = 0;
@@ -1608,6 +1669,8 @@ static int push_stash(int argc, const char **argv, const char *prefix,
 	struct option options[] = {
 		OPT_BOOL('k', "keep-index", &keep_index,
 			 N_("keep index")),
+		OPT_BOOL('S', "staged", &only_staged,
+			 N_("stash staged changes only")),
 		OPT_BOOL('p', "patch", &patch_mode,
 			 N_("stash in patch mode")),
 		OPT__QUIET(&quiet, N_("quiet mode")),
@@ -1625,6 +1688,7 @@ static int push_stash(int argc, const char **argv, const char *prefix,
 	if (argc) {
 		force_assume = !strcmp(argv[0], "-p");
 		argc = parse_options(argc, argv, prefix, options,
+				     push_assumed ? git_stash_usage :
 				     git_stash_push_usage,
 				     PARSE_OPT_KEEP_DASHDASH);
 	}
@@ -1644,25 +1708,29 @@ static int push_stash(int argc, const char **argv, const char *prefix,
 
 	if (pathspec_from_file) {
 		if (patch_mode)
-			die(_("--pathspec-from-file is incompatible with --patch"));
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--patch");
+
+		if (only_staged)
+			die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--staged");
 
 		if (ps.nr)
-			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+			die(_("'%s' and pathspec arguments cannot be used together"), "--pathspec-from-file");
 
 		parse_pathspec_file(&ps, 0,
 				    PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
 				    prefix, pathspec_from_file, pathspec_file_nul);
 	} else if (pathspec_file_nul) {
-		die(_("--pathspec-file-nul requires --pathspec-from-file"));
+		die(_("the option '%s' requires '%s'"), "--pathspec-file-nul", "--pathspec-from-file");
 	}
 
 	return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
-			     include_untracked);
+			     include_untracked, only_staged);
 }
 
 static int save_stash(int argc, const char **argv, const char *prefix)
 {
 	int keep_index = -1;
+	int only_staged = 0;
 	int patch_mode = 0;
 	int include_untracked = 0;
 	int quiet = 0;
@@ -1673,6 +1741,8 @@ static int save_stash(int argc, const char **argv, const char *prefix)
 	struct option options[] = {
 		OPT_BOOL('k', "keep-index", &keep_index,
 			 N_("keep index")),
+		OPT_BOOL('S', "staged", &only_staged,
+			 N_("stash staged changes only")),
 		OPT_BOOL('p', "patch", &patch_mode,
 			 N_("stash in patch mode")),
 		OPT__QUIET(&quiet, N_("quiet mode")),
@@ -1694,7 +1764,7 @@ static int save_stash(int argc, const char **argv, const char *prefix)
 
 	memset(&ps, 0, sizeof(ps));
 	ret = do_push_stash(&ps, stash_msg, quiet, keep_index,
-			    patch_mode, include_untracked);
+			    patch_mode, include_untracked, only_staged);
 
 	strbuf_release(&stash_msg_buf);
 	return ret;
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index e630f0c730..c5d3fc3817 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1313,7 +1313,7 @@ static int module_summary(int argc, const char **argv, const char *prefix)
 
 	if (files) {
 		if (cached)
-			die(_("--cached and --files are mutually exclusive"));
+			die(_("options '%s' and '%s' cannot be used together"), "--cached", "--files");
 		diff_cmd = DIFF_FILES;
 	}
 
@@ -1503,16 +1503,17 @@ static void deinit_submodule(const char *path, const char *prefix,
 		struct strbuf sb_rm = STRBUF_INIT;
 		const char *format;
 
-		/*
-		 * protect submodules containing a .git directory
-		 * NEEDSWORK: instead of dying, automatically call
-		 * absorbgitdirs and (possibly) warn.
-		 */
-		if (is_directory(sub_git_dir))
-			die(_("Submodule work tree '%s' contains a .git "
-			      "directory (use 'rm -rf' if you really want "
-			      "to remove it including all of its history)"),
-			    displaypath);
+		if (is_directory(sub_git_dir)) {
+			if (!(flags & OPT_QUIET))
+				warning(_("Submodule work tree '%s' contains a .git "
+					  "directory. This will be replaced with a "
+					  ".git file by using absorbgitdirs."),
+					displaypath);
+
+			absorb_git_dir_into_superproject(path,
+							 ABSORB_GITDIR_RECURSE_SUBMODULES);
+
+		}
 
 		if (!(flags & OPT_FORCE)) {
 			struct child_process cp_rm = CHILD_PROCESS_INIT;
@@ -2971,7 +2972,7 @@ static int module_set_branch(int argc, const char **argv, const char *prefix)
 		die(_("--branch or --default required"));
 
 	if (opt_branch && opt_default)
-		die(_("--branch and --default are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "--branch", "--default");
 
 	if (argc != 1 || !(path = argv[0]))
 		usage_with_options(usage, options);
diff --git a/builtin/tag.c b/builtin/tag.c
index 6fe646710d..134b3f1edf 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -178,7 +178,6 @@ static const char tag_template_nocleanup[] =
 static int git_tag_config(const char *var, const char *value, void *cb)
 {
 	int status;
-	struct ref_sorting **sorting_tail = (struct ref_sorting **)cb;
 
 	if (!strcmp(var, "tag.gpgsign")) {
 		config_sign_tag = git_config_bool(var, value);
@@ -188,7 +187,7 @@ static int git_tag_config(const char *var, const char *value, void *cb)
 	if (!strcmp(var, "tag.sort")) {
 		if (!value)
 			return config_error_nonbool(var);
-		parse_ref_sorting(sorting_tail, value);
+		string_list_append(cb, value);
 		return 0;
 	}
 
@@ -436,7 +435,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	struct ref_transaction *transaction;
 	struct strbuf err = STRBUF_INIT;
 	struct ref_filter filter;
-	static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
+	struct ref_sorting *sorting;
+	struct string_list sorting_options = STRING_LIST_INIT_DUP;
 	struct ref_format format = REF_FORMAT_INIT;
 	int icase = 0;
 	int edit_flag = 0;
@@ -470,7 +470,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_WITHOUT(&filter.no_commit, N_("print only tags that don't contain the commit")),
 		OPT_MERGED(&filter, N_("print only tags that are merged")),
 		OPT_NO_MERGED(&filter, N_("print only tags that are not merged")),
-		OPT_REF_SORT(sorting_tail),
+		OPT_REF_SORT(&sorting_options),
 		{
 			OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
 			N_("print only tags of the object"), PARSE_OPT_LASTARG_DEFAULT,
@@ -483,10 +483,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 	int ret = 0;
+	const char *only_in_list = NULL;
 
 	setup_ref_filter_porcelain_msg();
 
-	git_config(git_tag_config, sorting_tail);
+	git_config(git_tag_config, &sorting_options);
 
 	memset(&opt, 0, sizeof(opt));
 	memset(&filter, 0, sizeof(filter));
@@ -522,11 +523,10 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	finalize_colopts(&colopts, -1);
 	if (cmdmode == 'l' && filter.lines != -1) {
 		if (explicitly_enable_column(colopts))
-			die(_("--column and -n are incompatible"));
+			die(_("options '%s' and '%s' cannot be used together"), "--column", "-n");
 		colopts = 0;
 	}
-	if (!sorting)
-		sorting = ref_default_sorting();
+	sorting = ref_sorting_options(&sorting_options);
 	ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
 	filter.ignore_case = icase;
 	if (cmdmode == 'l') {
@@ -543,15 +543,19 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		goto cleanup;
 	}
 	if (filter.lines != -1)
-		die(_("-n option is only allowed in list mode"));
-	if (filter.with_commit)
-		die(_("--contains option is only allowed in list mode"));
-	if (filter.no_commit)
-		die(_("--no-contains option is only allowed in list mode"));
-	if (filter.points_at.nr)
-		die(_("--points-at option is only allowed in list mode"));
-	if (filter.reachable_from || filter.unreachable_from)
-		die(_("--merged and --no-merged options are only allowed in list mode"));
+		only_in_list = "-n";
+	else if (filter.with_commit)
+		only_in_list = "--contains";
+	else if (filter.no_commit)
+		only_in_list = "--no-contains";
+	else if (filter.points_at.nr)
+		only_in_list = "--points-at";
+	else if (filter.reachable_from)
+		only_in_list = "--merged";
+	else if (filter.unreachable_from)
+		only_in_list = "--no-merged";
+	if (only_in_list)
+		die(_("the '%s' option is only allowed in list mode"), only_in_list);
 	if (cmdmode == 'd') {
 		ret = delete_tags(argv);
 		goto cleanup;
@@ -565,7 +569,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 
 	if (msg.given || msgfile) {
 		if (msg.given && msgfile)
-			die(_("only one -F or -m option is allowed."));
+			die(_("options '%s' and '%s' cannot be used together"), "-F", "-m");
 		if (msg.given)
 			strbuf_addbuf(&buf, &(msg.buf));
 		else {
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 24654b4c9b..98d028dae6 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -77,7 +77,7 @@ static ssize_t process_input(int child_fd, int band)
 
 int cmd_upload_archive(int argc, const char **argv, const char *prefix)
 {
-	struct child_process writer = { argv };
+	struct child_process writer = CHILD_PROCESS_INIT;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(upload_archive_usage);
@@ -89,9 +89,10 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
 	 * multiplexed out to our fd#1.  If the child dies, we tell the other
 	 * end over channel #3.
 	 */
-	argv[0] = "upload-archive--writer";
 	writer.out = writer.err = -1;
 	writer.git_cmd = 1;
+	strvec_push(&writer.args, "upload-archive--writer");
+	strvec_pushv(&writer.args, argv + 1);
 	if (start_command(&writer)) {
 		int err = errno;
 		packet_write_fmt(1, "NACK unable to spawn subprocess\n");
diff --git a/builtin/var.c b/builtin/var.c
index 6c6f46b4ae..491db27429 100644
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -5,6 +5,7 @@
  */
 #include "builtin.h"
 #include "config.h"
+#include "refs.h"
 
 static const char var_usage[] = "git var (-l | <variable>)";
 
@@ -27,6 +28,11 @@ static const char *pager(int flag)
 	return pgm;
 }
 
+static const char *default_branch(int flag)
+{
+	return git_default_branch_name(1);
+}
+
 struct git_var {
 	const char *name;
 	const char *(*read)(int);
@@ -36,6 +42,7 @@ static struct git_var git_vars[] = {
 	{ "GIT_AUTHOR_IDENT",   git_author_info },
 	{ "GIT_EDITOR", editor },
 	{ "GIT_PAGER", pager },
+	{ "GIT_DEFAULT_BRANCH", default_branch },
 	{ "", NULL },
 };
 
diff --git a/builtin/worktree.c b/builtin/worktree.c
index d22ece93e1..2838254f7f 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -72,7 +72,7 @@ static void delete_worktrees_dir_if_empty(void)
 static void prune_worktree(const char *id, const char *reason)
 {
 	if (show_only || verbose)
-		printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason);
+		fprintf_ln(stderr, _("Removing %s/%s: %s"), "worktrees", id, reason);
 	if (!show_only)
 		delete_git_dir(id);
 }
@@ -349,18 +349,18 @@ static int add_worktree(const char *path, const char *refname,
 			strvec_push(&cp.args, "--quiet");
 	}
 
-	cp.env = child_env.v;
+	strvec_pushv(&cp.env_array, child_env.v);
 	ret = run_command(&cp);
 	if (ret)
 		goto done;
 
 	if (opts->checkout) {
-		cp.argv = NULL;
-		strvec_clear(&cp.args);
+		struct child_process cp = CHILD_PROCESS_INIT;
+		cp.git_cmd = 1;
 		strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
 		if (opts->quiet)
 			strvec_push(&cp.args, "--quiet");
-		cp.env = child_env.v;
+		strvec_pushv(&cp.env_array, child_env.v);
 		ret = run_command(&cp);
 		if (ret)
 			goto done;
@@ -385,12 +385,11 @@ done:
 		const char *hook = find_hook("post-checkout");
 		if (hook) {
 			const char *env[] = { "GIT_DIR", "GIT_WORK_TREE", NULL };
-			cp.git_cmd = 0;
+			struct child_process cp = CHILD_PROCESS_INIT;
 			cp.no_stdin = 1;
 			cp.stdout_to_stderr = 1;
 			cp.dir = path;
-			cp.env = env;
-			cp.argv = NULL;
+			strvec_pushv(&cp.env_array, env);
 			cp.trace2_hook_name = "post-checkout";
 			strvec_pushl(&cp.args, absolute_path(hook),
 				     oid_to_hex(null_oid()),
@@ -418,24 +417,24 @@ static void print_preparing_worktree_line(int detach,
 	if (force_new_branch) {
 		struct commit *commit = lookup_commit_reference_by_name(new_branch);
 		if (!commit)
-			printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
+			fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
 		else
-			printf_ln(_("Preparing worktree (resetting branch '%s'; was at %s)"),
+			fprintf_ln(stderr, _("Preparing worktree (resetting branch '%s'; was at %s)"),
 				  new_branch,
 				  find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
 	} else if (new_branch) {
-		printf_ln(_("Preparing worktree (new branch '%s')"), new_branch);
+		fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
 	} else {
 		struct strbuf s = STRBUF_INIT;
 		if (!detach && !strbuf_check_branch_ref(&s, branch) &&
 		    ref_exists(s.buf))
-			printf_ln(_("Preparing worktree (checking out '%s')"),
+			fprintf_ln(stderr, _("Preparing worktree (checking out '%s')"),
 				  branch);
 		else {
 			struct commit *commit = lookup_commit_reference_by_name(branch);
 			if (!commit)
 				die(_("invalid reference: %s"), branch);
-			printf_ln(_("Preparing worktree (detached HEAD %s)"),
+			fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
 				  find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV));
 		}
 		strbuf_release(&s);
@@ -504,9 +503,9 @@ static int add(int ac, const char **av, const char *prefix)
 	opts.checkout = 1;
 	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
 	if (!!opts.detach + !!new_branch + !!new_branch_force > 1)
-		die(_("-b, -B, and --detach are mutually exclusive"));
+		die(_("options '%s', '%s', and '%s' cannot be used together"), "-b", "-B", "--detach");
 	if (lock_reason && !keep_locked)
-		die(_("--reason requires --lock"));
+		die(_("the option '%s' requires '%s'"), "--reason", "--lock");
 	if (lock_reason)
 		opts.keep_locked = lock_reason;
 	else if (keep_locked)
@@ -700,7 +699,7 @@ static int list(int ac, const char **av, const char *prefix)
 	if (ac)
 		usage_with_options(worktree_usage, options);
 	else if (verbose && porcelain)
-		die(_("--verbose and --porcelain are mutually exclusive"));
+		die(_("options '%s' and '%s' cannot be used together"), "--verbose", "--porcelain");
 	else {
 		struct worktree **worktrees = get_worktrees();
 		int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
@@ -1006,7 +1005,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
 static void report_repair(int iserr, const char *path, const char *msg, void *cb_data)
 {
 	if (!iserr) {
-		printf_ln(_("repair: %s: %s"), msg, path);
+		fprintf_ln(stderr, _("repair: %s: %s"), msg, path);
 	} else {
 		int *exit_status = (int *)cb_data;
 		fprintf_ln(stderr, _("error: %s: %s"), msg, path);
diff --git a/cache-tree.c b/cache-tree.c
index 79d168192d..65ca993361 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -741,15 +741,26 @@ out:
 	return ret;
 }
 
+static void prime_cache_tree_sparse_dir(struct cache_tree *it,
+					struct tree *tree)
+{
+
+	oidcpy(&it->oid, &tree->object.oid);
+	it->entry_count = 1;
+}
+
 static void prime_cache_tree_rec(struct repository *r,
 				 struct cache_tree *it,
-				 struct tree *tree)
+				 struct tree *tree,
+				 struct strbuf *tree_path)
 {
 	struct tree_desc desc;
 	struct name_entry entry;
 	int cnt;
+	int base_path_len = tree_path->len;
 
 	oidcpy(&it->oid, &tree->object.oid);
+
 	init_tree_desc(&desc, tree->buffer, tree->size);
 	cnt = 0;
 	while (tree_entry(&desc, &entry)) {
@@ -758,14 +769,40 @@ static void prime_cache_tree_rec(struct repository *r,
 		else {
 			struct cache_tree_sub *sub;
 			struct tree *subtree = lookup_tree(r, &entry.oid);
+
 			if (!subtree->object.parsed)
 				parse_tree(subtree);
 			sub = cache_tree_sub(it, entry.path);
 			sub->cache_tree = cache_tree();
-			prime_cache_tree_rec(r, sub->cache_tree, subtree);
+
+			/*
+			 * Recursively-constructed subtree path is only needed when working
+			 * in a sparse index (where it's used to determine whether the
+			 * subtree is a sparse directory in the index).
+			 */
+			if (r->index->sparse_index) {
+				strbuf_setlen(tree_path, base_path_len);
+				strbuf_grow(tree_path, base_path_len + entry.pathlen + 1);
+				strbuf_add(tree_path, entry.path, entry.pathlen);
+				strbuf_addch(tree_path, '/');
+			}
+
+			/*
+			 * If a sparse index is in use, the directory being processed may be
+			 * sparse. To confirm that, we can check whether an entry with that
+			 * exact name exists in the index. If it does, the created subtree
+			 * should be sparse. Otherwise, cache tree expansion should continue
+			 * as normal.
+			 */
+			if (r->index->sparse_index &&
+			    index_entry_exists(r->index, tree_path->buf, tree_path->len))
+				prime_cache_tree_sparse_dir(sub->cache_tree, subtree);
+			else
+				prime_cache_tree_rec(r, sub->cache_tree, subtree, tree_path);
 			cnt += sub->cache_tree->entry_count;
 		}
 	}
+
 	it->entry_count = cnt;
 }
 
@@ -773,11 +810,14 @@ void prime_cache_tree(struct repository *r,
 		      struct index_state *istate,
 		      struct tree *tree)
 {
+	struct strbuf tree_path = STRBUF_INIT;
+
 	trace2_region_enter("cache-tree", "prime_cache_tree", the_repository);
 	cache_tree_free(&istate->cache_tree);
 	istate->cache_tree = cache_tree();
 
-	prime_cache_tree_rec(r, istate->cache_tree, tree);
+	prime_cache_tree_rec(r, istate->cache_tree, tree, &tree_path);
+	strbuf_release(&tree_path);
 	istate->cache_changed |= CACHE_TREE_CHANGED;
 	trace2_region_leave("cache-tree", "prime_cache_tree", the_repository);
 }
diff --git a/cache.h b/cache.h
index eba12487b9..281f00ab1b 100644
--- a/cache.h
+++ b/cache.h
@@ -350,8 +350,6 @@ void add_name_hash(struct index_state *istate, struct cache_entry *ce);
 void remove_name_hash(struct index_state *istate, struct cache_entry *ce);
 void free_name_hash(struct index_state *istate);
 
-void ensure_full_index(struct index_state *istate);
-
 /* Cache entry creation and cleanup */
 
 /*
@@ -817,6 +815,16 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
 int index_name_pos(struct index_state *, const char *name, int namelen);
 
 /*
+ * Determines whether an entry with the given name exists within the
+ * given index. The return value is 1 if an exact match is found, otherwise
+ * it is 0. Note that, unlike index_name_pos, this function does not expand
+ * the index if it is sparse. If an item exists within the full index but it
+ * is contained within a sparse directory (and not in the sparse index), 0 is
+ * returned.
+ */
+int index_entry_exists(struct index_state *, const char *name, int namelen);
+
+/*
  * Some functions return the negative complement of an insert position when a
  * precise match was not found but a position was found where the entry would
  * need to be inserted. This helper protects that logic from any integer
@@ -986,6 +994,7 @@ extern int read_replace_refs;
 extern char *git_replace_ref_base;
 
 extern int fsync_object_files;
+extern int use_fsync;
 extern int core_preload_index;
 extern int precomposed_unicode;
 extern int protect_hfs;
@@ -1588,6 +1597,7 @@ timestamp_t approxidate_careful(const char *, int *);
 timestamp_t approxidate_relative(const char *date);
 void parse_date_format(const char *format, struct date_mode *mode);
 int date_overflows(timestamp_t date);
+time_t tm_to_time_t(const struct tm *tm);
 
 #define IDENT_STRICT	       1
 #define IDENT_NO_DATE	       2
@@ -1834,8 +1844,10 @@ void overlay_tree_on_index(struct index_state *istate,
 struct startup_info {
 	int have_repository;
 	const char *prefix;
+	const char *original_cwd;
 };
 extern struct startup_info *startup_info;
+extern const char *tmp_original_cwd;
 
 /* merge.c */
 struct commit_list;
diff --git a/cbtree.c b/cbtree.c
index b0c65d810f..336e46dbba 100644
--- a/cbtree.c
+++ b/cbtree.c
@@ -95,38 +95,6 @@ struct cb_node *cb_lookup(struct cb_tree *t, const uint8_t *k, size_t klen)
 	return p && !memcmp(p->k, k, klen) ? p : NULL;
 }
 
-struct cb_node *cb_unlink(struct cb_tree *t, const uint8_t *k, size_t klen)
-{
-	struct cb_node **wherep = &t->root;
-	struct cb_node **whereq = NULL;
-	struct cb_node *q = NULL;
-	size_t direction = 0;
-	uint8_t c;
-	struct cb_node *p = t->root;
-
-	if (!p) return NULL;	/* empty tree, nothing to delete */
-
-	/* traverse to find best match, keeping link to parent */
-	while (1 & (uintptr_t)p) {
-		whereq = wherep;
-		q = cb_node_of(p);
-		c = q->byte < klen ? k[q->byte] : 0;
-		direction = (1 + (q->otherbits | c)) >> 8;
-		wherep = q->child + direction;
-		p = *wherep;
-	}
-
-	if (memcmp(p->k, k, klen))
-		return NULL;		/* no match, nothing unlinked */
-
-	/* found an exact match */
-	if (whereq)	/* update parent */
-		*whereq = q->child[1 - direction];
-	else
-		t->root = NULL;
-	return p;
-}
-
 static enum cb_next cb_descend(struct cb_node *p, cb_iter fn, void *arg)
 {
 	if (1 & (uintptr_t)p) {
diff --git a/cbtree.h b/cbtree.h
index dedbb8e2a4..0be14fb7ee 100644
--- a/cbtree.h
+++ b/cbtree.h
@@ -47,7 +47,6 @@ static inline void cb_init(struct cb_tree *t)
 
 struct cb_node *cb_lookup(struct cb_tree *, const uint8_t *k, size_t klen);
 struct cb_node *cb_insert(struct cb_tree *, struct cb_node *, size_t klen);
-struct cb_node *cb_unlink(struct cb_tree *t, const uint8_t *k, size_t klen);
 
 typedef enum cb_next (*cb_iter)(struct cb_node *, void *arg);
 
diff --git a/ci/check-directional-formatting.bash b/ci/check-directional-formatting.bash
new file mode 100755
index 0000000000..e6211b141a
--- /dev/null
+++ b/ci/check-directional-formatting.bash
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# This script verifies that the non-binary files tracked in the Git index do
+# not contain any Unicode directional formatting: such formatting could be used
+# to deceive reviewers into interpreting code differently from the compiler.
+# This is intended to run on an Ubuntu agent in a GitHub workflow.
+#
+# To allow translated messages to introduce such directional formatting in the
+# future, we exclude the `.po` files from this validation.
+#
+# Neither GNU grep nor `git grep` (not even with `-P`) handle `\u` as a way to
+# specify UTF-8.
+#
+# To work around that, we use `printf` to produce the pattern as a byte
+# sequence, and then feed that to `git grep` as a byte sequence (setting
+# `LC_CTYPE` to make sure that the arguments are interpreted as intended).
+#
+# Note: we need to use Bash here because its `printf` interprets `\uNNNN` as
+# UTF-8 code points, as desired. Running this script through Ubuntu's `dash`,
+# for example, would use a `printf` that does not understand that syntax.
+
+# U+202a..U+2a2e: LRE, RLE, PDF, LRO and RLO
+# U+2066..U+2069: LRI, RLI, FSI and PDI
+regex='(\u202a|\u202b|\u202c|\u202d|\u202e|\u2066|\u2067|\u2068|\u2069)'
+
+! LC_CTYPE=C git grep -El "$(LC_CTYPE=C.UTF-8 printf "$regex")" \
+	-- ':(exclude,attr:binary)' ':(exclude)*.po'
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 1d0e48f451..dbcebad2fb 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -11,18 +11,11 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
  tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl
  libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl"
 
-case "$jobname" in
-linux-clang|linux-gcc|linux-leaks)
-	sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
+case "$runs_on_pool" in
+ubuntu-latest)
 	sudo apt-get -q update
 	sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \
-		$UBUNTU_COMMON_PKGS
-	case "$jobname" in
-	linux-gcc)
-		sudo apt-get -q -y install gcc-8
-		;;
-	esac
-
+		$UBUNTU_COMMON_PKGS $CC_PACKAGE
 	mkdir --parents "$P4_PATH"
 	pushd "$P4_PATH"
 		wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
@@ -37,7 +30,7 @@ linux-clang|linux-gcc|linux-leaks)
 		cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
 	popd
 	;;
-osx-clang|osx-gcc)
+macos-latest)
 	export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
 	# Uncomment this if you want to run perf tests:
 	# brew install gnu-time
@@ -51,15 +44,17 @@ osx-clang|osx-gcc)
 		brew install --cask --no-quarantine perforce
 	} ||
 	brew install homebrew/cask/perforce
-	case "$jobname" in
-	osx-gcc)
-		brew install gcc@9
-		# Just in case the image is updated to contain gcc@9
-		# pre-installed but not linked.
-		brew link gcc@9
-		;;
-	esac
+
+	if test -n "$CC_PACKAGE"
+	then
+		BREW_PACKAGE=${CC_PACKAGE/-/@}
+		brew install "$BREW_PACKAGE"
+		brew link "$BREW_PACKAGE"
+	fi
 	;;
+esac
+
+case "$jobname" in
 StaticAnalysis)
 	sudo apt-get -q update
 	sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
@@ -77,7 +72,7 @@ Documentation)
 	test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
 	sudo gem install --version 1.5.8 asciidoctor
 	;;
-linux-gcc-default|linux-gcc-4.8)
+linux-gcc-default)
 	sudo apt-get -q update
 	sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
 	;;
diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh
index 07a8c6b199..78b7e326da 100755
--- a/ci/install-docker-dependencies.sh
+++ b/ci/install-docker-dependencies.sh
@@ -4,7 +4,7 @@
 #
 
 case "$jobname" in
-Linux32)
+linux32)
 	linux32 --32bit i386 sh -c '
 		apt update >/dev/null &&
 		apt install -y build-essential libcurl4-openssl-dev \
diff --git a/ci/lib.sh b/ci/lib.sh
index 82cb17f8ee..9d28ab50fb 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -34,7 +34,7 @@ save_good_tree () {
 # successfully before (e.g. because the branch got rebased, changing only
 # the commit messages).
 skip_good_tree () {
-	if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS"
+	if test true = "$GITHUB_ACTIONS"
 	then
 		return
 	fi
@@ -60,7 +60,7 @@ skip_good_tree () {
 			cat <<-EOF
 			$(tput setaf 2)Skipping build job for commit $CI_COMMIT.$(tput sgr0)
 			This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit.
-			The log of that build job is available at $(url_for_job_id $prev_good_job_id)
+			The log of that build job is available at $SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$prev_good_job_id
 			To force a re-build delete the branch's cache and then hit 'Restart job'.
 			EOF
 		fi
@@ -91,29 +91,7 @@ export MAKEFLAGS=
 # and installing dependencies.
 set -ex
 
-if test true = "$TRAVIS"
-then
-	CI_TYPE=travis
-	# When building a PR, TRAVIS_BRANCH refers to the *target* branch. Not
-	# what we want here. We want the source branch instead.
-	CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
-	CI_COMMIT="$TRAVIS_COMMIT"
-	CI_JOB_ID="$TRAVIS_JOB_ID"
-	CI_JOB_NUMBER="$TRAVIS_JOB_NUMBER"
-	CI_OS_NAME="$TRAVIS_OS_NAME"
-	CI_REPO_SLUG="$TRAVIS_REPO_SLUG"
-
-	cache_dir="$HOME/travis-cache"
-
-	url_for_job_id () {
-		echo "https://travis-ci.org/$CI_REPO_SLUG/jobs/$1"
-	}
-
-	BREW_INSTALL_PACKAGES="git-lfs gettext"
-	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
-	export GIT_TEST_OPTS="--verbose-log -x --immediate"
-	MAKEFLAGS="$MAKEFLAGS --jobs=2"
-elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
+if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
 then
 	CI_TYPE=azure-pipelines
 	# We are running in Azure Pipelines
@@ -130,10 +108,6 @@ then
 	# among *all* phases)
 	cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME"
 
-	url_for_job_id () {
-		echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
-	}
-
 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
 	MAKEFLAGS="$MAKEFLAGS --jobs=10"
@@ -182,11 +156,15 @@ export DEFAULT_TEST_TARGET=prove
 export GIT_TEST_CLONE_2GB=true
 export SKIP_DASHED_BUILT_INS=YesPlease
 
-case "$jobname" in
-linux-clang|linux-gcc|linux-leaks)
+case "$runs_on_pool" in
+ubuntu-latest)
+	if test "$jobname" = "linux-gcc-default"
+	then
+		break
+	fi
+
 	if [ "$jobname" = linux-gcc ]
 	then
-		export CC=gcc-8
 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3"
 	else
 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
@@ -206,24 +184,20 @@ linux-clang|linux-gcc|linux-leaks)
 	GIT_LFS_PATH="$HOME/custom/git-lfs"
 	export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
 	;;
-osx-clang|osx-gcc)
+macos-latest)
 	if [ "$jobname" = osx-gcc ]
 	then
-		export CC=gcc-9
 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
 	else
 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
 	fi
-
-	# t9810 occasionally fails on Travis CI OS X
-	# t9816 occasionally fails with "TAP out of sequence errors" on
-	# Travis CI OS X
-	export GIT_SKIP_TESTS="t9810 t9816"
-	;;
-linux-gcc-default)
 	;;
-Linux32)
+esac
+
+case "$jobname" in
+linux32)
 	CC=gcc
+	MAKEFLAGS="$MAKEFLAGS NO_UNCOMPRESS2=1"
 	;;
 linux-musl)
 	CC=gcc
@@ -231,9 +205,6 @@ linux-musl)
 	MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes"
 	MAKEFLAGS="$MAKEFLAGS GIT_TEST_UTF8_LOCALE=C.UTF-8"
 	;;
-esac
-
-case "$jobname" in
 linux-leaks)
 	export SANITIZE=leak
 	export GIT_TEST_PASSING_SANITIZE_LEAK=true
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index c70d6cdbf2..57277eefcd 100755
--- a/ci/print-test-failures.sh
+++ b/ci/print-test-failures.sh
@@ -39,8 +39,6 @@ do
 		test_name="${test_name##*/}"
 		trash_dir="trash directory.$test_name"
 		case "$CI_TYPE" in
-		travis)
-			;;
 		azure-pipelines)
 			mkdir -p failed-test-artifacts
 			mv "$trash_dir" failed-test-artifacts
@@ -88,11 +86,3 @@ do
 		fi
 	fi
 done
-
-if [ $combined_trash_size -gt 0 ]
-then
-	echo "------------------------------------------------------------------------"
-	echo "Trash directories embedded in this log can be extracted by running:"
-	echo
-	echo "  curl https://api.travis-ci.org/v3/job/$TRAVIS_JOB_ID/log.txt |./ci/util/extract-trash-dirs.sh"
-fi
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index cc62616d80..280dda7d28 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -10,16 +10,13 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
 *) ln -s "$cache_dir/.prove" t/.prove;;
 esac
 
-if test "$jobname" = "pedantic"
-then
-	export DEVOPTS=pedantic
-fi
+export MAKE_TARGETS="all test"
 
-make
 case "$jobname" in
 linux-gcc)
 	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-	make test
+	;;
+linux-TEST-vars)
 	export GIT_TEST_SPLIT_INDEX=yes
 	export GIT_TEST_MERGE_ALGORITHM=recursive
 	export GIT_TEST_FULL_IN_PACK_ARRAY=true
@@ -33,23 +30,25 @@ linux-gcc)
 	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
 	export GIT_TEST_WRITE_REV_INDEX=1
 	export GIT_TEST_CHECKOUT_WORKERS=2
-	make test
 	;;
 linux-clang)
 	export GIT_TEST_DEFAULT_HASH=sha1
-	make test
+	;;
+linux-sha256)
 	export GIT_TEST_DEFAULT_HASH=sha256
-	make test
 	;;
-linux-gcc-4.8|pedantic)
+pedantic)
 	# Don't run the tests; we only care about whether Git can be
-	# built with GCC 4.8 or with pedantic
-	;;
-*)
-	make test
+	# built.
+	export DEVOPTS=pedantic
+	export MAKE_TARGETS=all
 	;;
 esac
 
+# Any new "test" targets should not go after this "make", but should
+# adjust $MAKE_TARGETS. Otherwise compilation-only targets above will
+# start running tests.
+make $MAKE_TARGETS
 check_unignored_build_artifacts
 
 save_good_tree
diff --git a/ci/run-docker-build.sh b/ci/run-docker-build.sh
index 8d47a5fda3..6cd832efb9 100755
--- a/ci/run-docker-build.sh
+++ b/ci/run-docker-build.sh
@@ -15,7 +15,7 @@ then
 fi
 
 case "$jobname" in
-Linux32)
+linux32)
 	switch_cmd="linux32 --32bit i386"
 	;;
 linux-musl)
@@ -47,15 +47,6 @@ else
 	else
 		useradd -u $HOST_UID $CI_USER
 	fi
-
-	# Due to a bug the test suite was run as root in the past, so
-	# a prove state file created back then is only accessible by
-	# root.  Now that bug is fixed, the test suite is run as a
-	# regular user, but the prove state file coming from Travis
-	# CI's cache might still be owned by root.
-	# Make sure that this user has rights to any cached files,
-	# including an existing prove state file.
-	test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir"
 fi
 
 # Build and test
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 37fa372052..af89d1624a 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -6,7 +6,7 @@
 . ${0%/*}/lib.sh
 
 case "$jobname" in
-Linux32)
+linux32)
 	CI_CONTAINER="daald/ubuntu32:xenial"
 	;;
 linux-musl)
@@ -25,7 +25,7 @@ docker pull "$CI_CONTAINER"
 # root@container:/# export jobname=<jobname>
 # root@container:/# /usr/src/git/ci/run-docker-build.sh <host-user-id>
 
-container_cache_dir=/tmp/travis-cache
+container_cache_dir=/tmp/container-cache
 
 docker run \
 	--interactive \
diff --git a/color.c b/color.c
index 64f52a4f93..4f884c6b3d 100644
--- a/color.c
+++ b/color.c
@@ -40,7 +40,7 @@ struct color {
 	enum {
 		COLOR_UNSPECIFIED = 0,
 		COLOR_NORMAL,
-		COLOR_ANSI, /* basic 0-7 ANSI colors */
+		COLOR_ANSI, /* basic 0-7 ANSI colors + "default" (value = 9) */
 		COLOR_256,
 		COLOR_RGB
 	} type;
@@ -83,6 +83,27 @@ static int parse_ansi_color(struct color *out, const char *name, int len)
 	int i;
 	int color_offset = COLOR_FOREGROUND_ANSI;
 
+	if (match_word(name, len, "default")) {
+		/*
+		 * Restores to the terminal's default color, which may not be
+		 * the same as explicitly setting "white" or "black".
+		 *
+		 * ECMA-48 - Control Functions \
+		 *  for Coded Character Sets, 5th edition (June 1991):
+		 * > 39 default display colour (implementation-defined)
+		 * > 49 default background colour (implementation-defined)
+		 *
+		 * Although not supported /everywhere/--according to terminfo,
+		 * some terminals define "op" (original pair) as a blunt
+		 * "set to white on black", or even "send full SGR reset"--
+		 * it's standard and well-supported enough that if a user
+		 * asks for it in their config this will do the right thing.
+		 */
+		out->type = COLOR_ANSI;
+		out->value = 9 + color_offset;
+		return 0;
+	}
+
 	if (strncasecmp(name, "bright", 6) == 0) {
 		color_offset = COLOR_FOREGROUND_BRIGHT_ANSI;
 		name += 6;
@@ -234,6 +255,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 	const char *ptr = value;
 	int len = value_len;
 	char *end = dst + COLOR_MAXLEN;
+	unsigned int has_reset = 0;
 	unsigned int attr = 0;
 	struct color fg = { COLOR_UNSPECIFIED };
 	struct color bg = { COLOR_UNSPECIFIED };
@@ -248,12 +270,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 		return 0;
 	}
 
-	if (!strncasecmp(ptr, "reset", len)) {
-		xsnprintf(dst, end - dst, GIT_COLOR_RESET);
-		return 0;
-	}
-
-	/* [fg [bg]] [attr]... */
+	/* [reset] [fg [bg]] [attr]... */
 	while (len > 0) {
 		const char *word = ptr;
 		struct color c = { COLOR_UNSPECIFIED };
@@ -270,6 +287,11 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 			len--;
 		}
 
+		if (match_word(word, wordlen, "reset")) {
+			has_reset = 1;
+			continue;
+		}
+
 		if (!parse_color(&c, word, wordlen)) {
 			if (fg.type == COLOR_UNSPECIFIED) {
 				fg = c;
@@ -295,13 +317,16 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 	*dst++ = (x); \
 } while(0)
 
-	if (attr || !color_empty(&fg) || !color_empty(&bg)) {
+	if (has_reset || attr || !color_empty(&fg) || !color_empty(&bg)) {
 		int sep = 0;
 		int i;
 
 		OUT('\033');
 		OUT('[');
 
+		if (has_reset)
+			sep++;
+
 		for (i = 0; attr; i++) {
 			unsigned bit = (1 << i);
 			if (!(attr & bit))
diff --git a/color.h b/color.h
index 98894d6a17..cfc8f841b2 100644
--- a/color.h
+++ b/color.h
@@ -6,6 +6,7 @@ struct strbuf;
 /*
  * The maximum length of ANSI color sequence we would generate:
  * - leading ESC '['            2
+ * - reset ';' .................1
  * - attr + ';'                 2 * num_attr (e.g. "1;")
  * - no-attr + ';'              3 * num_attr (e.g. "22;")
  * - fg color + ';'             17 (e.g. "38;2;255;255;255;")
@@ -24,30 +25,42 @@ struct strbuf;
 #define GIT_COLOR_NORMAL	""
 #define GIT_COLOR_RESET		"\033[m"
 #define GIT_COLOR_BOLD		"\033[1m"
+#define GIT_COLOR_BLACK		"\033[30m"
 #define GIT_COLOR_RED		"\033[31m"
 #define GIT_COLOR_GREEN		"\033[32m"
 #define GIT_COLOR_YELLOW	"\033[33m"
 #define GIT_COLOR_BLUE		"\033[34m"
 #define GIT_COLOR_MAGENTA	"\033[35m"
 #define GIT_COLOR_CYAN		"\033[36m"
+#define GIT_COLOR_WHITE		"\033[37m"
+#define GIT_COLOR_DEFAULT	"\033[39m"
+#define GIT_COLOR_BOLD_BLACK	"\033[1;30m"
 #define GIT_COLOR_BOLD_RED	"\033[1;31m"
 #define GIT_COLOR_BOLD_GREEN	"\033[1;32m"
 #define GIT_COLOR_BOLD_YELLOW	"\033[1;33m"
 #define GIT_COLOR_BOLD_BLUE	"\033[1;34m"
 #define GIT_COLOR_BOLD_MAGENTA	"\033[1;35m"
 #define GIT_COLOR_BOLD_CYAN	"\033[1;36m"
+#define GIT_COLOR_BOLD_WHITE	"\033[1;37m"
+#define GIT_COLOR_BOLD_DEFAULT	"\033[1;39m"
+#define GIT_COLOR_FAINT_BLACK	"\033[2;30m"
 #define GIT_COLOR_FAINT_RED	"\033[2;31m"
 #define GIT_COLOR_FAINT_GREEN	"\033[2;32m"
 #define GIT_COLOR_FAINT_YELLOW	"\033[2;33m"
 #define GIT_COLOR_FAINT_BLUE	"\033[2;34m"
 #define GIT_COLOR_FAINT_MAGENTA	"\033[2;35m"
 #define GIT_COLOR_FAINT_CYAN	"\033[2;36m"
+#define GIT_COLOR_FAINT_WHITE	"\033[2;37m"
+#define GIT_COLOR_FAINT_DEFAULT	"\033[2;39m"
+#define GIT_COLOR_BG_BLACK	"\033[40m"
 #define GIT_COLOR_BG_RED	"\033[41m"
 #define GIT_COLOR_BG_GREEN	"\033[42m"
 #define GIT_COLOR_BG_YELLOW	"\033[43m"
 #define GIT_COLOR_BG_BLUE	"\033[44m"
 #define GIT_COLOR_BG_MAGENTA	"\033[45m"
 #define GIT_COLOR_BG_CYAN	"\033[46m"
+#define GIT_COLOR_BG_WHITE	"\033[47m"
+#define GIT_COLOR_BG_DEFAULT	"\033[49m"
 #define GIT_COLOR_FAINT		"\033[2m"
 #define GIT_COLOR_FAINT_ITALIC	"\033[2;3m"
 #define GIT_COLOR_REVERSE	"\033[7m"
diff --git a/command-list.txt b/command-list.txt
index eb9cee8dee..675c28f0bd 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -43,7 +43,7 @@
 # specified here, which can only have "guide" attribute and nothing
 # else.
 #
-### command list (do not change this line, also do not change alignment)
+### command list (do not change this line)
 # command name                          category [category] [category]
 git-add                                 mainporcelain           worktree
 git-am                                  mainporcelain
@@ -60,9 +60,9 @@ git-cat-file                            plumbinginterrogators
 git-check-attr                          purehelpers
 git-check-ignore                        purehelpers
 git-check-mailmap                       purehelpers
+git-check-ref-format                    purehelpers
 git-checkout                            mainporcelain
 git-checkout-index                      plumbingmanipulators
-git-check-ref-format                    purehelpers
 git-cherry                              plumbinginterrogators          complete
 git-cherry-pick                         mainporcelain
 git-citool                              mainporcelain
@@ -111,7 +111,6 @@ git-index-pack                          plumbingmanipulators
 git-init                                mainporcelain           init
 git-instaweb                            ancillaryinterrogators          complete
 git-interpret-trailers                  purehelpers
-gitk                                    mainporcelain
 git-log                                 mainporcelain           info
 git-ls-files                            plumbinginterrogators
 git-ls-remote                           plumbinginterrogators
@@ -124,11 +123,11 @@ git-merge-base                          plumbinginterrogators
 git-merge-file                          plumbingmanipulators
 git-merge-index                         plumbingmanipulators
 git-merge-one-file                      purehelpers
-git-mergetool                           ancillarymanipulators           complete
 git-merge-tree                          ancillaryinterrogators
-git-multi-pack-index                    plumbingmanipulators
+git-mergetool                           ancillarymanipulators           complete
 git-mktag                               plumbingmanipulators
 git-mktree                              plumbingmanipulators
+git-multi-pack-index                    plumbingmanipulators
 git-mv                                  mainporcelain           worktree
 git-name-rev                            plumbinginterrogators
 git-notes                               mainporcelain
@@ -154,23 +153,23 @@ git-request-pull                        foreignscminterface             complete
 git-rerere                              ancillaryinterrogators
 git-reset                               mainporcelain           history
 git-restore                             mainporcelain           worktree
-git-revert                              mainporcelain
 git-rev-list                            plumbinginterrogators
 git-rev-parse                           plumbinginterrogators
+git-revert                              mainporcelain
 git-rm                                  mainporcelain           worktree
 git-send-email                          foreignscminterface             complete
 git-send-pack                           synchingrepositories
+git-sh-i18n                             purehelpers
+git-sh-setup                            purehelpers
 git-shell                               synchelpers
 git-shortlog                            mainporcelain
 git-show                                mainporcelain           info
 git-show-branch                         ancillaryinterrogators          complete
 git-show-index                          plumbinginterrogators
 git-show-ref                            plumbinginterrogators
-git-sh-i18n                             purehelpers
-git-sh-setup                            purehelpers
 git-sparse-checkout                     mainporcelain
-git-stash                               mainporcelain
 git-stage                                                               complete
+git-stash                               mainporcelain
 git-status                              mainporcelain           info
 git-stripspace                          purehelpers
 git-submodule                           mainporcelain
@@ -189,7 +188,6 @@ git-var                                 plumbinginterrogators
 git-verify-commit                       ancillaryinterrogators
 git-verify-pack                         plumbinginterrogators
 git-verify-tag                          ancillaryinterrogators
-gitweb                                  ancillaryinterrogators
 git-whatchanged                         ancillaryinterrogators          complete
 git-worktree                            mainporcelain
 git-write-tree                          plumbingmanipulators
@@ -204,6 +202,7 @@ gitfaq                                  guide
 gitglossary                             guide
 githooks                                guide
 gitignore                               guide
+gitk                                    mainporcelain
 gitmailmap                              guide
 gitmodules                              guide
 gitnamespaces                           guide
@@ -211,6 +210,7 @@ gitremote-helpers                       guide
 gitrepository-layout                    guide
 gitrevisions                            guide
 gitsubmodules                           guide
-gittutorial-2                           guide
 gittutorial                             guide
+gittutorial-2                           guide
+gitweb                                  ancillaryinterrogators
 gitworkflows                            guide
diff --git a/commit-graph.c b/commit-graph.c
index 2706683acf..265c010122 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -632,10 +632,13 @@ static int prepare_commit_graph(struct repository *r)
 	struct object_directory *odb;
 
 	/*
+	 * Early return if there is no git dir or if the commit graph is
+	 * disabled.
+	 *
 	 * This must come before the "already attempted?" check below, because
 	 * we want to disable even an already-loaded graph file.
 	 */
-	if (r->commit_graph_disabled)
+	if (!r->gitdir || r->commit_graph_disabled)
 		return 0;
 
 	if (r->objects->commit_graph_attempted)
diff --git a/commit.c b/commit.c
index 551de4903c..a348f085b2 100644
--- a/commit.c
+++ b/commit.c
@@ -1212,8 +1212,10 @@ int check_commit_signature(const struct commit *commit, struct signature_check *
 
 	if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
 		goto out;
-	ret = check_signature(payload.buf, payload.len, signature.buf,
-		signature.len, sigc);
+
+	sigc->payload_type = SIGNATURE_PAYLOAD_COMMIT;
+	sigc->payload = strbuf_detach(&payload, &sigc->payload_len);
+	ret = check_signature(sigc, signature.buf, signature.len);
 
  out:
 	strbuf_release(&payload);
diff --git a/common-main.c b/common-main.c
index 71e21dd20a..29fb7452f8 100644
--- a/common-main.c
+++ b/common-main.c
@@ -26,6 +26,7 @@ static void restore_sigpipe_to_default(void)
 int main(int argc, const char **argv)
 {
 	int result;
+	struct strbuf tmp = STRBUF_INIT;
 
 	trace2_initialize_clock();
 
@@ -49,9 +50,15 @@ int main(int argc, const char **argv)
 	trace2_cmd_start(argv);
 	trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
 
-	result = cmd_main(argc, argv);
+	if (!strbuf_getcwd(&tmp))
+		tmp_original_cwd = strbuf_detach(&tmp, NULL);
 
-	trace2_cmd_exit(result);
+	result = cmd_main(argc, argv);
 
-	return result;
+	/*
+	 * We define exit() to call trace2_cmd_exit_fl() in
+	 * git-compat-util.h. Whether we reach this or exit()
+	 * elsewhere we'll always run our trace2 exit handler.
+	 */
+	exit(result);
 }
diff --git a/compat/.gitattributes b/compat/.gitattributes
new file mode 100644
index 0000000000..40dbfb170d
--- /dev/null
+++ b/compat/.gitattributes
@@ -0,0 +1 @@
+/zlib-uncompress2.c	whitespace=-indent-with-non-tab,-trailing-space
diff --git a/compat/mingw.c b/compat/mingw.c
index 5e42191fa4..41fc16310c 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -9,6 +9,8 @@
 #include "win32/lazyload.h"
 #include "../config.h"
 #include "dir.h"
+#define SECURITY_WIN32
+#include <sspi.h>
 
 #define HCAST(type, handle) ((type)(intptr_t)handle)
 
@@ -1009,7 +1011,7 @@ size_t mingw_strftime(char *s, size_t max,
 	/* a pointer to the original strftime in case we can't find the UCRT version */
 	static size_t (*fallback)(char *, size_t, const char *, const struct tm *) = strftime;
 	size_t ret;
-	DECLARE_PROC_ADDR(ucrtbase.dll, size_t, strftime, char *, size_t,
+	DECLARE_PROC_ADDR(ucrtbase.dll, size_t, __cdecl, strftime, char *, size_t,
 		const char *, const struct tm *);
 
 	if (INIT_PROC_ADDR(strftime))
@@ -1126,6 +1128,10 @@ char *mingw_getcwd(char *pointer, int len)
 	}
 	if (!ret || ret >= ARRAY_SIZE(wpointer))
 		return NULL;
+	if (GetFileAttributesW(wpointer) == INVALID_FILE_ATTRIBUTES) {
+		errno = ENOENT;
+		return NULL;
+	}
 	if (xwcstoutf(pointer, wpointer, len) < 0)
 		return NULL;
 	convert_slashes(pointer);
@@ -2186,7 +2192,7 @@ enum EXTENDED_NAME_FORMAT {
 
 static char *get_extended_user_info(enum EXTENDED_NAME_FORMAT type)
 {
-	DECLARE_PROC_ADDR(secur32.dll, BOOL, GetUserNameExW,
+	DECLARE_PROC_ADDR(secur32.dll, BOOL, SEC_ENTRY, GetUserNameExW,
 		enum EXTENDED_NAME_FORMAT, LPCWSTR, PULONG);
 	static wchar_t wbuffer[1024];
 	DWORD len;
diff --git a/compat/unsetenv.c b/compat/unsetenv.c
index bf5fd7063b..b9d34af613 100644
--- a/compat/unsetenv.c
+++ b/compat/unsetenv.c
@@ -1,6 +1,6 @@
 #include "../git-compat-util.h"
 
-void gitunsetenv (const char *name)
+int gitunsetenv(const char *name)
 {
 #if !defined(__MINGW32__)
      extern char **environ;
@@ -24,4 +24,6 @@ void gitunsetenv (const char *name)
 	  ++dst;
      }
      environ[dst] = NULL;
+
+     return 0;
 }
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
index 2b3637135f..f2bb96c89c 100644
--- a/compat/win32/lazyload.h
+++ b/compat/win32/lazyload.h
@@ -4,7 +4,7 @@
 /*
  * A pair of macros to simplify loading of DLL functions. Example:
  *
- *   DECLARE_PROC_ADDR(kernel32.dll, BOOL, CreateHardLinkW,
+ *   DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI, CreateHardLinkW,
  *                     LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
  *
  *   if (!INIT_PROC_ADDR(CreateHardLinkW))
@@ -25,10 +25,10 @@ struct proc_addr {
 };
 
 /* Declares a function to be loaded dynamically from a DLL. */
-#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \
+#define DECLARE_PROC_ADDR(dll, rettype, convention, function, ...) \
 	static struct proc_addr proc_addr_##function = \
 	{ #dll, #function, NULL, 0 }; \
-	typedef rettype (WINAPI *proc_type_##function)(__VA_ARGS__); \
+	typedef rettype (convention *proc_type_##function)(__VA_ARGS__); \
 	static proc_type_##function function
 
 /*
diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c
index 8ccbd1c2c6..a53fd92434 100644
--- a/compat/win32/trace2_win32_process_info.c
+++ b/compat/win32/trace2_win32_process_info.c
@@ -143,8 +143,8 @@ static void get_is_being_debugged(void)
  */
 static void get_peak_memory_info(void)
 {
-	DECLARE_PROC_ADDR(psapi.dll, BOOL, GetProcessMemoryInfo, HANDLE,
-			  PPROCESS_MEMORY_COUNTERS, DWORD);
+	DECLARE_PROC_ADDR(psapi.dll, BOOL, WINAPI, GetProcessMemoryInfo,
+			  HANDLE, PPROCESS_MEMORY_COUNTERS, DWORD);
 
 	if (INIT_PROC_ADDR(GetProcessMemoryInfo)) {
 		PROCESS_MEMORY_COUNTERS pmc;
diff --git a/compat/winansi.c b/compat/winansi.c
index c27b20a79d..4fceecf14c 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -45,8 +45,9 @@ typedef struct _CONSOLE_FONT_INFOEX {
 static void warn_if_raster_font(void)
 {
 	DWORD fontFamily = 0;
-	DECLARE_PROC_ADDR(kernel32.dll, BOOL, GetCurrentConsoleFontEx,
-			HANDLE, BOOL, PCONSOLE_FONT_INFOEX);
+	DECLARE_PROC_ADDR(kernel32.dll, BOOL, WINAPI,
+			GetCurrentConsoleFontEx, HANDLE, BOOL,
+			PCONSOLE_FONT_INFOEX);
 
 	/* don't bother if output was ascii only */
 	if (!non_ascii_used)
diff --git a/compat/zlib-uncompress2.c b/compat/zlib-uncompress2.c
new file mode 100644
index 0000000000..722610b971
--- /dev/null
+++ b/compat/zlib-uncompress2.c
@@ -0,0 +1,95 @@
+/* taken from zlib's uncompr.c
+
+   commit cacf7f1d4e3d44d871b605da3b647f07d718623f
+   Author: Mark Adler <madler@alumni.caltech.edu>
+   Date:   Sun Jan 15 09:18:46 2017 -0800
+
+       zlib 1.2.11
+
+*/
+
+#include "../reftable/system.h"
+#define z_const
+
+/*
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include <zlib.h>
+
+/* clang-format off */
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  *sourceLen is
+   the byte length of the source buffer. Upon entry, *destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data. (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit,
+   *destLen is the size of the decompressed data and *sourceLen is the number
+   of source bytes consumed. Upon return, source + *sourceLen points to the
+   first unused input byte.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
+   Z_DATA_ERROR if the input data was corrupted, including if the input data is
+   an incomplete zlib stream.
+*/
+int ZEXPORT uncompress2 (
+    Bytef *dest,
+    uLongf *destLen,
+    const Bytef *source,
+    uLong *sourceLen) {
+    z_stream stream;
+    int err;
+    const uInt max = (uInt)-1;
+    uLong len, left;
+    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
+
+    len = *sourceLen;
+    if (*destLen) {
+	left = *destLen;
+	*destLen = 0;
+    }
+    else {
+	left = 1;
+	dest = buf;
+    }
+
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    stream.next_out = dest;
+    stream.avail_out = 0;
+
+    do {
+	if (stream.avail_out == 0) {
+	    stream.avail_out = left > (uLong)max ? max : (uInt)left;
+	    left -= stream.avail_out;
+	}
+	if (stream.avail_in == 0) {
+	    stream.avail_in = len > (uLong)max ? max : (uInt)len;
+	    len -= stream.avail_in;
+	}
+	err = inflate(&stream, Z_NO_FLUSH);
+    } while (err == Z_OK);
+
+    *sourceLen -= len + stream.avail_in;
+    if (dest != buf)
+	*destLen = stream.total_out;
+    else if (stream.total_out && err == Z_BUF_ERROR)
+	left = 1;
+
+    inflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK :
+	   err == Z_NEED_DICT ? Z_DATA_ERROR  :
+	   err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
+	   err;
+}
diff --git a/config.c b/config.c
index c5873f3a70..2bffa8d4a0 100644
--- a/config.c
+++ b/config.c
@@ -1559,9 +1559,12 @@ static int git_default_i18n_config(const char *var, const char *value)
 static int git_default_branch_config(const char *var, const char *value)
 {
 	if (!strcmp(var, "branch.autosetupmerge")) {
-		if (value && !strcasecmp(value, "always")) {
+		if (value && !strcmp(value, "always")) {
 			git_branch_track = BRANCH_TRACK_ALWAYS;
 			return 0;
+		} else if (value && !strcmp(value, "inherit")) {
+			git_branch_track = BRANCH_TRACK_INHERIT;
+			return 0;
 		}
 		git_branch_track = git_config_bool(var, value);
 		return 0;
@@ -2555,11 +2558,12 @@ void git_die_config(const char *key, const char *err, ...)
 {
 	const struct string_list *values;
 	struct key_value_info *kv_info;
+	report_fn error_fn = get_error_routine();
 
 	if (err) {
 		va_list params;
 		va_start(params, err);
-		vreportf("error: ", err, params);
+		error_fn(err, params);
 		va_end(params);
 	}
 	values = git_config_get_value_multi(key);
diff --git a/config.mak.dev b/config.mak.dev
index 7673fed114..3deb076d5e 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -19,6 +19,16 @@ endif
 endif
 endif
 endif
+
+ifneq ($(uname_S),FreeBSD)
+ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),)
+DEVELOPER_CFLAGS += -std=gnu99
+endif
+else
+# FreeBSD cannot limit to C99 because its system headers unconditionally
+# rely on C11 features.
+endif
+
 DEVELOPER_CFLAGS += -Wdeclaration-after-statement
 DEVELOPER_CFLAGS += -Wformat-security
 DEVELOPER_CFLAGS += -Wold-style-definition
diff --git a/config.mak.uname b/config.mak.uname
index 3236a4918a..c48db45106 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -58,12 +58,16 @@ ifeq ($(uname_S),Linux)
 	# -lrt is needed for clock_gettime on glibc <= 2.16
 	NEEDS_LIBRT = YesPlease
 	HAVE_GETDELIM = YesPlease
-	SANE_TEXT_GREP=-a
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 	BASIC_CFLAGS += -DHAVE_SYSINFO
 	PROCFS_EXECUTABLE_PATH = /proc/self/exe
 	HAVE_PLATFORM_PROCINFO = YesPlease
 	COMPAT_OBJS += compat/linux/procinfo.o
+	# centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
+	ifneq ($(findstring .el7.,$(uname_R)),)
+		BASIC_CFLAGS += -std=c99
+		NO_UNCOMPRESS2 = YesPlease
+	endif
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
 	HAVE_ALLOCA_H = YesPlease
@@ -262,6 +266,10 @@ ifeq ($(uname_S),FreeBSD)
 	FILENO_IS_A_MACRO = UnfortunatelyYes
 endif
 ifeq ($(uname_S),OpenBSD)
+	# Versions < 7.0 need compatibility layer
+	ifeq ($(shell expr "$(uname_R)" : "[1-6]\."),2)
+		NO_UNCOMPRESS2 = UnfortunatelyYes
+	endif
 	NO_STRCASESTR = YesPlease
 	NO_MEMMEM = YesPlease
 	USE_ST_TIMESPEC = YesPlease
@@ -517,6 +525,7 @@ ifeq ($(uname_S),Interix)
 	endif
 endif
 ifeq ($(uname_S),Minix)
+	NO_UNCOMPRESS2 = YesPlease
 	NO_IPV6 = YesPlease
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 	NO_NSEC = YesPlease
@@ -572,6 +581,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
 	NO_SETENV = YesPlease
 	NO_UNSETENV = YesPlease
 	NO_MKDTEMP = YesPlease
+	NO_UNCOMPRESS2 = YesPlease
 	# Currently libiconv-1.9.1.
 	OLD_ICONV = UnfortunatelyYes
 	NO_REGEX = NeedsStartEnd
diff --git a/configure.ac b/configure.ac
index 031e8d3fee..d60d494ee4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,14 +507,6 @@ if test -n "$ASCIIDOC"; then
 	esac
 fi
 
-if grep -a ascii configure.ac >/dev/null; then
-  AC_MSG_RESULT([Using 'grep -a' for sane_grep])
-  SANE_TEXT_GREP=-a
-else
-  SANE_TEXT_GREP=
-fi
-GIT_CONF_SUBST([SANE_TEXT_GREP])
-
 ## Checks for libraries.
 AC_MSG_NOTICE([CHECKS for libraries])
 #
@@ -672,9 +664,22 @@ AC_LINK_IFELSE([ZLIBTEST_SRC],
 	NO_DEFLATE_BOUND=yes])
 LIBS="$old_LIBS"
 
+AC_DEFUN([ZLIBTEST_UNCOMPRESS2_SRC], [
+AC_LANG_PROGRAM([#include <zlib.h>],
+ [uncompress2(NULL,NULL,NULL,NULL);])])
+AC_MSG_CHECKING([for uncompress2 in -lz])
+old_LIBS="$LIBS"
+LIBS="$LIBS -lz"
+AC_LINK_IFELSE([ZLIBTEST_UNCOMPRESS2_SRC],
+	[AC_MSG_RESULT([yes])],
+	[AC_MSG_RESULT([no])
+	NO_UNCOMPRESS2=yes])
+LIBS="$old_LIBS"
+
 GIT_UNSTASH_FLAGS($ZLIB_PATH)
 
 GIT_CONF_SUBST([NO_DEFLATE_BOUND])
+GIT_CONF_SUBST([NO_UNCOMPRESS2])
 
 #
 # Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
diff --git a/connected.c b/connected.c
index 35bd4a2638..ed3025e7a2 100644
--- a/connected.c
+++ b/connected.c
@@ -109,7 +109,8 @@ no_promisor_pack_found:
 			     _("Checking connectivity"));
 
 	rev_list.git_cmd = 1;
-	rev_list.env = opt->env;
+	if (opt->env)
+		strvec_pushv(&rev_list.env_array, opt->env);
 	rev_list.in = -1;
 	rev_list.no_stdout = 1;
 	if (opt->err_fd)
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index fd1399c440..5100f56bb3 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -208,7 +208,7 @@ endif()
 if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
-	add_compile_options(/MP)
+	add_compile_options(/MP /std:c11)
 endif()
 
 #default behaviour
@@ -647,6 +647,12 @@ parse_makefile_for_sources(libxdiff_SOURCES "XDIFF_OBJS")
 list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
 add_library(xdiff STATIC ${libxdiff_SOURCES})
 
+#reftable
+parse_makefile_for_sources(reftable_SOURCES "REFTABLE_OBJS")
+
+list(TRANSFORM reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+add_library(reftable STATIC ${reftable_SOURCES})
+
 if(WIN32)
 	if(NOT MSVC)#use windres when compiling with gcc and clang
 		add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res
@@ -669,7 +675,7 @@ endif()
 #link all required libraries to common-main
 add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c)
 
-target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES})
+target_link_libraries(common-main libgit xdiff reftable ${ZLIB_LIBRARIES})
 if(Intl_FOUND)
 	target_link_libraries(common-main ${Intl_LIBRARIES})
 endif()
@@ -781,7 +787,6 @@ foreach(script ${git_shell_scripts})
 	string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}")
 	string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}")
 	string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}")
-	string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}")
 	string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
 endforeach()
@@ -909,11 +914,15 @@ if(BUILD_TESTING)
 add_executable(test-fake-ssh ${CMAKE_SOURCE_DIR}/t/helper/test-fake-ssh.c)
 target_link_libraries(test-fake-ssh common-main)
 
+#reftable-tests
+parse_makefile_for_sources(test-reftable_SOURCES "REFTABLE_TEST_OBJS")
+list(TRANSFORM test-reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+
 #test-tool
 parse_makefile_for_sources(test-tool_SOURCES "TEST_BUILTINS_OBJS")
 
 list(TRANSFORM test-tool_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/t/helper/")
-add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES})
+add_executable(test-tool ${CMAKE_SOURCE_DIR}/t/helper/test-tool.c ${test-tool_SOURCES} ${test-reftable_SOURCES})
 target_link_libraries(test-tool common-main)
 
 set_target_properties(test-fake-ssh test-tool
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index d2584450ba..1a25789d28 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -77,7 +77,7 @@ sub createProject {
     my $libs_release = "\n    ";
     my $libs_debug = "\n    ";
     if (!$static_library) {
-      $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
+      $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib|reftable\/libreftable\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
       $libs_debug = $libs_release;
       $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
       $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
@@ -232,6 +232,7 @@ EOM
 EOM
     if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') {
       my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"};
+      my $uuid_libreftable = $$build_structure{"LIBS_reftable/libreftable_GUID"};
       my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"};
 
       print F << "EOM";
@@ -241,6 +242,14 @@ EOM
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
 EOM
+      if (!($name =~ /xdiff|libreftable/)) {
+        print F << "EOM";
+    <ProjectReference Include="$cdup\\reftable\\libreftable\\libreftable.vcxproj">
+      <Project>$uuid_libreftable</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+EOM
+      }
       if (!($name =~ 'xdiff')) {
         print F << "EOM";
     <ProjectReference Include="$cdup\\xdiff\\lib\\xdiff_lib.vcxproj">
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7c3a75373a..377d6c5494 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1566,7 +1566,7 @@ _git_checkout ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin checkout
@@ -2001,7 +2001,7 @@ __git_log_shortlog_options="
 "
 
 __git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
-__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:"
 
 _git_log ()
 {
@@ -2359,16 +2359,7 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
-			--compose --confirm= --dry-run --envelope-sender
-			--from --identity
-			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet --reply-to
-			--signed-off-by-cc --smtp-pass --smtp-server
-			--smtp-server-port --smtp-encryption= --smtp-user
-			--subject --suppress-cc= --suppress-from --thread --to
-			--validate --no-validate
-			$__git_format_patch_extra_options"
+		__gitcomp_builtin send-email "$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2446,7 +2437,7 @@ _git_switch ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin switch
@@ -2886,7 +2877,7 @@ _git_restore ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--source=*)
 		__git_complete_refs --cur="${cur##--source=}"
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
index 2f618a7f97..8bcace29d2 100644
--- a/contrib/git-jump/README
+++ b/contrib/git-jump/README
@@ -65,6 +65,9 @@ git jump diff --cached
 # jump to merge conflicts
 git jump merge
 
+# documentation conflicts are hard; skip past them for now
+git jump merge :^Documentation
+
 # jump to all instances of foo_bar
 git jump grep foo_bar
 
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index 931b0fe3a9..92dbd4cde1 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -39,7 +39,7 @@ mode_diff() {
 }
 
 mode_merge() {
-	git ls-files -u |
+	git ls-files -u "$@" |
 	perl -pe 's/^.*?\t//' |
 	sort -u |
 	while IFS= read fn; do
diff --git a/contrib/mw-to-git/t/t9365-continuing-queries.sh b/contrib/mw-to-git/t/t9365-continuing-queries.sh
index 016454749f..d3e7312659 100755
--- a/contrib/mw-to-git/t/t9365-continuing-queries.sh
+++ b/contrib/mw-to-git/t/t9365-continuing-queries.sh
@@ -12,7 +12,7 @@ test_expect_success 'creating page w/ >500 revisions' '
 	for i in $(test_seq 501)
 	do
 		echo "creating revision $i" &&
-		wiki_editpage foo "revision $i<br/>" true
+		wiki_editpage foo "revision $i<br/>" true || return 1
 	done
 '
 
diff --git a/contrib/scalar/.gitignore b/contrib/scalar/.gitignore
new file mode 100644
index 0000000000..ff3d47e84d
--- /dev/null
+++ b/contrib/scalar/.gitignore
@@ -0,0 +1,2 @@
+/*.exe
+/scalar
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile
new file mode 100644
index 0000000000..231b1ee179
--- /dev/null
+++ b/contrib/scalar/Makefile
@@ -0,0 +1,45 @@
+QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1  =
+
+ifneq ($(findstring s,$(MAKEFLAGS)),s)
+ifndef V
+	QUIET_GEN      = @echo '   ' GEN $@;
+	QUIET_SUBDIR0  = +@subdir=
+	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+			 $(MAKE) $(PRINT_DIR) -C $$subdir
+else
+	export V
+endif
+endif
+
+all:
+
+include ../../config.mak.uname
+-include ../../config.mak.autogen
+-include ../../config.mak
+
+TARGETS = scalar$(X) scalar.o
+GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a
+
+all: scalar$(X) ../../bin-wrappers/scalar
+
+$(GITLIBS):
+	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@)
+
+$(TARGETS): $(GITLIBS) scalar.c
+	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(patsubst %,contrib/scalar/%,$@)
+
+clean:
+	$(RM) $(TARGETS) ../../bin-wrappers/scalar
+
+../../bin-wrappers/scalar: ../../wrap-for-bin.sh Makefile
+	@mkdir -p ../../bin-wrappers
+	$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+	     -e 's|@@BUILD_DIR@@|$(shell cd ../.. && pwd)|' \
+	     -e 's|@@PROG@@|contrib/scalar/scalar$(X)|' < $< > $@ && \
+	chmod +x $@
+
+test: all
+	$(MAKE) -C t
+
+.PHONY: $(GITLIBS) all clean test FORCE
diff --git a/contrib/scalar/README.md b/contrib/scalar/README.md
new file mode 100644
index 0000000000..634b5771ed
--- /dev/null
+++ b/contrib/scalar/README.md
@@ -0,0 +1,82 @@
+# Scalar - an opinionated repository management tool
+
+Scalar is an add-on to Git that helps users take advantage of advanced
+performance features in Git. Originally implemented in C# using .NET Core,
+based on the learnings from the VFS for Git project, most of the techniques
+developed by the Scalar project have been integrated into core Git already:
+
+* partial clone,
+* commit graphs,
+* multi-pack index,
+* sparse checkout (cone mode),
+* scheduled background maintenance,
+* etc
+
+This directory contains the remaining parts of Scalar that are not (yet) in
+core Git.
+
+## Roadmap
+
+The idea is to populate this directory via incremental patch series and
+eventually move to a top-level directory next to `gitk-git/` and to `git-gui/`. The
+current plan involves the following patch series:
+
+- `scalar-the-beginning`: The initial patch series which sets up
+  `contrib/scalar/` and populates it with a minimal `scalar` command that
+  demonstrates the fundamental ideas.
+
+- `scalar-c-and-C`: The `scalar` command learns about two options that can be
+  specified before the command, `-c <key>=<value>` and `-C <directory>`.
+
+- `scalar-diagnose`: The `scalar` command is taught the `diagnose` subcommand.
+
+- `scalar-and-builtin-fsmonitor`: The built-in FSMonitor is enabled in `scalar
+  register` and in `scalar clone`, for an enormous performance boost when
+  working in large worktrees. This patch series necessarily depends on Jeff
+  Hostetler's FSMonitor patch series to be integrated into Git.
+
+- `scalar-gentler-config-locking`: Scalar enlistments are registered in the
+  user's Git config. This usually does not represent any problem because it is
+  rare for a user to register an enlistment. However, in Scalar's functional
+  tests, Scalar enlistments are created galore, and in parallel, which can lead
+  to lock contention. This patch series works around that problem by re-trying
+  to lock the config file in a gentle fashion.
+
+- `scalar-extra-docs`: Add some extensive documentation that has been written
+  in the original Scalar project (all subject to discussion, of course).
+
+- `optionally-install-scalar`: Now that Scalar is feature (and documentation)
+  complete and is verified in CI builds, let's offer to install it.
+
+- `move-scalar-to-toplevel`: Now that Scalar is complete, let's move it next to
+  `gitk-git/` and to `git-gui/`, making it a top-level command.
+
+The following two patch series exist in Microsoft's fork of Git and are
+publicly available. There is no current plan to upstream them, not because I
+want to withhold these patches, but because I don't think the Git community is
+interested in these patches.
+
+There are some interesting ideas there, but the implementation is too specific
+to Azure Repos and/or VFS for Git to be of much help in general (and also: my
+colleagues tried to upstream some patches already and the enthusiasm for
+integrating things related to Azure Repos and VFS for Git can be summarized in
+very, very few words).
+
+These still exist mainly because the GVFS protocol is what Azure Repos has
+instead of partial clone, while Git is focused on improving partial clone:
+
+- `scalar-with-gvfs`: The primary purpose of this patch series is to support
+  existing Scalar users whose repositories are hosted in Azure Repos (which
+  does not support Git's partial clones, but supports its predecessor, the GVFS
+  protocol, which is used by Scalar to emulate the partial clone).
+
+  Since the GVFS protocol will never be supported by core Git, this patch
+  series will remain in Microsoft's fork of Git.
+
+- `run-scalar-functional-tests`: The Scalar project developed a quite
+  comprehensive set of integration tests (or, "Functional Tests"). They are the
+  sole remaining part of the original C#-based Scalar project, and this patch
+  adds a GitHub workflow that runs them all.
+
+  Since the tests partially depend on features that are only provided in the
+  `scalar-with-gvfs` patch series, this patch cannot be upstreamed.
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c
new file mode 100644
index 0000000000..1ce9c2b00e
--- /dev/null
+++ b/contrib/scalar/scalar.c
@@ -0,0 +1,826 @@
+/*
+ * The Scalar command-line interface.
+ */
+
+#include "cache.h"
+#include "gettext.h"
+#include "parse-options.h"
+#include "config.h"
+#include "run-command.h"
+#include "refs.h"
+#include "dir.h"
+#include "packfile.h"
+#include "help.h"
+
+/*
+ * Remove the deepest subdirectory in the provided path string. Path must not
+ * include a trailing path separator. Returns 1 if parent directory found,
+ * otherwise 0.
+ */
+static int strbuf_parent_directory(struct strbuf *buf)
+{
+	size_t len = buf->len;
+	size_t offset = offset_1st_component(buf->buf);
+	char *path_sep = find_last_dir_sep(buf->buf + offset);
+	strbuf_setlen(buf, path_sep ? path_sep - buf->buf : offset);
+
+	return buf->len < len;
+}
+
+static void setup_enlistment_directory(int argc, const char **argv,
+				       const char * const *usagestr,
+				       const struct option *options,
+				       struct strbuf *enlistment_root)
+{
+	struct strbuf path = STRBUF_INIT;
+	char *root;
+	int enlistment_found = 0;
+
+	if (startup_info->have_repository)
+		BUG("gitdir already set up?!?");
+
+	if (argc > 1)
+		usage_with_options(usagestr, options);
+
+	/* find the worktree, determine its corresponding root */
+	if (argc == 1)
+		strbuf_add_absolute_path(&path, argv[0]);
+	else if (strbuf_getcwd(&path) < 0)
+		die(_("need a working directory"));
+
+	strbuf_trim_trailing_dir_sep(&path);
+	do {
+		const size_t len = path.len;
+
+		/* check if currently in enlistment root with src/ workdir */
+		strbuf_addstr(&path, "/src");
+		if (is_nonbare_repository_dir(&path)) {
+			if (enlistment_root)
+				strbuf_add(enlistment_root, path.buf, len);
+
+			enlistment_found = 1;
+			break;
+		}
+
+		/* reset to original path */
+		strbuf_setlen(&path, len);
+
+		/* check if currently in workdir */
+		if (is_nonbare_repository_dir(&path)) {
+			if (enlistment_root) {
+				/*
+				 * If the worktree's directory's name is `src`, the enlistment is the
+				 * parent directory, otherwise it is identical to the worktree.
+				 */
+				root = strip_path_suffix(path.buf, "src");
+				strbuf_addstr(enlistment_root, root ? root : path.buf);
+				free(root);
+			}
+
+			enlistment_found = 1;
+			break;
+		}
+	} while (strbuf_parent_directory(&path));
+
+	if (!enlistment_found)
+		die(_("could not find enlistment root"));
+
+	if (chdir(path.buf) < 0)
+		die_errno(_("could not switch to '%s'"), path.buf);
+
+	strbuf_release(&path);
+	setup_git_directory();
+}
+
+static int run_git(const char *arg, ...)
+{
+	struct strvec argv = STRVEC_INIT;
+	va_list args;
+	const char *p;
+	int res;
+
+	va_start(args, arg);
+	strvec_push(&argv, arg);
+	while ((p = va_arg(args, const char *)))
+		strvec_push(&argv, p);
+	va_end(args);
+
+	res = run_command_v_opt(argv.v, RUN_GIT_CMD);
+
+	strvec_clear(&argv);
+	return res;
+}
+
+static int set_recommended_config(int reconfigure)
+{
+	struct {
+		const char *key;
+		const char *value;
+		int overwrite_on_reconfigure;
+	} config[] = {
+		/* Required */
+		{ "am.keepCR", "true", 1 },
+		{ "core.FSCache", "true", 1 },
+		{ "core.multiPackIndex", "true", 1 },
+		{ "core.preloadIndex", "true", 1 },
+#ifndef WIN32
+		{ "core.untrackedCache", "true", 1 },
+#else
+		/*
+		 * Unfortunately, Scalar's Functional Tests demonstrated
+		 * that the untracked cache feature is unreliable on Windows
+		 * (which is a bummer because that platform would benefit the
+		 * most from it). For some reason, freshly created files seem
+		 * not to update the directory's `lastModified` time
+		 * immediately, but the untracked cache would need to rely on
+		 * that.
+		 *
+		 * Therefore, with a sad heart, we disable this very useful
+		 * feature on Windows.
+		 */
+		{ "core.untrackedCache", "false", 1 },
+#endif
+		{ "core.logAllRefUpdates", "true", 1 },
+		{ "credential.https://dev.azure.com.useHttpPath", "true", 1 },
+		{ "credential.validate", "false", 1 }, /* GCM4W-only */
+		{ "gc.auto", "0", 1 },
+		{ "gui.GCWarning", "false", 1 },
+		{ "index.threads", "true", 1 },
+		{ "index.version", "4", 1 },
+		{ "merge.stat", "false", 1 },
+		{ "merge.renames", "true", 1 },
+		{ "pack.useBitmaps", "false", 1 },
+		{ "pack.useSparse", "true", 1 },
+		{ "receive.autoGC", "false", 1 },
+		{ "reset.quiet", "true", 1 },
+		{ "feature.manyFiles", "false", 1 },
+		{ "feature.experimental", "false", 1 },
+		{ "fetch.unpackLimit", "1", 1 },
+		{ "fetch.writeCommitGraph", "false", 1 },
+#ifdef WIN32
+		{ "http.sslBackend", "schannel", 1 },
+#endif
+		/* Optional */
+		{ "status.aheadBehind", "false" },
+		{ "commitGraph.generationVersion", "1" },
+		{ "core.autoCRLF", "false" },
+		{ "core.safeCRLF", "false" },
+		{ "fetch.showForcedUpdates", "false" },
+		{ NULL, NULL },
+	};
+	int i;
+	char *value;
+
+	for (i = 0; config[i].key; i++) {
+		if ((reconfigure && config[i].overwrite_on_reconfigure) ||
+		    git_config_get_string(config[i].key, &value)) {
+			trace2_data_string("scalar", the_repository, config[i].key, "created");
+			if (git_config_set_gently(config[i].key,
+						  config[i].value) < 0)
+				return error(_("could not configure %s=%s"),
+					     config[i].key, config[i].value);
+		} else {
+			trace2_data_string("scalar", the_repository, config[i].key, "exists");
+			free(value);
+		}
+	}
+
+	/*
+	 * The `log.excludeDecoration` setting is special because it allows
+	 * for multiple values.
+	 */
+	if (git_config_get_string("log.excludeDecoration", &value)) {
+		trace2_data_string("scalar", the_repository,
+				   "log.excludeDecoration", "created");
+		if (git_config_set_multivar_gently("log.excludeDecoration",
+						   "refs/prefetch/*",
+						   CONFIG_REGEX_NONE, 0))
+			return error(_("could not configure "
+				       "log.excludeDecoration"));
+	} else {
+		trace2_data_string("scalar", the_repository,
+				   "log.excludeDecoration", "exists");
+		free(value);
+	}
+
+	return 0;
+}
+
+static int toggle_maintenance(int enable)
+{
+	return run_git("maintenance", enable ? "start" : "unregister", NULL);
+}
+
+static int add_or_remove_enlistment(int add)
+{
+	int res;
+
+	if (!the_repository->worktree)
+		die(_("Scalar enlistments require a worktree"));
+
+	res = run_git("config", "--global", "--get", "--fixed-value",
+		      "scalar.repo", the_repository->worktree, NULL);
+
+	/*
+	 * If we want to add and the setting is already there, then do nothing.
+	 * If we want to remove and the setting is not there, then do nothing.
+	 */
+	if ((add && !res) || (!add && res))
+		return 0;
+
+	return run_git("config", "--global", add ? "--add" : "--unset",
+		       add ? "--no-fixed-value" : "--fixed-value",
+		       "scalar.repo", the_repository->worktree, NULL);
+}
+
+static int register_dir(void)
+{
+	int res = add_or_remove_enlistment(1);
+
+	if (!res)
+		res = set_recommended_config(0);
+
+	if (!res)
+		res = toggle_maintenance(1);
+
+	return res;
+}
+
+static int unregister_dir(void)
+{
+	int res = 0;
+
+	if (toggle_maintenance(0) < 0)
+		res = -1;
+
+	if (add_or_remove_enlistment(0) < 0)
+		res = -1;
+
+	return res;
+}
+
+/* printf-style interface, expects `<key>=<value>` argument */
+static int set_config(const char *fmt, ...)
+{
+	struct strbuf buf = STRBUF_INIT;
+	char *value;
+	int res;
+	va_list args;
+
+	va_start(args, fmt);
+	strbuf_vaddf(&buf, fmt, args);
+	va_end(args);
+
+	value = strchr(buf.buf, '=');
+	if (value)
+		*(value++) = '\0';
+	res = git_config_set_gently(buf.buf, value);
+	strbuf_release(&buf);
+
+	return res;
+}
+
+static char *remote_default_branch(const char *url)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+	struct strbuf out = STRBUF_INIT;
+
+	cp.git_cmd = 1;
+	strvec_pushl(&cp.args, "ls-remote", "--symref", url, "HEAD", NULL);
+	if (!pipe_command(&cp, NULL, 0, &out, 0, NULL, 0)) {
+		const char *line = out.buf;
+
+		while (*line) {
+			const char *eol = strchrnul(line, '\n'), *p;
+			size_t len = eol - line;
+			char *branch;
+
+			if (!skip_prefix(line, "ref: ", &p) ||
+			    !strip_suffix_mem(line, &len, "\tHEAD")) {
+				line = eol + (*eol == '\n');
+				continue;
+			}
+
+			eol = line + len;
+			if (skip_prefix(p, "refs/heads/", &p)) {
+				branch = xstrndup(p, eol - p);
+				strbuf_release(&out);
+				return branch;
+			}
+
+			error(_("remote HEAD is not a branch: '%.*s'"),
+			      (int)(eol - p), p);
+			strbuf_release(&out);
+			return NULL;
+		}
+	}
+	warning(_("failed to get default branch name from remote; "
+		  "using local default"));
+	strbuf_reset(&out);
+
+	child_process_init(&cp);
+	cp.git_cmd = 1;
+	strvec_pushl(&cp.args, "symbolic-ref", "--short", "HEAD", NULL);
+	if (!pipe_command(&cp, NULL, 0, &out, 0, NULL, 0)) {
+		strbuf_trim(&out);
+		return strbuf_detach(&out, NULL);
+	}
+
+	strbuf_release(&out);
+	error(_("failed to get default branch name"));
+	return NULL;
+}
+
+static int delete_enlistment(struct strbuf *enlistment)
+{
+#ifdef WIN32
+	struct strbuf parent = STRBUF_INIT;
+#endif
+
+	if (unregister_dir())
+		die(_("failed to unregister repository"));
+
+#ifdef WIN32
+	/*
+	 * Change the current directory to one outside of the enlistment so
+	 * that we may delete everything underneath it.
+	 */
+	strbuf_addbuf(&parent, enlistment);
+	strbuf_parent_directory(&parent);
+	if (chdir(parent.buf) < 0)
+		die_errno(_("could not switch to '%s'"), parent.buf);
+	strbuf_release(&parent);
+#endif
+
+	if (remove_dir_recursively(enlistment, 0))
+		die(_("failed to delete enlistment directory"));
+
+	return 0;
+}
+
+/*
+ * Dummy implementation; Using `get_version_info()` would cause a link error
+ * without this.
+ */
+void load_builtin_commands(const char *prefix, struct cmdnames *cmds)
+{
+	die("not implemented");
+}
+
+static int cmd_clone(int argc, const char **argv)
+{
+	const char *branch = NULL;
+	int full_clone = 0, single_branch = 0;
+	struct option clone_options[] = {
+		OPT_STRING('b', "branch", &branch, N_("<branch>"),
+			   N_("branch to checkout after clone")),
+		OPT_BOOL(0, "full-clone", &full_clone,
+			 N_("when cloning, create full working directory")),
+		OPT_BOOL(0, "single-branch", &single_branch,
+			 N_("only download metadata for the branch that will "
+			    "be checked out")),
+		OPT_END(),
+	};
+	const char * const clone_usage[] = {
+		N_("scalar clone [<options>] [--] <repo> [<dir>]"),
+		NULL
+	};
+	const char *url;
+	char *enlistment = NULL, *dir = NULL;
+	struct strbuf buf = STRBUF_INIT;
+	int res;
+
+	argc = parse_options(argc, argv, NULL, clone_options, clone_usage, 0);
+
+	if (argc == 2) {
+		url = argv[0];
+		enlistment = xstrdup(argv[1]);
+	} else if (argc == 1) {
+		url = argv[0];
+
+		strbuf_addstr(&buf, url);
+		/* Strip trailing slashes, if any */
+		while (buf.len > 0 && is_dir_sep(buf.buf[buf.len - 1]))
+			strbuf_setlen(&buf, buf.len - 1);
+		/* Strip suffix `.git`, if any */
+		strbuf_strip_suffix(&buf, ".git");
+
+		enlistment = find_last_dir_sep(buf.buf);
+		if (!enlistment) {
+			die(_("cannot deduce worktree name from '%s'"), url);
+		}
+		enlistment = xstrdup(enlistment + 1);
+	} else {
+		usage_msg_opt(_("You must specify a repository to clone."),
+			      clone_usage, clone_options);
+	}
+
+	if (is_directory(enlistment))
+		die(_("directory '%s' exists already"), enlistment);
+
+	dir = xstrfmt("%s/src", enlistment);
+
+	strbuf_reset(&buf);
+	if (branch)
+		strbuf_addf(&buf, "init.defaultBranch=%s", branch);
+	else {
+		char *b = repo_default_branch_name(the_repository, 1);
+		strbuf_addf(&buf, "init.defaultBranch=%s", b);
+		free(b);
+	}
+
+	if ((res = run_git("-c", buf.buf, "init", "--", dir, NULL)))
+		goto cleanup;
+
+	if (chdir(dir) < 0) {
+		res = error_errno(_("could not switch to '%s'"), dir);
+		goto cleanup;
+	}
+
+	setup_git_directory();
+
+	/* common-main already logs `argv` */
+	trace2_def_repo(the_repository);
+
+	if (!branch && !(branch = remote_default_branch(url))) {
+		res = error(_("failed to get default branch for '%s'"), url);
+		goto cleanup;
+	}
+
+	if (set_config("remote.origin.url=%s", url) ||
+	    set_config("remote.origin.fetch="
+		       "+refs/heads/%s:refs/remotes/origin/%s",
+		       single_branch ? branch : "*",
+		       single_branch ? branch : "*") ||
+	    set_config("remote.origin.promisor=true") ||
+	    set_config("remote.origin.partialCloneFilter=blob:none")) {
+		res = error(_("could not configure remote in '%s'"), dir);
+		goto cleanup;
+	}
+
+	if (!full_clone &&
+	    (res = run_git("sparse-checkout", "init", "--cone", NULL)))
+		goto cleanup;
+
+	if (set_recommended_config(0))
+		return error(_("could not configure '%s'"), dir);
+
+	if ((res = run_git("fetch", "--quiet", "origin", NULL))) {
+		warning(_("partial clone failed; attempting full clone"));
+
+		if (set_config("remote.origin.promisor") ||
+		    set_config("remote.origin.partialCloneFilter")) {
+			res = error(_("could not configure for full clone"));
+			goto cleanup;
+		}
+
+		if ((res = run_git("fetch", "--quiet", "origin", NULL)))
+			goto cleanup;
+	}
+
+	if ((res = set_config("branch.%s.remote=origin", branch)))
+		goto cleanup;
+	if ((res = set_config("branch.%s.merge=refs/heads/%s",
+			      branch, branch)))
+		goto cleanup;
+
+	strbuf_reset(&buf);
+	strbuf_addf(&buf, "origin/%s", branch);
+	res = run_git("checkout", "-f", "-t", buf.buf, NULL);
+	if (res)
+		goto cleanup;
+
+	res = register_dir();
+
+cleanup:
+	free(enlistment);
+	free(dir);
+	strbuf_release(&buf);
+	return res;
+}
+
+static int cmd_list(int argc, const char **argv)
+{
+	if (argc != 1)
+		die(_("`scalar list` does not take arguments"));
+
+	if (run_git("config", "--global", "--get-all", "scalar.repo", NULL) < 0)
+		return -1;
+	return 0;
+}
+
+static int cmd_register(int argc, const char **argv)
+{
+	struct option options[] = {
+		OPT_END(),
+	};
+	const char * const usage[] = {
+		N_("scalar register [<enlistment>]"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usage, 0);
+
+	setup_enlistment_directory(argc, argv, usage, options, NULL);
+
+	return register_dir();
+}
+
+static int get_scalar_repos(const char *key, const char *value, void *data)
+{
+	struct string_list *list = data;
+
+	if (!strcmp(key, "scalar.repo"))
+		string_list_append(list, value);
+
+	return 0;
+}
+
+static int cmd_reconfigure(int argc, const char **argv)
+{
+	int all = 0;
+	struct option options[] = {
+		OPT_BOOL('a', "all", &all,
+			 N_("reconfigure all registered enlistments")),
+		OPT_END(),
+	};
+	const char * const usage[] = {
+		N_("scalar reconfigure [--all | <enlistment>]"),
+		NULL
+	};
+	struct string_list scalar_repos = STRING_LIST_INIT_DUP;
+	int i, res = 0;
+	struct repository r = { NULL };
+	struct strbuf commondir = STRBUF_INIT, gitdir = STRBUF_INIT;
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usage, 0);
+
+	if (!all) {
+		setup_enlistment_directory(argc, argv, usage, options, NULL);
+
+		return set_recommended_config(1);
+	}
+
+	if (argc > 0)
+		usage_msg_opt(_("--all or <enlistment>, but not both"),
+			      usage, options);
+
+	git_config(get_scalar_repos, &scalar_repos);
+
+	for (i = 0; i < scalar_repos.nr; i++) {
+		const char *dir = scalar_repos.items[i].string;
+
+		strbuf_reset(&commondir);
+		strbuf_reset(&gitdir);
+
+		if (chdir(dir) < 0) {
+			warning_errno(_("could not switch to '%s'"), dir);
+			res = -1;
+		} else if (discover_git_directory(&commondir, &gitdir) < 0) {
+			warning_errno(_("git repository gone in '%s'"), dir);
+			res = -1;
+		} else {
+			git_config_clear();
+
+			the_repository = &r;
+			r.commondir = commondir.buf;
+			r.gitdir = gitdir.buf;
+
+			if (set_recommended_config(1) < 0)
+				res = -1;
+		}
+	}
+
+	string_list_clear(&scalar_repos, 1);
+	strbuf_release(&commondir);
+	strbuf_release(&gitdir);
+
+	return res;
+}
+
+static int cmd_run(int argc, const char **argv)
+{
+	struct option options[] = {
+		OPT_END(),
+	};
+	struct {
+		const char *arg, *task;
+	} tasks[] = {
+		{ "config", NULL },
+		{ "commit-graph", "commit-graph" },
+		{ "fetch", "prefetch" },
+		{ "loose-objects", "loose-objects" },
+		{ "pack-files", "incremental-repack" },
+		{ NULL, NULL }
+	};
+	struct strbuf buf = STRBUF_INIT;
+	const char *usagestr[] = { NULL, NULL };
+	int i;
+
+	strbuf_addstr(&buf, N_("scalar run <task> [<enlistment>]\nTasks:\n"));
+	for (i = 0; tasks[i].arg; i++)
+		strbuf_addf(&buf, "\t%s\n", tasks[i].arg);
+	usagestr[0] = buf.buf;
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usagestr, 0);
+
+	if (!argc)
+		usage_with_options(usagestr, options);
+
+	if (!strcmp("all", argv[0])) {
+		i = -1;
+	} else {
+		for (i = 0; tasks[i].arg && strcmp(tasks[i].arg, argv[0]); i++)
+			; /* keep looking for the task */
+
+		if (i > 0 && !tasks[i].arg) {
+			error(_("no such task: '%s'"), argv[0]);
+			usage_with_options(usagestr, options);
+		}
+	}
+
+	argc--;
+	argv++;
+	setup_enlistment_directory(argc, argv, usagestr, options, NULL);
+	strbuf_release(&buf);
+
+	if (i == 0)
+		return register_dir();
+
+	if (i > 0)
+		return run_git("maintenance", "run",
+			       "--task", tasks[i].task, NULL);
+
+	if (register_dir())
+		return -1;
+	for (i = 1; tasks[i].arg; i++)
+		if (run_git("maintenance", "run",
+			    "--task", tasks[i].task, NULL))
+			return -1;
+	return 0;
+}
+
+static int remove_deleted_enlistment(struct strbuf *path)
+{
+	int res = 0;
+	strbuf_realpath_forgiving(path, path->buf, 1);
+
+	if (run_git("config", "--global",
+		    "--unset", "--fixed-value",
+		    "scalar.repo", path->buf, NULL) < 0)
+		res = -1;
+
+	if (run_git("config", "--global",
+		    "--unset", "--fixed-value",
+		    "maintenance.repo", path->buf, NULL) < 0)
+		res = -1;
+
+	return res;
+}
+
+static int cmd_unregister(int argc, const char **argv)
+{
+	struct option options[] = {
+		OPT_END(),
+	};
+	const char * const usage[] = {
+		N_("scalar unregister [<enlistment>]"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usage, 0);
+
+	/*
+	 * Be forgiving when the enlistment or worktree does not even exist any
+	 * longer; This can be the case if a user deleted the worktree by
+	 * mistake and _still_ wants to unregister the thing.
+	 */
+	if (argc == 1) {
+		struct strbuf src_path = STRBUF_INIT, workdir_path = STRBUF_INIT;
+
+		strbuf_addf(&src_path, "%s/src/.git", argv[0]);
+		strbuf_addf(&workdir_path, "%s/.git", argv[0]);
+		if (!is_directory(src_path.buf) && !is_directory(workdir_path.buf)) {
+			/* remove possible matching registrations */
+			int res = -1;
+
+			strbuf_strip_suffix(&src_path, "/.git");
+			res = remove_deleted_enlistment(&src_path) && res;
+
+			strbuf_strip_suffix(&workdir_path, "/.git");
+			res = remove_deleted_enlistment(&workdir_path) && res;
+
+			strbuf_release(&src_path);
+			strbuf_release(&workdir_path);
+			return res;
+		}
+		strbuf_release(&src_path);
+		strbuf_release(&workdir_path);
+	}
+
+	setup_enlistment_directory(argc, argv, usage, options, NULL);
+
+	return unregister_dir();
+}
+
+static int cmd_delete(int argc, const char **argv)
+{
+	char *cwd = xgetcwd();
+	struct option options[] = {
+		OPT_END(),
+	};
+	const char * const usage[] = {
+		N_("scalar delete <enlistment>"),
+		NULL
+	};
+	struct strbuf enlistment = STRBUF_INIT;
+	int res = 0;
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usage, 0);
+
+	if (argc != 1)
+		usage_with_options(usage, options);
+
+	setup_enlistment_directory(argc, argv, usage, options, &enlistment);
+
+	if (dir_inside_of(cwd, enlistment.buf) >= 0)
+		res = error(_("refusing to delete current working directory"));
+	else {
+		close_object_store(the_repository->objects);
+		res = delete_enlistment(&enlistment);
+	}
+	strbuf_release(&enlistment);
+	free(cwd);
+
+	return res;
+}
+
+static int cmd_version(int argc, const char **argv)
+{
+	int verbose = 0, build_options = 0;
+	struct option options[] = {
+		OPT__VERBOSE(&verbose, N_("include Git version")),
+		OPT_BOOL(0, "build-options", &build_options,
+			 N_("include Git's build options")),
+		OPT_END(),
+	};
+	const char * const usage[] = {
+		N_("scalar verbose [-v | --verbose] [--build-options]"),
+		NULL
+	};
+	struct strbuf buf = STRBUF_INIT;
+
+	argc = parse_options(argc, argv, NULL, options,
+			     usage, 0);
+
+	if (argc != 0)
+		usage_with_options(usage, options);
+
+	get_version_info(&buf, build_options);
+	fprintf(stderr, "%s\n", buf.buf);
+	strbuf_release(&buf);
+
+	return 0;
+}
+
+static struct {
+	const char *name;
+	int (*fn)(int, const char **);
+} builtins[] = {
+	{ "clone", cmd_clone },
+	{ "list", cmd_list },
+	{ "register", cmd_register },
+	{ "unregister", cmd_unregister },
+	{ "run", cmd_run },
+	{ "reconfigure", cmd_reconfigure },
+	{ "delete", cmd_delete },
+	{ "version", cmd_version },
+	{ NULL, NULL},
+};
+
+int cmd_main(int argc, const char **argv)
+{
+	struct strbuf scalar_usage = STRBUF_INIT;
+	int i;
+
+	if (argc > 1) {
+		argv++;
+		argc--;
+
+		for (i = 0; builtins[i].name; i++)
+			if (!strcmp(builtins[i].name, argv[0]))
+				return !!builtins[i].fn(argc, argv);
+	}
+
+	strbuf_addstr(&scalar_usage,
+		      N_("scalar <command> [<options>]\n\nCommands:\n"));
+	for (i = 0; builtins[i].name; i++)
+		strbuf_addf(&scalar_usage, "\t%s\n", builtins[i].name);
+
+	usage(scalar_usage.buf);
+}
diff --git a/contrib/scalar/scalar.txt b/contrib/scalar/scalar.txt
new file mode 100644
index 0000000000..f416d63728
--- /dev/null
+++ b/contrib/scalar/scalar.txt
@@ -0,0 +1,145 @@
+scalar(1)
+=========
+
+NAME
+----
+scalar - an opinionated repository management tool
+
+SYNOPSIS
+--------
+[verse]
+scalar clone [--single-branch] [--branch <main-branch>] [--full-clone] <url> [<enlistment>]
+scalar list
+scalar register [<enlistment>]
+scalar unregister [<enlistment>]
+scalar run ( all | config | commit-graph | fetch | loose-objects | pack-files ) [<enlistment>]
+scalar reconfigure [ --all | <enlistment> ]
+scalar delete <enlistment>
+
+DESCRIPTION
+-----------
+
+Scalar is an opinionated repository management tool. By creating new
+repositories or registering existing repositories with Scalar, your Git
+experience will speed up. Scalar sets advanced Git config settings,
+maintains your repositories in the background, and helps reduce data sent
+across the network.
+
+An important Scalar concept is the enlistment: this is the top-level directory
+of the project. It usually contains the subdirectory `src/` which is a Git
+worktree. This encourages the separation between tracked files (inside `src/`)
+and untracked files, such as build artifacts (outside `src/`). When registering
+an existing Git worktree with Scalar whose name is not `src`, the enlistment
+will be identical to the worktree.
+
+The `scalar` command implements various subcommands, and different options
+depending on the subcommand. With the exception of `clone`, `list` and
+`reconfigure --all`, all subcommands expect to be run in an enlistment.
+
+COMMANDS
+--------
+
+Clone
+~~~~~
+
+clone [<options>] <url> [<enlistment>]::
+	Clones the specified repository, similar to linkgit:git-clone[1]. By
+	default, only commit and tree objects are cloned. Once finished, the
+	worktree is located at `<enlistment>/src`.
++
+The sparse-checkout feature is enabled (except when run with `--full-clone`)
+and the only files present are those in the top-level directory. Use
+`git sparse-checkout set` to expand the set of directories you want to see,
+or `git sparse-checkout disable` to expand to all files (see
+linkgit:git-sparse-checkout[1] for more details). You can explore the
+subdirectories outside your sparse-checkout by using `git ls-tree
+HEAD[:<directory>]`.
+
+-b <name>::
+--branch <name>::
+	Instead of checking out the branch pointed to by the cloned
+	repository's HEAD, check out the `<name>` branch instead.
+
+--[no-]single-branch::
+	Clone only the history leading to the tip of a single branch, either
+	specified by the `--branch` option or the primary branch remote's
+	`HEAD` points at.
++
+Further fetches into the resulting repository will only update the
+remote-tracking branch for the branch this option was used for the initial
+cloning. If the HEAD at the remote did not point at any branch when
+`--single-branch` clone was made, no remote-tracking branch is created.
+
+--[no-]full-clone::
+	A sparse-checkout is initialized by default. This behavior can be
+	turned off via `--full-clone`.
+
+List
+~~~~
+
+list::
+	List enlistments that are currently registered by Scalar. This
+	subcommand does not need to be run inside an enlistment.
+
+Register
+~~~~~~~~
+
+register [<enlistment>]::
+	Adds the enlistment's repository to the list of registered repositories
+	and starts background maintenance. If `<enlistment>` is not provided,
+	then the enlistment associated with the current working directory is
+	registered.
++
+Note: when this subcommand is called in a worktree that is called `src/`, its
+parent directory is considered to be the Scalar enlistment. If the worktree is
+_not_ called `src/`, it itself will be considered to be the Scalar enlistment.
+
+Unregister
+~~~~~~~~~~
+
+unregister [<enlistment>]::
+	Remove the specified repository from the list of repositories
+	registered with Scalar and stop the scheduled background maintenance.
+
+Run
+~~~
+
+scalar run ( all | config | commit-graph | fetch | loose-objects | pack-files ) [<enlistment>]::
+	Run the given maintenance task (or all tasks, if `all` was specified).
+	Except for `all` and `config`, this subcommand simply hands off to
+	linkgit:git-maintenance[1] (mapping `fetch` to `prefetch` and
+	`pack-files` to `incremental-repack`).
++
+These tasks are run automatically as part of the scheduled maintenance,
+as soon as the repository is registered with Scalar. It should therefore
+not be necessary to run this subcommand manually.
++
+The `config` task is specific to Scalar and configures all those
+opinionated default settings that make Git work more efficiently with
+large repositories. As this task is run as part of `scalar clone`
+automatically, explicit invocations of this task are rarely needed.
+
+Reconfigure
+~~~~~~~~~~~
+
+After a Scalar upgrade, or when the configuration of a Scalar enlistment
+was somehow corrupted or changed by mistake, this subcommand allows to
+reconfigure the enlistment.
+
+With the `--all` option, all enlistments currently registered with Scalar
+will be reconfigured. Use this option after each Scalar upgrade.
+
+Delete
+~~~~~~
+
+delete <enlistment>::
+	This subcommand lets you delete an existing Scalar enlistment from your
+	local file system, unregistering the repository.
+
+SEE ALSO
+--------
+linkgit:git-clone[1], linkgit:git-maintenance[1].
+
+Scalar
+---
+Associated with the linkgit:git[1] suite
diff --git a/contrib/scalar/t/Makefile b/contrib/scalar/t/Makefile
new file mode 100644
index 0000000000..6170672bb3
--- /dev/null
+++ b/contrib/scalar/t/Makefile
@@ -0,0 +1,78 @@
+# Run scalar tests
+#
+# Copyright (c) 2005,2021 Junio C Hamano, Johannes Schindelin
+#
+
+-include ../../../config.mak.autogen
+-include ../../../config.mak
+
+SHELL_PATH ?= $(SHELL)
+PERL_PATH ?= /usr/bin/perl
+RM ?= rm -f
+PROVE ?= prove
+DEFAULT_TEST_TARGET ?= test
+TEST_LINT ?= test-lint
+
+ifdef TEST_OUTPUT_DIRECTORY
+TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
+else
+TEST_RESULTS_DIRECTORY = ../../../t/test-results
+endif
+
+# Shell quote;
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
+
+T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
+
+all: $(DEFAULT_TEST_TARGET)
+
+test: $(TEST_LINT)
+	$(MAKE) aggregate-results-and-cleanup
+
+prove: $(TEST_LINT)
+	@echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+	$(MAKE) clean-except-prove-cache
+
+$(T):
+	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+
+clean-except-prove-cache:
+	$(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
+	$(RM) -r valgrind/bin
+
+clean: clean-except-prove-cache
+	$(RM) .prove
+
+test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax
+
+test-lint-duplicates:
+	@dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
+		test -z "$$dups" || { \
+		echo >&2 "duplicate test numbers:" $$dups; exit 1; }
+
+test-lint-executable:
+	@bad=`for i in $(T); do test -x "$$i" || echo $$i; done` && \
+		test -z "$$bad" || { \
+		echo >&2 "non-executable tests:" $$bad; exit 1; }
+
+test-lint-shell-syntax:
+	@'$(PERL_PATH_SQ)' ../../../t/check-non-portable-shell.pl $(T)
+
+aggregate-results-and-cleanup: $(T)
+	$(MAKE) aggregate-results
+	$(MAKE) clean
+
+aggregate-results:
+	for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
+		echo "$$f"; \
+	done | '$(SHELL_PATH_SQ)' ../../../t/aggregate-results.sh
+
+valgrind:
+	$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
+
+test-results:
+	mkdir -p test-results
+
+.PHONY: $(T) aggregate-results clean valgrind
diff --git a/contrib/scalar/t/t9099-scalar.sh b/contrib/scalar/t/t9099-scalar.sh
new file mode 100755
index 0000000000..2e1502ad45
--- /dev/null
+++ b/contrib/scalar/t/t9099-scalar.sh
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+test_description='test the `scalar` command'
+
+TEST_DIRECTORY=$PWD/../../../t
+export TEST_DIRECTORY
+
+# Make it work with --no-bin-wrappers
+PATH=$PWD/..:$PATH
+
+. ../../../t/test-lib.sh
+
+GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab ../cron.txt,launchctl:true,schtasks:true"
+export GIT_TEST_MAINT_SCHEDULER
+
+test_expect_success 'scalar shows a usage' '
+	test_expect_code 129 scalar -h
+'
+
+test_expect_success 'scalar unregister' '
+	git init vanish/src &&
+	scalar register vanish/src &&
+	git config --get --global --fixed-value \
+		maintenance.repo "$(pwd)/vanish/src" &&
+	scalar list >scalar.repos &&
+	grep -F "$(pwd)/vanish/src" scalar.repos &&
+	rm -rf vanish/src/.git &&
+	scalar unregister vanish &&
+	test_must_fail git config --get --global --fixed-value \
+		maintenance.repo "$(pwd)/vanish/src" &&
+	scalar list >scalar.repos &&
+	! grep -F "$(pwd)/vanish/src" scalar.repos
+'
+
+test_expect_success 'set up repository to clone' '
+	test_commit first &&
+	test_commit second &&
+	test_commit third &&
+	git switch -c parallel first &&
+	mkdir -p 1/2 &&
+	test_commit 1/2/3 &&
+	git config uploadPack.allowFilter true &&
+	git config uploadPack.allowAnySHA1InWant true
+'
+
+test_expect_success 'scalar clone' '
+	second=$(git rev-parse --verify second:second.t) &&
+	scalar clone "file://$(pwd)" cloned --single-branch &&
+	(
+		cd cloned/src &&
+
+		git config --get --global --fixed-value maintenance.repo \
+			"$(pwd)" &&
+
+		git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
+		echo "refs/remotes/origin/parallel" >expect &&
+		test_cmp expect actual &&
+
+		test_path_is_missing 1/2 &&
+		test_must_fail git rev-list --missing=print $second &&
+		git rev-list $second &&
+		git cat-file blob $second >actual &&
+		echo "second" >expect &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'scalar reconfigure' '
+	git init one/src &&
+	scalar register one &&
+	git -C one/src config core.preloadIndex false &&
+	scalar reconfigure one &&
+	test true = "$(git -C one/src config core.preloadIndex)" &&
+	git -C one/src config core.preloadIndex false &&
+	scalar reconfigure -a &&
+	test true = "$(git -C one/src config core.preloadIndex)"
+'
+
+test_expect_success 'scalar delete without enlistment shows a usage' '
+	test_expect_code 129 scalar delete
+'
+
+test_expect_success 'scalar delete with enlistment' '
+	scalar delete cloned &&
+	test_path_is_missing cloned
+'
+
+test_done
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 7f767b5c38..71f1fd94bd 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -296,10 +296,9 @@ cache_miss () {
 	done
 }
 
-# Usage: check_parents PARENTS_EXPR
+# Usage: check_parents [REVS...]
 check_parents () {
-	assert test $# = 1
-	missed=$(cache_miss "$1") || exit $?
+	missed=$(cache_miss "$@") || exit $?
 	local indent=$(($indent + 1))
 	for miss in $missed
 	do
@@ -753,7 +752,7 @@ process_split_commit () {
 	fi
 	createcount=$(($createcount + 1))
 	debug "parents: $parents"
-	check_parents "$parents"
+	check_parents $parents
 	newparents=$(cache_get $parents) || exit $?
 	debug "newparents: $newparents"
 
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 4153b65321..1c1f76f04a 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -1445,7 +1445,7 @@ test_expect_success 'subtree descendant check' '
 	) &&
 	test_create_commit "$test_count" folder_subtree/0 &&
 	test_create_commit "$test_count" folder_subtree/b &&
-	cherry=$(cd "$test_count"; git rev-parse HEAD) &&
+	cherry=$(cd "$test_count" && git rev-parse HEAD) &&
 	(
 		cd "$test_count" &&
 		git checkout branch
diff --git a/convert.c b/convert.c
index 0d6fb3410a..df7186bd81 100644
--- a/convert.c
+++ b/convert.c
@@ -613,7 +613,7 @@ static int crlf_to_worktree(const char *src, size_t len, struct strbuf *buf,
 
 struct filter_params {
 	const char *src;
-	unsigned long size;
+	size_t size;
 	int fd;
 	const char *cmd;
 	const char *path;
diff --git a/daemon.c b/daemon.c
index b1fcbe0d6f..94a5b8a364 100644
--- a/daemon.c
+++ b/daemon.c
@@ -232,13 +232,13 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
 
 		rlen = strlcpy(interp_path, expanded_path.buf,
 			       sizeof(interp_path));
+		strbuf_release(&expanded_path);
 		if (rlen >= sizeof(interp_path)) {
 			logerror("interpolated path too large: %s",
 				 interp_path);
 			return NULL;
 		}
 
-		strbuf_release(&expanded_path);
 		loginfo("Interpolated dir '%s'", interp_path);
 
 		dir = interp_path;
@@ -326,22 +326,18 @@ static int run_access_hook(struct daemon_service *service, const char *dir,
 {
 	struct child_process child = CHILD_PROCESS_INIT;
 	struct strbuf buf = STRBUF_INIT;
-	const char *argv[8];
-	const char **arg = argv;
 	char *eol;
 	int seen_errors = 0;
 
-	*arg++ = access_hook;
-	*arg++ = service->name;
-	*arg++ = path;
-	*arg++ = hi->hostname.buf;
-	*arg++ = get_canon_hostname(hi);
-	*arg++ = get_ip_address(hi);
-	*arg++ = hi->tcp_port.buf;
-	*arg = NULL;
+	strvec_push(&child.args, access_hook);
+	strvec_push(&child.args, service->name);
+	strvec_push(&child.args, path);
+	strvec_push(&child.args, hi->hostname.buf);
+	strvec_push(&child.args, get_canon_hostname(hi));
+	strvec_push(&child.args, get_ip_address(hi));
+	strvec_push(&child.args, hi->tcp_port.buf);
 
 	child.use_shell = 1;
-	child.argv = argv;
 	child.no_stdin = 1;
 	child.no_stderr = 1;
 	child.out = -1;
@@ -922,7 +918,7 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 #endif
 	}
 
-	cld.argv = cld_argv.v;
+	strvec_pushv(&cld.args, cld_argv.v);
 	cld.in = incoming;
 	cld.out = dup(incoming);
 
diff --git a/date.c b/date.c
index c55ea47e96..84bb4451c1 100644
--- a/date.c
+++ b/date.c
@@ -9,7 +9,7 @@
 /*
  * This is like mktime, but without normalization of tm_wday and tm_yday.
  */
-static time_t tm_to_time_t(const struct tm *tm)
+time_t tm_to_time_t(const struct tm *tm)
 {
 	static const int mdays[] = {
 	    0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
diff --git a/delta.h b/delta.h
index 2df5fe13d9..8a56ec0799 100644
--- a/delta.h
+++ b/delta.h
@@ -90,15 +90,15 @@ static inline unsigned long get_delta_hdr_size(const unsigned char **datap,
 					       const unsigned char *top)
 {
 	const unsigned char *data = *datap;
-	unsigned long cmd, size = 0;
+	size_t cmd, size = 0;
 	int i = 0;
 	do {
 		cmd = *data++;
-		size |= (cmd & 0x7f) << i;
+		size |= st_left_shift(cmd & 0x7f, i);
 		i += 7;
 	} while (cmd & 0x80 && data < top);
 	*datap = data;
-	return size;
+	return cast_size_t_to_ulong(size);
 }
 
 #endif
diff --git a/diff.c b/diff.c
index 861282db1c..c862771a58 100644
--- a/diff.c
+++ b/diff.c
@@ -18,6 +18,7 @@
 #include "submodule-config.h"
 #include "submodule.h"
 #include "hashmap.h"
+#include "mem-pool.h"
 #include "ll-merge.h"
 #include "string-list.h"
 #include "strvec.h"
@@ -773,6 +774,7 @@ struct emitted_diff_symbol {
 	int flags;
 	int indent_off;   /* Offset to first non-whitespace character */
 	int indent_width; /* The visual width of the indentation */
+	unsigned id;
 	enum diff_symbol s;
 };
 #define EMITTED_DIFF_SYMBOL_INIT { 0 }
@@ -798,9 +800,9 @@ static void append_emitted_diff_symbol(struct diff_options *o,
 }
 
 struct moved_entry {
-	struct hashmap_entry ent;
 	const struct emitted_diff_symbol *es;
 	struct moved_entry *next_line;
+	struct moved_entry *next_match;
 };
 
 struct moved_block {
@@ -808,11 +810,6 @@ struct moved_block {
 	int wsd; /* The whitespace delta of this block */
 };
 
-static void moved_block_clear(struct moved_block *b)
-{
-	memset(b, 0, sizeof(*b));
-}
-
 #define INDENT_BLANKLINE INT_MIN
 
 static void fill_es_indent_data(struct emitted_diff_symbol *es)
@@ -856,79 +853,41 @@ static void fill_es_indent_data(struct emitted_diff_symbol *es)
 }
 
 static int compute_ws_delta(const struct emitted_diff_symbol *a,
-			    const struct emitted_diff_symbol *b,
-			    int *out)
-{
-	int a_len = a->len,
-	    b_len = b->len,
-	    a_off = a->indent_off,
-	    a_width = a->indent_width,
-	    b_off = b->indent_off,
+			    const struct emitted_diff_symbol *b)
+{
+	int a_width = a->indent_width,
 	    b_width = b->indent_width;
-	int delta;
 
-	if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE) {
-		*out = INDENT_BLANKLINE;
-		return 1;
-	}
-
-	if (a->s == DIFF_SYMBOL_PLUS)
-		delta = a_width - b_width;
-	else
-		delta = b_width - a_width;
-
-	if (a_len - a_off != b_len - b_off ||
-	    memcmp(a->line + a_off, b->line + b_off, a_len - a_off))
-		return 0;
+	if (a_width == INDENT_BLANKLINE && b_width == INDENT_BLANKLINE)
+		return INDENT_BLANKLINE;
 
-	*out = delta;
-
-	return 1;
+	return a_width - b_width;
 }
 
-static int cmp_in_block_with_wsd(const struct diff_options *o,
-				 const struct moved_entry *cur,
-				 const struct moved_entry *match,
-				 struct moved_block *pmb,
-				 int n)
-{
-	struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
-	int al = cur->es->len, bl = match->es->len, cl = l->len;
-	const char *a = cur->es->line,
-		   *b = match->es->line,
-		   *c = l->line;
-	int a_off = cur->es->indent_off,
-	    a_width = cur->es->indent_width,
-	    c_off = l->indent_off,
-	    c_width = l->indent_width;
+static int cmp_in_block_with_wsd(const struct moved_entry *cur,
+				 const struct emitted_diff_symbol *l,
+				 struct moved_block *pmb)
+{
+	int a_width = cur->es->indent_width, b_width = l->indent_width;
 	int delta;
 
-	/*
-	 * We need to check if 'cur' is equal to 'match'.  As those
-	 * are from the same (+/-) side, we do not need to adjust for
-	 * indent changes. However these were found using fuzzy
-	 * matching so we do have to check if they are equal. Here we
-	 * just check the lengths. We delay calling memcmp() to check
-	 * the contents until later as if the length comparison for a
-	 * and c fails we can avoid the call all together.
-	 */
-	if (al != bl)
+	/* The text of each line must match */
+	if (cur->es->id != l->id)
 		return 1;
 
-	/* If 'l' and 'cur' are both blank then they match. */
-	if (a_width == INDENT_BLANKLINE && c_width == INDENT_BLANKLINE)
+	/*
+	 * If 'l' and 'cur' are both blank then we don't need to check the
+	 * indent. We only need to check cur as we know the strings match.
+	 * */
+	if (a_width == INDENT_BLANKLINE)
 		return 0;
 
 	/*
 	 * The indent changes of the block are known and stored in pmb->wsd;
 	 * however we need to check if the indent changes of the current line
-	 * match those of the current block and that the text of 'l' and 'cur'
-	 * after the indentation match.
+	 * match those of the current block.
 	 */
-	if (cur->es->s == DIFF_SYMBOL_PLUS)
-		delta = a_width - c_width;
-	else
-		delta = c_width - a_width;
+	delta = b_width - a_width;
 
 	/*
 	 * If the previous lines of this block were all blank then set its
@@ -937,166 +896,165 @@ static int cmp_in_block_with_wsd(const struct diff_options *o,
 	if (pmb->wsd == INDENT_BLANKLINE)
 		pmb->wsd = delta;
 
-	return !(delta == pmb->wsd && al - a_off == cl - c_off &&
-		 !memcmp(a, b, al) && !
-		 memcmp(a + a_off, c + c_off, al - a_off));
+	return delta != pmb->wsd;
 }
 
-static int moved_entry_cmp(const void *hashmap_cmp_fn_data,
-			   const struct hashmap_entry *eptr,
-			   const struct hashmap_entry *entry_or_key,
-			   const void *keydata)
+struct interned_diff_symbol {
+	struct hashmap_entry ent;
+	struct emitted_diff_symbol *es;
+};
+
+static int interned_diff_symbol_cmp(const void *hashmap_cmp_fn_data,
+				    const struct hashmap_entry *eptr,
+				    const struct hashmap_entry *entry_or_key,
+				    const void *keydata)
 {
 	const struct diff_options *diffopt = hashmap_cmp_fn_data;
-	const struct moved_entry *a, *b;
+	const struct emitted_diff_symbol *a, *b;
 	unsigned flags = diffopt->color_moved_ws_handling
 			 & XDF_WHITESPACE_FLAGS;
 
-	a = container_of(eptr, const struct moved_entry, ent);
-	b = container_of(entry_or_key, const struct moved_entry, ent);
-
-	if (diffopt->color_moved_ws_handling &
-	    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
-		/*
-		 * As there is not specific white space config given,
-		 * we'd need to check for a new block, so ignore all
-		 * white space. The setup of the white space
-		 * configuration for the next block is done else where
-		 */
-		flags |= XDF_IGNORE_WHITESPACE;
+	a = container_of(eptr, const struct interned_diff_symbol, ent)->es;
+	b = container_of(entry_or_key, const struct interned_diff_symbol, ent)->es;
 
-	return !xdiff_compare_lines(a->es->line, a->es->len,
-				    b->es->line, b->es->len,
-				    flags);
+	return !xdiff_compare_lines(a->line + a->indent_off,
+				    a->len - a->indent_off,
+				    b->line + b->indent_off,
+				    b->len - b->indent_off, flags);
 }
 
-static struct moved_entry *prepare_entry(struct diff_options *o,
-					 int line_no)
+static void prepare_entry(struct diff_options *o, struct emitted_diff_symbol *l,
+			  struct interned_diff_symbol *s)
 {
-	struct moved_entry *ret = xmalloc(sizeof(*ret));
-	struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
 	unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS;
-	unsigned int hash = xdiff_hash_string(l->line, l->len, flags);
-
-	hashmap_entry_init(&ret->ent, hash);
-	ret->es = l;
-	ret->next_line = NULL;
+	unsigned int hash = xdiff_hash_string(l->line + l->indent_off,
+					      l->len - l->indent_off, flags);
 
-	return ret;
+	hashmap_entry_init(&s->ent, hash);
+	s->es = l;
 }
 
-static void add_lines_to_move_detection(struct diff_options *o,
-					struct hashmap *add_lines,
-					struct hashmap *del_lines)
+struct moved_entry_list {
+	struct moved_entry *add, *del;
+};
+
+static struct moved_entry_list *add_lines_to_move_detection(struct diff_options *o,
+							    struct mem_pool *entry_mem_pool)
 {
 	struct moved_entry *prev_line = NULL;
-
+	struct mem_pool interned_pool;
+	struct hashmap interned_map;
+	struct moved_entry_list *entry_list = NULL;
+	size_t entry_list_alloc = 0;
+	unsigned id = 0;
 	int n;
+
+	hashmap_init(&interned_map, interned_diff_symbol_cmp, o, 8096);
+	mem_pool_init(&interned_pool, 1024 * 1024);
+
 	for (n = 0; n < o->emitted_symbols->nr; n++) {
-		struct hashmap *hm;
-		struct moved_entry *key;
+		struct interned_diff_symbol key;
+		struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
+		struct interned_diff_symbol *s;
+		struct moved_entry *entry;
 
-		switch (o->emitted_symbols->buf[n].s) {
-		case DIFF_SYMBOL_PLUS:
-			hm = add_lines;
-			break;
-		case DIFF_SYMBOL_MINUS:
-			hm = del_lines;
-			break;
-		default:
+		if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS) {
 			prev_line = NULL;
 			continue;
 		}
 
 		if (o->color_moved_ws_handling &
 		    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
-			fill_es_indent_data(&o->emitted_symbols->buf[n]);
-		key = prepare_entry(o, n);
-		if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
-			prev_line->next_line = key;
+			fill_es_indent_data(l);
 
-		hashmap_add(hm, &key->ent);
-		prev_line = key;
+		prepare_entry(o, l, &key);
+		s = hashmap_get_entry(&interned_map, &key, ent, &key.ent);
+		if (s) {
+			l->id = s->es->id;
+		} else {
+			l->id = id;
+			ALLOC_GROW_BY(entry_list, id, 1, entry_list_alloc);
+			hashmap_add(&interned_map,
+				    memcpy(mem_pool_alloc(&interned_pool,
+							  sizeof(key)),
+					   &key, sizeof(key)));
+		}
+		entry = mem_pool_alloc(entry_mem_pool, sizeof(*entry));
+		entry->es = l;
+		entry->next_line = NULL;
+		if (prev_line && prev_line->es->s == l->s)
+			prev_line->next_line = entry;
+		prev_line = entry;
+		if (l->s == DIFF_SYMBOL_PLUS) {
+			entry->next_match = entry_list[l->id].add;
+			entry_list[l->id].add = entry;
+		} else {
+			entry->next_match = entry_list[l->id].del;
+			entry_list[l->id].del = entry;
+		}
 	}
+
+	hashmap_clear(&interned_map);
+	mem_pool_discard(&interned_pool, 0);
+
+	return entry_list;
 }
 
 static void pmb_advance_or_null(struct diff_options *o,
-				struct moved_entry *match,
-				struct hashmap *hm,
+				struct emitted_diff_symbol *l,
 				struct moved_block *pmb,
-				int pmb_nr)
+				int *pmb_nr)
 {
-	int i;
-	for (i = 0; i < pmb_nr; i++) {
+	int i, j;
+
+	for (i = 0, j = 0; i < *pmb_nr; i++) {
+		int match;
 		struct moved_entry *prev = pmb[i].match;
 		struct moved_entry *cur = (prev && prev->next_line) ?
 				prev->next_line : NULL;
-		if (cur && !hm->cmpfn(o, &cur->ent, &match->ent, NULL)) {
-			pmb[i].match = cur;
-		} else {
-			pmb[i].match = NULL;
-		}
-	}
-}
 
-static void pmb_advance_or_null_multi_match(struct diff_options *o,
-					    struct moved_entry *match,
-					    struct hashmap *hm,
-					    struct moved_block *pmb,
-					    int pmb_nr, int n)
-{
-	int i;
-	char *got_match = xcalloc(1, pmb_nr);
-
-	hashmap_for_each_entry_from(hm, match, ent) {
-		for (i = 0; i < pmb_nr; i++) {
-			struct moved_entry *prev = pmb[i].match;
-			struct moved_entry *cur = (prev && prev->next_line) ?
-					prev->next_line : NULL;
-			if (!cur)
-				continue;
-			if (!cmp_in_block_with_wsd(o, cur, match, &pmb[i], n))
-				got_match[i] |= 1;
-		}
-	}
+		if (o->color_moved_ws_handling &
+		    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
+			match = cur &&
+				!cmp_in_block_with_wsd(cur, l, &pmb[i]);
+		else
+			match = cur && cur->es->id == l->id;
 
-	for (i = 0; i < pmb_nr; i++) {
-		if (got_match[i]) {
-			/* Advance to the next line */
-			pmb[i].match = pmb[i].match->next_line;
-		} else {
-			moved_block_clear(&pmb[i]);
+		if (match) {
+			pmb[j] = pmb[i];
+			pmb[j++].match = cur;
 		}
 	}
-
-	free(got_match);
+	*pmb_nr = j;
 }
 
-static int shrink_potential_moved_blocks(struct moved_block *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].match)
-			lp++;
-		/* lp points at the first NULL now */
+static void fill_potential_moved_blocks(struct diff_options *o,
+					struct moved_entry *match,
+					struct emitted_diff_symbol *l,
+					struct moved_block **pmb_p,
+					int *pmb_alloc_p, int *pmb_nr_p)
 
-		while (rp > -1 && !pmb[rp].match)
-			rp--;
-		/* rp points at the last non-NULL */
+{
+	struct moved_block *pmb = *pmb_p;
+	int pmb_alloc = *pmb_alloc_p, pmb_nr = *pmb_nr_p;
 
-		if (lp < pmb_nr && rp > -1 && lp < rp) {
-			pmb[lp] = pmb[rp];
-			memset(&pmb[rp], 0, sizeof(pmb[rp]));
-			rp--;
-			lp++;
-		}
+	/*
+	 * The current line is the start of a new block.
+	 * Setup the set of potential blocks.
+	 */
+	for (; match; match = match->next_match) {
+		ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
+		if (o->color_moved_ws_handling &
+		    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
+			pmb[pmb_nr].wsd = compute_ws_delta(l, match->es);
+		else
+			pmb[pmb_nr].wsd = 0;
+		pmb[pmb_nr++].match = match;
 	}
 
-	/* Remember the number of running sets */
-	return rp + 1;
+	*pmb_p = pmb;
+	*pmb_alloc_p = pmb_alloc;
+	*pmb_nr_p = pmb_nr;
 }
 
 /*
@@ -1115,6 +1073,8 @@ static int shrink_potential_moved_blocks(struct moved_block *pmb,
  * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
  * Think of a way to unify them.
  */
+#define DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK \
+  (DIFF_SYMBOL_MOVED_LINE | DIFF_SYMBOL_MOVED_LINE_ALT)
 static int adjust_last_block(struct diff_options *o, int n, int block_length)
 {
 	int i, alnum_count = 0;
@@ -1131,95 +1091,85 @@ static int adjust_last_block(struct diff_options *o, int n, int block_length)
 		}
 	}
 	for (i = 1; i < block_length + 1; i++)
-		o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
+		o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK;
 	return 0;
 }
 
 /* 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_list *entry_list)
 {
 	struct moved_block *pmb = NULL; /* potentially moved blocks */
 	int pmb_nr = 0, pmb_alloc = 0;
 	int n, flipped_block = 0, block_length = 0;
+	enum diff_symbol moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
 
 
 	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];
-		enum diff_symbol last_symbol = 0;
 
 		switch (l->s) {
 		case DIFF_SYMBOL_PLUS:
-			hm = del_lines;
-			key = prepare_entry(o, n);
-			match = hashmap_get_entry(hm, key, ent, NULL);
-			free(key);
+			match = entry_list[l->id].del;
 			break;
 		case DIFF_SYMBOL_MINUS:
-			hm = add_lines;
-			key = prepare_entry(o, n);
-			match = hashmap_get_entry(hm, key, ent, NULL);
-			free(key);
+			match = entry_list[l->id].add;
 			break;
 		default:
 			flipped_block = 0;
 		}
 
-		if (!match) {
-			int i;
-
-			adjust_last_block(o, n, block_length);
-			for(i = 0; i < pmb_nr; i++)
-				moved_block_clear(&pmb[i]);
+		if (pmb_nr && (!match || l->s != moved_symbol)) {
+			if (!adjust_last_block(o, n, block_length) &&
+			    block_length > 1) {
+				/*
+				 * Rewind in case there is another match
+				 * starting at the second line of the block
+				 */
+				match = NULL;
+				n -= block_length;
+			}
 			pmb_nr = 0;
 			block_length = 0;
 			flipped_block = 0;
-			last_symbol = l->s;
+		}
+		if (!match) {
+			moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
 			continue;
 		}
 
 		if (o->color_moved == COLOR_MOVED_PLAIN) {
-			last_symbol = l->s;
 			l->flags |= DIFF_SYMBOL_MOVED_LINE;
 			continue;
 		}
 
-		if (o->color_moved_ws_handling &
-		    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
-			pmb_advance_or_null_multi_match(o, match, hm, pmb, pmb_nr, n);
-		else
-			pmb_advance_or_null(o, match, hm, pmb, pmb_nr);
-
-		pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);
+		pmb_advance_or_null(o, l, pmb, &pmb_nr);
 
 		if (pmb_nr == 0) {
-			/*
-			 * The current line is the start of a new block.
-			 * Setup the set of potential blocks.
-			 */
-			hashmap_for_each_entry_from(hm, match, ent) {
-				ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
-				if (o->color_moved_ws_handling &
-				    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) {
-					if (compute_ws_delta(l, match->es,
-							     &pmb[pmb_nr].wsd))
-						pmb[pmb_nr++].match = match;
-				} else {
-					pmb[pmb_nr].wsd = 0;
-					pmb[pmb_nr++].match = match;
-				}
-			}
+			int contiguous = adjust_last_block(o, n, block_length);
+
+			if (!contiguous && block_length > 1)
+				/*
+				 * Rewind in case there is another match
+				 * starting at the second line of the block
+				 */
+				n -= block_length;
+			else
+				fill_potential_moved_blocks(o, match, l,
+							    &pmb, &pmb_alloc,
+							    &pmb_nr);
 
-			if (adjust_last_block(o, n, block_length) &&
-			    pmb_nr && last_symbol != l->s)
+			if (contiguous && pmb_nr && moved_symbol == l->s)
 				flipped_block = (flipped_block + 1) % 2;
 			else
 				flipped_block = 0;
 
+			if (pmb_nr)
+				moved_symbol = l->s;
+			else
+				moved_symbol = DIFF_SYMBOL_BINARY_DIFF_HEADER;
+
 			block_length = 0;
 		}
 
@@ -1229,17 +1179,12 @@ static void mark_color_as_moved(struct diff_options *o,
 			if (flipped_block && o->color_moved != COLOR_MOVED_BLOCKS)
 				l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
 		}
-		last_symbol = l->s;
 	}
 	adjust_last_block(o, n, block_length);
 
-	for(n = 0; n < pmb_nr; n++)
-		moved_block_clear(&pmb[n]);
 	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;
@@ -1573,7 +1518,9 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
 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, 0, 0, s};
+	struct emitted_diff_symbol e = {
+		.line = line, .len = len, .flags = flags, .s = s
+	};
 
 	if (o->emitted_symbols)
 		append_emitted_diff_symbol(o, &e);
@@ -4639,16 +4586,20 @@ void diff_setup_done(struct diff_options *options)
 		options->set_default(options);
 
 	if (HAS_MULTI_BITS(options->output_format & check_mask))
-		die(_("--name-only, --name-status, --check and -s are mutually exclusive"));
+		die(_("options '%s', '%s', '%s', and '%s' cannot be used together"),
+			"--name-only", "--name-status", "--check", "-s");
 
 	if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
-		die(_("-G, -S and --find-object are mutually exclusive"));
+		die(_("options '%s', '%s', and '%s' cannot be used together"),
+			"-G", "-S", "--find-object");
 
 	if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK))
-		die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"));
+		die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s'"),
+			"-G", "--pickaxe-regex", "--pickaxe-regex", "-S");
 
 	if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
-		die(_("--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));
+		die(_("options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"),
+			"--pickaxe-all", "--find-object", "--pickaxe-all", "-G", "-S");
 
 	/*
 	 * Most of the time we can say "there are changes"
@@ -6345,24 +6296,18 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
 
 	if (o->emitted_symbols) {
 		if (o->color_moved) {
-			struct hashmap add_lines, del_lines;
-
-			if (o->color_moved_ws_handling &
-			    COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE)
-				o->color_moved_ws_handling |= XDF_IGNORE_WHITESPACE;
-
-			hashmap_init(&del_lines, moved_entry_cmp, o, 0);
-			hashmap_init(&add_lines, moved_entry_cmp, o, 0);
+			struct mem_pool entry_pool;
+			struct moved_entry_list *entry_list;
 
-			add_lines_to_move_detection(o, &add_lines, &del_lines);
-			mark_color_as_moved(o, &add_lines, &del_lines);
+			mem_pool_init(&entry_pool, 1024 * 1024);
+			entry_list = add_lines_to_move_detection(o,
+								 &entry_pool);
+			mark_color_as_moved(o, entry_list);
 			if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
 				dim_moved_lines(o);
 
-			hashmap_clear_and_free(&add_lines, struct moved_entry,
-						ent);
-			hashmap_clear_and_free(&del_lines, struct moved_entry,
-						ent);
+			mem_pool_discard(&entry_pool, 0);
+			free(entry_list);
 		}
 
 		for (i = 0; i < esm.nr; i++)
@@ -6921,19 +6866,15 @@ static char *run_textconv(struct repository *r,
 			  size_t *outsize)
 {
 	struct diff_tempfile *temp;
-	const char *argv[3];
-	const char **arg = argv;
 	struct child_process child = CHILD_PROCESS_INIT;
 	struct strbuf buf = STRBUF_INIT;
 	int err = 0;
 
 	temp = prepare_temp_file(r, spec->path, spec);
-	*arg++ = pgm;
-	*arg++ = temp->name;
-	*arg = NULL;
+	strvec_push(&child.args, pgm);
+	strvec_push(&child.args, temp->name);
 
 	child.use_shell = 1;
-	child.argv = argv;
 	child.out = -1;
 	if (start_command(&child)) {
 		remove_tempfile();
diff --git a/diffcore-delta.c b/diffcore-delta.c
index 5668ace60d..18d8f766d7 100644
--- a/diffcore-delta.c
+++ b/diffcore-delta.c
@@ -133,10 +133,10 @@ static struct spanhash_top *hash_chars(struct repository *r,
 
 	i = INITIAL_HASH_SIZE;
 	hash = xmalloc(st_add(sizeof(*hash),
-			      st_mult(sizeof(struct spanhash), 1<<i)));
+			      st_mult(sizeof(struct spanhash), (size_t)1 << i)));
 	hash->alloc_log2 = i;
 	hash->free = INITIAL_FREE(i);
-	memset(hash->data, 0, sizeof(struct spanhash) * (1<<i));
+	memset(hash->data, 0, sizeof(struct spanhash) * ((size_t)1 << i));
 
 	n = 0;
 	accum1 = accum2 = 0;
@@ -159,7 +159,7 @@ static struct spanhash_top *hash_chars(struct repository *r,
 		n = 0;
 		accum1 = accum2 = 0;
 	}
-	QSORT(hash->data, 1ul << hash->alloc_log2, spanhash_cmp);
+	QSORT(hash->data, (size_t)1ul << hash->alloc_log2, spanhash_cmp);
 	return hash;
 }
 
diff --git a/dir.c b/dir.c
index 5aa6fbad0b..d91295f2bc 100644
--- a/dir.c
+++ b/dir.c
@@ -727,7 +727,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
 	}
 
 	if (given->patternlen < 2 ||
-	    *given->pattern == '*' ||
+	    *given->pattern != '/' ||
 	    strstr(given->pattern, "**")) {
 		/* Not a cone pattern. */
 		warning(_("unrecognized pattern: '%s'"), given->pattern);
@@ -819,9 +819,7 @@ static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern
 		/* we already included this at the parent level */
 		warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
 			given->pattern);
-		hashmap_remove(&pl->parent_hashmap, &translated->ent, &data);
-		free(data);
-		free(translated);
+		goto clear_hashmaps;
 	}
 
 	return;
@@ -3160,6 +3158,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 	int ret = 0, original_len = path->len, len, kept_down = 0;
 	int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
 	int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
+	int purge_original_cwd = (flag & REMOVE_DIR_PURGE_ORIGINAL_CWD);
 	struct object_id submodule_head;
 
 	if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
@@ -3215,9 +3214,14 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 	closedir(dir);
 
 	strbuf_setlen(path, original_len);
-	if (!ret && !keep_toplevel && !kept_down)
-		ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
-	else if (kept_up)
+	if (!ret && !keep_toplevel && !kept_down) {
+		if (!purge_original_cwd &&
+		    startup_info->original_cwd &&
+		    !strcmp(startup_info->original_cwd, path->buf))
+			ret = -1; /* Do not remove current working directory */
+		else
+			ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
+	} else if (kept_up)
 		/*
 		 * report the uplevel that it is not an error that we
 		 * did not rmdir() our directory.
@@ -3283,6 +3287,9 @@ int remove_path(const char *name)
 		slash = dirs + (slash - name);
 		do {
 			*slash = '\0';
+			if (startup_info->original_cwd &&
+			    !strcmp(startup_info->original_cwd, dirs))
+				break;
 		} while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
 		free(dirs);
 	}
diff --git a/dir.h b/dir.h
index 83f46c0fb4..8e02dfb505 100644
--- a/dir.h
+++ b/dir.h
@@ -495,6 +495,9 @@ int get_sparse_checkout_patterns(struct pattern_list *pl);
 /* Remove the contents of path, but leave path itself. */
 #define REMOVE_DIR_KEEP_TOPLEVEL 04
 
+/* Remove the_original_cwd too */
+#define REMOVE_DIR_PURGE_ORIGINAL_CWD 0x08
+
 /*
  * Remove path and its contents, recursively. flags is a combination
  * of the above REMOVE_DIR_* constants. Return 0 on success.
@@ -504,7 +507,11 @@ int get_sparse_checkout_patterns(struct pattern_list *pl);
  */
 int remove_dir_recursively(struct strbuf *path, int flag);
 
-/* tries to remove the path with empty directories along it, ignores ENOENT */
+/*
+ * Tries to remove the path, along with leading empty directories so long as
+ * those empty directories are not startup_info->original_cwd.  Ignores
+ * ENOENT.
+ */
 int remove_path(const char *path);
 
 int fspathcmp(const char *a, const char *b);
diff --git a/editor.c b/editor.c
index fdd3eeafa9..8b9648281d 100644
--- a/editor.c
+++ b/editor.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "strbuf.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "sigchain.h"
 
@@ -55,7 +56,6 @@ static int launch_specified_editor(const char *editor, const char *path,
 
 	if (strcmp(editor, ":")) {
 		struct strbuf realpath = STRBUF_INIT;
-		const char *args[] = { editor, NULL, NULL };
 		struct child_process p = CHILD_PROCESS_INIT;
 		int ret, sig;
 		int print_waiting_for_editor = advice_enabled(ADVICE_WAITING_FOR_EDITOR) && isatty(2);
@@ -77,10 +77,10 @@ static int launch_specified_editor(const char *editor, const char *path,
 		}
 
 		strbuf_realpath(&realpath, path, 1);
-		args[1] = realpath.buf;
 
-		p.argv = args;
-		p.env = env;
+		strvec_pushl(&p.args, editor, realpath.buf, NULL);
+		if (env)
+			strvec_pushv(&p.env_array, (const char **)env);
 		p.use_shell = 1;
 		p.trace2_child_class = "editor";
 		if (start_command(&p) < 0) {
diff --git a/entry.c b/entry.c
index 9b0f968a70..1c9df62b30 100644
--- a/entry.c
+++ b/entry.c
@@ -82,11 +82,13 @@ static int create_file(const char *path, unsigned int mode)
 	return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
 }
 
-void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
+void *read_blob_entry(const struct cache_entry *ce, size_t *size)
 {
 	enum object_type type;
-	void *blob_data = read_object_file(&ce->oid, &type, size);
+	unsigned long ul;
+	void *blob_data = read_object_file(&ce->oid, &type, &ul);
 
+	*size = ul;
 	if (blob_data) {
 		if (type == OBJ_BLOB)
 			return blob_data;
@@ -271,7 +273,7 @@ static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca
 	int fd, ret, fstat_done = 0;
 	char *new_blob;
 	struct strbuf buf = STRBUF_INIT;
-	unsigned long size;
+	size_t size;
 	ssize_t wrote;
 	size_t newsize = 0;
 	struct stat st;
diff --git a/entry.h b/entry.h
index 2254c62727..252fd24c2e 100644
--- a/entry.h
+++ b/entry.h
@@ -52,7 +52,7 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
  */
 void unlink_entry(const struct cache_entry *ce);
 
-void *read_blob_entry(const struct cache_entry *ce, unsigned long *size);
+void *read_blob_entry(const struct cache_entry *ce, size_t *size);
 int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st);
 void update_ce_after_write(const struct checkout *state, struct cache_entry *ce,
 			   struct stat *st);
diff --git a/environment.c b/environment.c
index 9da7f3c1a1..fd0501e77a 100644
--- a/environment.c
+++ b/environment.c
@@ -17,6 +17,7 @@
 #include "commit.h"
 #include "strvec.h"
 #include "object-store.h"
+#include "tmp-objdir.h"
 #include "chdir-notify.h"
 #include "shallow.h"
 
@@ -42,6 +43,7 @@ const char *git_hooks_path;
 int zlib_compression_level = Z_BEST_SPEED;
 int pack_compression_level = Z_DEFAULT_COMPRESSION;
 int fsync_object_files;
+int use_fsync = -1;
 size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
 size_t delta_base_cache_limit = 96 * 1024 * 1024;
@@ -168,6 +170,10 @@ void setup_git_env(const char *git_dir)
 	args.graft_file = getenv_safe(&to_free, GRAFT_ENVIRONMENT);
 	args.index_file = getenv_safe(&to_free, INDEX_ENVIRONMENT);
 	args.alternate_db = getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT);
+	if (getenv(GIT_QUARANTINE_ENVIRONMENT)) {
+		args.disable_ref_updates = 1;
+	}
+
 	repo_set_gitdir(the_repository, git_dir, &args);
 	strvec_clear(&to_free);
 
@@ -331,10 +337,14 @@ static void update_relative_gitdir(const char *name,
 				   void *data)
 {
 	char *path = reparent_relative_path(old_cwd, new_cwd, get_git_dir());
+	struct tmp_objdir *tmp_objdir = tmp_objdir_unapply_primary_odb();
+
 	trace_printf_key(&trace_setup_key,
 			 "setup: move $GIT_DIR to '%s'",
 			 path);
 	set_git_dir_1(path);
+	if (tmp_objdir)
+		tmp_objdir_reapply_primary_odb(tmp_objdir, old_cwd, new_cwd);
 	free(path);
 }
 
diff --git a/fetch-pack.c b/fetch-pack.c
index a9604f35a3..dd6ec449f2 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -25,6 +25,7 @@
 #include "shallow.h"
 #include "commit-reach.h"
 #include "commit-graph.h"
+#include "sigchain.h"
 
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
@@ -296,7 +297,7 @@ static int find_common(struct fetch_negotiator *negotiator,
 	struct packet_reader reader;
 
 	if (args->stateless_rpc && multi_ack == 1)
-		die(_("--stateless-rpc requires multi_ack_detailed"));
+		die(_("the option '%s' requires '%s'"), "--stateless-rpc", "multi_ack_detailed");
 
 	packet_reader_init(&reader, fd[0], NULL, 0,
 			   PACKET_READ_CHOMP_NEWLINE |
@@ -956,6 +957,8 @@ static int get_pack(struct fetch_pack_args *args,
 			strvec_push(index_pack_args, cmd.args.v[i]);
 	}
 
+	sigchain_push(SIGPIPE, SIG_IGN);
+
 	cmd.in = demux.out;
 	cmd.git_cmd = 1;
 	if (start_command(&cmd))
@@ -986,6 +989,8 @@ static int get_pack(struct fetch_pack_args *args,
 	if (use_sideband && finish_async(&demux))
 		die(_("error in sideband demultiplexer"));
 
+	sigchain_pop(SIGPIPE);
+
 	/*
 	 * Now that index-pack has succeeded, write the promisor file using the
 	 * obtained .keep filename if necessary
@@ -1653,8 +1658,13 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 				receive_wanted_refs(&reader, sought, nr_sought);
 
 			/* get the pack(s) */
+			if (git_env_bool("GIT_TRACE_REDACT", 1))
+				reader.options |= PACKET_READ_REDACT_URI_PATH;
 			if (process_section_header(&reader, "packfile-uris", 1))
 				receive_packfile_uris(&reader, &packfile_uris);
+			/* We don't expect more URIs. Reset to avoid expensive URI check. */
+			reader.options &= ~PACKET_READ_REDACT_URI_PATH;
+
 			process_section_header(&reader, "packfile", 0);
 
 			/*
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 5216191488..baca57d5b6 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -533,14 +533,14 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
 		else {
 			buf = payload.buf;
 			len = payload.len;
-			if (check_signature(payload.buf, payload.len, sig.buf,
-					    sig.len, &sigc) &&
+			sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+			sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+			if (check_signature(&sigc, sig.buf, sig.len) &&
 			    !sigc.output)
 				strbuf_addstr(&sig, "gpg verification failed.\n");
 			else
 				strbuf_addstr(&sig, sigc.output);
 		}
-		signature_check_clear(&sigc);
 
 		if (!tag_number++) {
 			fmt_tag_signature(&tagbuf, &sig, buf, len);
@@ -564,6 +564,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
 		}
 		strbuf_release(&payload);
 		strbuf_release(&sig);
+		signature_check_clear(&sigc);
 	next:
 		free(origbuf);
 	}
@@ -649,12 +650,15 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 
 	memset(&merge_parents, 0, sizeof(merge_parents));
 
-	/* get current branch */
+	/* learn the commit that we merge into and the current branch name */
 	current_branch = current_branch_to_free =
 		resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL);
 	if (!current_branch)
 		die("No current branch");
-	if (starts_with(current_branch, "refs/heads/"))
+
+	if (opts->into_name)
+		current_branch = opts->into_name;
+	else if (starts_with(current_branch, "refs/heads/"))
 		current_branch += 11;
 
 	find_merge_parents(&merge_parents, in, &head_oid);
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index f2ab0e0085..99054042dc 100644
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -9,6 +9,7 @@ struct fmt_merge_msg_opts {
 	unsigned add_title:1,
 		credit_people:1;
 	int shortlog_len;
+	const char *into_name;
 };
 
 extern int merge_log_config;
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 9dbbb08e70..205541e0f7 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -6,37 +6,38 @@ die () {
 }
 
 command_list () {
-	eval "grep -ve '^#' $exclude_programs" <"$1"
-}
-
-get_categories () {
-	tr ' ' '\012'|
-	grep -v '^$' |
-	sort |
-	uniq
+	while read cmd rest
+	do
+		case "$cmd" in
+		"#"* | '')
+			# Ignore comments and allow empty lines
+			continue
+			;;
+		*)
+			case "$exclude_programs" in
+			*":$cmd:"*)
+				;;
+			*)
+				echo "$cmd $rest"
+				;;
+			esac
+		esac
+	done <"$1"
 }
 
 category_list () {
-	command_list "$1" |
-	cut -c 40- |
-	get_categories
-}
-
-get_synopsis () {
-	sed -n '
-		/^NAME/,/'"$1"'/H
-		${
-			x
-			s/.*'"$1"' - \(.*\)/N_("\1")/
-			p
-		}' "Documentation/$1.txt"
+	echo "$1" |
+	cut -d' ' -f2- |
+	tr ' ' '\012' |
+	grep -v '^$' |
+	LC_ALL=C sort -u
 }
 
 define_categories () {
 	echo
 	echo "/* Command categories */"
 	bit=0
-	category_list "$1" |
+	echo "$1" |
 	while read cat
 	do
 		echo "#define CAT_$cat (1UL << $bit)"
@@ -50,7 +51,7 @@ define_category_names () {
 	echo "/* Category names */"
 	echo "static const char *category_names[] = {"
 	bit=0
-	category_list "$1" |
+	echo "$1" |
 	while read cat
 	do
 		echo "	\"$cat\", /* (1UL << $bit) */"
@@ -63,27 +64,38 @@ define_category_names () {
 print_command_list () {
 	echo "static struct cmdname_help command_list[] = {"
 
-	command_list "$1" |
+	echo "$1" |
 	while read cmd rest
 	do
-		printf "	{ \"$cmd\", $(get_synopsis $cmd), 0"
-		for cat in $(echo "$rest" | get_categories)
+		synopsis=
+		while read line
 		do
-			printf " | CAT_$cat"
-		done
+			case "$line" in
+			"$cmd - "*)
+				synopsis=${line#$cmd - }
+				break
+				;;
+			esac
+		done <"Documentation/$cmd.txt"
+
+		printf '\t{ "%s", N_("%s"), 0' "$cmd" "$synopsis"
+		printf " | CAT_%s" $rest
 		echo " },"
 	done
 	echo "};"
 }
 
-exclude_programs=
+exclude_programs=:
 while test "--exclude-program" = "$1"
 do
 	shift
-	exclude_programs="$exclude_programs -e \"^$1 \""
+	exclude_programs="$exclude_programs$1:"
 	shift
 done
 
+commands="$(command_list "$1")"
+categories="$(category_list "$commands")"
+
 echo "/* Automatically generated by generate-cmdlist.sh */
 struct cmdname_help {
 	const char *name;
@@ -91,8 +103,8 @@ struct cmdname_help {
 	uint32_t category;
 };
 "
-define_categories "$1"
+define_categories "$categories"
 echo
-define_category_names "$1"
+define_category_names "$categories"
 echo
-print_command_list "$1"
+print_command_list "$commands"
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index bc3a1e8eff..95887fd8e5 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1175,15 +1175,17 @@ sub prompt_single_character {
 		ReadMode 'cbreak';
 		my $key = ReadKey 0;
 		ReadMode 'restore';
-		if ($use_termcap and $key eq "\e") {
-			while (!defined $term_escapes{$key}) {
-				my $next = ReadKey 0.5;
-				last if (!defined $next);
-				$key .= $next;
+		if (defined $key) {
+			if ($use_termcap and $key eq "\e") {
+				while (!defined $term_escapes{$key}) {
+					my $next = ReadKey 0.5;
+					last if (!defined $next);
+					$key .= $next;
+				}
+				$key =~ s/\e/^[/;
 			}
-			$key =~ s/\e/^[/;
+			print "$key";
 		}
-		print "$key" if defined $key;
 		print "\n";
 		return $key;
 	} else {
diff --git a/git-compat-util.h b/git-compat-util.h
index 4b57ae6f27..e30a374a84 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1,6 +1,19 @@
 #ifndef GIT_COMPAT_UTIL_H
 #define GIT_COMPAT_UTIL_H
 
+#if __STDC_VERSION__ - 0 < 199901L
+/*
+ * Git is in a testing period for mandatory C99 support in the compiler.  If
+ * your compiler is reasonably recent, you can try to enable C99 support (or,
+ * for MSVC, C11 support).  If you encounter a problem and can't enable C99
+ * support with your compiler (such as with "-std=gnu99") and don't have access
+ * to one with this support, such as GCC or Clang, you can remove this #if
+ * directive, but please report the details of your system to
+ * git@vger.kernel.org.
+ */
+#error "Required C99 support is in a test phase.  Please see git-compat-util.h for more details."
+#endif
+
 #ifdef USE_MSVC_CRTDBG
 /*
  * For these to work they must appear very early in each
@@ -33,14 +46,23 @@
 /*
  * See if our compiler is known to support flexible array members.
  */
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && (!defined(__SUNPRO_C) || (__SUNPRO_C > 0x580))
-# define FLEX_ARRAY /* empty */
+
+/*
+ * Check vendor specific quirks first, before checking the
+ * __STDC_VERSION__, as vendor compilers can lie and we need to be
+ * able to work them around.  Note that by not defining FLEX_ARRAY
+ * here, we can fall back to use the "safer but a bit wasteful" one
+ * later.
+ */
+#if defined(__SUNPRO_C) && (__SUNPRO_C <= 0x580)
 #elif defined(__GNUC__)
 # if (__GNUC__ >= 3)
 #  define FLEX_ARRAY /* empty */
 # else
 #  define FLEX_ARRAY 0 /* older GNU extension */
 # endif
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+# define FLEX_ARRAY /* empty */
 #endif
 
 /*
@@ -113,6 +135,14 @@
 #define unsigned_mult_overflows(a, b) \
     ((a) && (b) > maximum_unsigned_value_of_type(a) / (a))
 
+/*
+ * Returns true if the left shift of "a" by "shift" bits will
+ * overflow. The type of "a" must be unsigned.
+ */
+#define unsigned_left_shift_overflows(a, shift) \
+    ((shift) < bitsizeof(a) && \
+     (a) > maximum_unsigned_value_of_type(a) >> (shift))
+
 #ifdef __GNUC__
 #define TYPEOF(x) (__typeof__(x))
 #else
@@ -480,11 +510,12 @@ static inline int git_has_dir_sep(const char *path)
 struct strbuf;
 
 /* General helper functions */
-void vreportf(const char *prefix, const char *err, va_list params);
 NORETURN void usage(const char *err);
 NORETURN void usagef(const char *err, ...) __attribute__((format (printf, 1, 2)));
 NORETURN void die(const char *err, ...) __attribute__((format (printf, 1, 2)));
 NORETURN void die_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
+int die_message(const char *err, ...) __attribute__((format (printf, 1, 2)));
+int die_message_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
 int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
 int error_errno(const char *err, ...) __attribute__((format (printf, 1, 2)));
 void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
@@ -519,6 +550,7 @@ static inline int const_error(void)
 typedef void (*report_fn)(const char *, va_list params);
 
 void set_die_routine(NORETURN_PTR report_fn routine);
+report_fn get_die_message_routine(void);
 void set_error_routine(report_fn routine);
 report_fn get_error_routine(void);
 void set_warn_routine(report_fn routine);
@@ -743,7 +775,7 @@ char *gitmkdtemp(char *);
 
 #ifdef NO_UNSETENV
 #define unsetenv gitunsetenv
-void gitunsetenv(const char *);
+int gitunsetenv(const char *);
 #endif
 
 #ifdef NO_STRCASESTR
@@ -876,6 +908,23 @@ static inline size_t st_sub(size_t a, size_t b)
 	return a - b;
 }
 
+static inline size_t st_left_shift(size_t a, unsigned shift)
+{
+	if (unsigned_left_shift_overflows(a, shift))
+		die("size_t overflow: %"PRIuMAX" << %u",
+		    (uintmax_t)a, shift);
+	return a << shift;
+}
+
+static inline unsigned long cast_size_t_to_ulong(size_t a)
+{
+	if (a != (unsigned long)a)
+		die("object too large to read on this platform: %"
+		    PRIuMAX" is cut off to %lu",
+		    (uintmax_t)a, (unsigned long)a);
+	return (unsigned long)a;
+}
+
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 # define xalloca(size)      (alloca(size))
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 64319bed43..4c8118010a 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -3607,6 +3607,22 @@ package GITCVS::updater;
 use strict;
 use warnings;
 use DBI;
+our $_use_fsync;
+
+# n.b. consider using Git.pm
+sub use_fsync {
+    if (!defined($_use_fsync)) {
+        my $x = $ENV{GIT_TEST_FSYNC};
+        if (defined $x) {
+            local $ENV{GIT_CONFIG};
+            delete $ENV{GIT_CONFIG};
+            my $v = ::safe_pipe_capture('git', '-c', "test.fsync=$x",
+                                        qw(config --type=bool test.fsync));
+            $_use_fsync = defined($v) ? ($v eq "true\n") : 1;
+        }
+    }
+    $_use_fsync;
+}
 
 =head1 METHODS
 
@@ -3676,6 +3692,9 @@ sub new
                                 $self->{dbuser},
                                 $self->{dbpass});
     die "Error connecting to database\n" unless defined $self->{dbh};
+    if ($self->{dbdriver} eq 'SQLite' && !use_fsync()) {
+        $self->{dbh}->do('PRAGMA synchronous = OFF');
+    }
 
     $self->{tables} = {};
     foreach my $table ( keys %{$self->{dbh}->table_info(undef,undef,undef,'TABLE')->fetchall_hashref('TABLE_NAME')} )
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index cb89372813..3a51d4507c 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -579,7 +579,7 @@ if [ "$filter_tag_name" ]; then
 				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
+			   grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
 			then
 				warn "gpg signature stripped from tag object $sha1t"
 			fi
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 7c55229773..4349566c89 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -49,7 +49,7 @@ resolve_full_httpd () {
 	*apache2*|*lighttpd*|*httpd*)
 		# yes, *httpd* covers *lighttpd* above, but it is there for clarity
 		# ensure that the apache2/lighttpd command ends with "-f"
-		if ! echo "$httpd" | sane_grep -- '-f *$' >/dev/null 2>&1
+		if ! echo "$httpd" | grep -- '-f *$' >/dev/null 2>&1
 		then
 			httpd="$httpd -f"
 		fi
@@ -380,10 +380,7 @@ TypesConfig "$fqgitdir/mime.types"
 DirectoryIndex gitweb.cgi
 EOF
 
-	# check to see if Dennis Stosberg's mod_perl compatibility patch
-	# (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied
-	if test -f "$module_path/mod_perl.so" &&
-	   sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null
+	if test -f "$module_path/mod_perl.so"
 	then
 		# favor mod_perl if available
 		cat >> "$conf" <<EOF
@@ -402,7 +399,7 @@ EOF
 		# plain-old CGI
 		resolve_full_httpd
 		list_mods=$(echo "$full_httpd" | sed 's/-f$/-l/')
-		$list_mods | sane_grep 'mod_cgi\.c' >/dev/null 2>&1 || \
+		$list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
 		if test -f "$module_path/mod_cgi.so"
 		then
 			echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
diff --git a/git-p4.py b/git-p4.py
index 2b4500226a..cb37545455 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -56,6 +56,21 @@ defaultBlockSize = 1<<20
 
 p4_access_checked = False
 
+re_ko_keywords = re.compile(br'\$(Id|Header)(:[^$\n]+)?\$')
+re_k_keywords = re.compile(br'\$(Id|Header|Author|Date|DateTime|Change|File|Revision)(:[^$\n]+)?\$')
+
+def format_size_human_readable(num):
+    """ Returns a number of units (typically bytes) formatted as a human-readable
+        string.
+    """
+    if num < 1024:
+        return '{:d} B'.format(num)
+    for unit in ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"]:
+        num /= 1024.0
+        if num < 1024.0:
+            return "{:3.1f} {}B".format(num, unit)
+    return "{:.1f} YiB".format(num)
+
 def p4_build_cmd(cmd):
     """Build a suitable p4 command line.
 
@@ -337,17 +352,19 @@ def p4_read_pipe(c, ignore_error=False, raw=False):
     real_cmd = p4_build_cmd(c)
     return read_pipe(real_cmd, ignore_error, raw=raw)
 
-def read_pipe_lines(c):
+def read_pipe_lines(c, raw=False):
     if verbose:
         sys.stderr.write('Reading pipe: %s\n' % str(c))
 
     expand = not isinstance(c, list)
     p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
     pipe = p.stdout
-    val = [decode_text_stream(line) for line in pipe.readlines()]
+    lines = pipe.readlines()
+    if not raw:
+        lines = [decode_text_stream(line) for line in lines]
     if pipe.close() or p.wait():
         die('Command failed: %s' % str(c))
-    return val
+    return lines
 
 def p4_read_pipe_lines(c):
     """Specifically invoke p4 on the command supplied. """
@@ -577,20 +594,12 @@ def p4_type(f):
 #
 def p4_keywords_regexp_for_type(base, type_mods):
     if base in ("text", "unicode", "binary"):
-        kwords = None
         if "ko" in type_mods:
-            kwords = 'Id|Header'
+            return re_ko_keywords
         elif "k" in type_mods:
-            kwords = 'Id|Header|Author|Date|DateTime|Change|File|Revision'
+            return re_k_keywords
         else:
             return None
-        pattern = r"""
-            \$              # Starts with a dollar, followed by...
-            (%s)            # one of the keywords, followed by...
-            (:[^$\n]+)?     # possibly an old expansion, followed by...
-            \$              # another dollar
-            """ % kwords
-        return pattern
     else:
         return None
 
@@ -1532,80 +1541,6 @@ class P4UserMap:
         except IOError:
             self.getUserMapFromPerforceServer()
 
-class P4Debug(Command):
-    def __init__(self):
-        Command.__init__(self)
-        self.options = []
-        self.description = "A tool to debug the output of p4 -G."
-        self.needsGit = False
-
-    def run(self, args):
-        j = 0
-        for output in p4CmdList(args):
-            print('Element: %d' % j)
-            j += 1
-            print(output)
-        return True
-
-class P4RollBack(Command):
-    def __init__(self):
-        Command.__init__(self)
-        self.options = [
-            optparse.make_option("--local", dest="rollbackLocalBranches", action="store_true")
-        ]
-        self.description = "A tool to debug the multi-branch import. Don't use :)"
-        self.rollbackLocalBranches = False
-
-    def run(self, args):
-        if len(args) != 1:
-            return False
-        maxChange = int(args[0])
-
-        if "p4ExitCode" in p4Cmd("changes -m 1"):
-            die("Problems executing p4");
-
-        if self.rollbackLocalBranches:
-            refPrefix = "refs/heads/"
-            lines = read_pipe_lines("git rev-parse --symbolic --branches")
-        else:
-            refPrefix = "refs/remotes/"
-            lines = read_pipe_lines("git rev-parse --symbolic --remotes")
-
-        for line in lines:
-            if self.rollbackLocalBranches or (line.startswith("p4/") and line != "p4/HEAD\n"):
-                line = line.strip()
-                ref = refPrefix + line
-                log = extractLogMessageFromGitCommit(ref)
-                settings = extractSettingsGitLog(log)
-
-                depotPaths = settings['depot-paths']
-                change = settings['change']
-
-                changed = False
-
-                if len(p4Cmd("changes -m 1 "  + ' '.join (['%s...@%s' % (p, maxChange)
-                                                           for p in depotPaths]))) == 0:
-                    print("Branch %s did not exist at change %s, deleting." % (ref, maxChange))
-                    system("git update-ref -d %s `git rev-parse %s`" % (ref, ref))
-                    continue
-
-                while change and int(change) > maxChange:
-                    changed = True
-                    if self.verbose:
-                        print("%s is at %s ; rewinding towards %s" % (ref, change, maxChange))
-                    system("git update-ref %s \"%s^\"" % (ref, ref))
-                    log = extractLogMessageFromGitCommit(ref)
-                    settings =  extractSettingsGitLog(log)
-
-
-                    depotPaths = settings['depot-paths']
-                    change = settings['change']
-
-                if changed:
-                    print("%s rewound to %s" % (ref, change))
-
-        return True
-
 class P4Submit(Command, P4UserMap):
 
     conflict_behavior_choices = ("ask", "skip", "quit")
@@ -1753,18 +1688,13 @@ class P4Submit(Command, P4UserMap):
 
         return result
 
-    def patchRCSKeywords(self, file, pattern):
-        # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern
+    def patchRCSKeywords(self, file, regexp):
+        # Attempt to zap the RCS keywords in a p4 controlled file matching the given regex
         (handle, outFileName) = tempfile.mkstemp(dir='.')
         try:
-            outFile = os.fdopen(handle, "w+")
-            inFile = open(file, "r")
-            regexp = re.compile(pattern, re.VERBOSE)
-            for line in inFile.readlines():
-                line = regexp.sub(r'$\1$', line)
-                outFile.write(line)
-            inFile.close()
-            outFile.close()
+            with os.fdopen(handle, "wb") as outFile, open(file, "rb") as inFile:
+                for line in inFile.readlines():
+                    outFile.write(regexp.sub(br'$\1$', line))
             # Forcibly overwrite the original file
             os.unlink(file)
             shutil.move(outFileName, file)
@@ -2091,25 +2021,24 @@ class P4Submit(Command, P4UserMap):
             # the patch to see if that's possible.
             if gitConfigBool("git-p4.attemptRCSCleanup"):
                 file = None
-                pattern = None
                 kwfiles = {}
                 for file in editedFiles | filesToDelete:
                     # did this file's delta contain RCS keywords?
-                    pattern = p4_keywords_regexp_for_file(file)
-
-                    if pattern:
+                    regexp = p4_keywords_regexp_for_file(file)
+                    if regexp:
                         # this file is a possibility...look for RCS keywords.
-                        regexp = re.compile(pattern, re.VERBOSE)
-                        for line in read_pipe_lines(["git", "diff", "%s^..%s" % (id, id), file]):
+                        for line in read_pipe_lines(
+                            ["git", "diff", "%s^..%s" % (id, id), file],
+                            raw=True):
                             if regexp.search(line):
                                 if verbose:
-                                    print("got keyword match on %s in %s in %s" % (pattern, line, file))
-                                kwfiles[file] = pattern
+                                    print("got keyword match on %s in %s in %s" % (regex.pattern, line, file))
+                                kwfiles[file] = regexp
                                 break
 
-                for file in kwfiles:
+                for file, regexp in kwfiles.items():
                     if verbose:
-                        print("zapping %s with %s" % (line,pattern))
+                        print("zapping %s with %s" % (line, regexp.pattern))
                     # File is being deleted, so not open in p4.  Must
                     # disable the read-only bit on windows.
                     if self.isWindows and file not in editedFiles:
@@ -2966,7 +2895,8 @@ class P4Sync(Command, P4UserMap):
                 size = int(self.stream_file['fileSize'])
             else:
                 size = 0 # deleted files don't get a fileSize apparently
-            sys.stdout.write('\r%s --> %s (%i MB)\n' % (file_path, relPath, size/1024/1024))
+            sys.stdout.write('\r%s --> %s (%s)\n' % (
+                file_path, relPath, format_size_human_readable(size)))
             sys.stdout.flush()
 
         (type_base, type_mods) = split_p4_type(file["type"])
@@ -3029,12 +2959,9 @@ class P4Sync(Command, P4UserMap):
 
         # Note that we do not try to de-mangle keywords on utf16 files,
         # even though in theory somebody may want that.
-        pattern = p4_keywords_regexp_for_type(type_base, type_mods)
-        if pattern:
-            regexp = re.compile(pattern, re.VERBOSE)
-            text = ''.join(decode_text_stream(c) for c in contents)
-            text = regexp.sub(r'$\1$', text)
-            contents = [ encode_text_stream(text) ]
+        regexp = p4_keywords_regexp_for_type(type_base, type_mods)
+        if regexp:
+            contents = [regexp.sub(br'$\1$', c) for c in contents]
 
         if self.largeFileSystem:
             (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
@@ -3064,9 +2991,8 @@ class P4Sync(Command, P4UserMap):
         if not err and 'fileSize' in self.stream_file:
             required_bytes = int((4 * int(self.stream_file["fileSize"])) - calcDiskFree())
             if required_bytes > 0:
-                err = 'Not enough space left on %s! Free at least %i MB.' % (
-                    os.getcwd(), required_bytes/1024/1024
-                )
+                err = 'Not enough space left on %s! Free at least %s.' % (
+                    os.getcwd(), format_size_human_readable(required_bytes))
 
         if err:
             f = None
@@ -3110,7 +3036,9 @@ class P4Sync(Command, P4UserMap):
             size = int(self.stream_file["fileSize"])
             if size > 0:
                 progress = 100*self.stream_file['streamContentSize']/size
-                sys.stdout.write('\r%s %d%% (%i MB)' % (self.stream_file['depotFile'], progress, int(size/1024/1024)))
+                sys.stdout.write('\r%s %d%% (%s)' % (
+                    self.stream_file['depotFile'], progress,
+                    format_size_human_readable(size)))
                 sys.stdout.flush()
 
         self.stream_have_file_info = True
@@ -3623,7 +3551,8 @@ class P4Sync(Command, P4UserMap):
             self.updateOptionDict(description)
 
             if not self.silent:
-                sys.stdout.write("\rImporting revision %s (%s%%)" % (change, cnt * 100 / len(changes)))
+                sys.stdout.write("\rImporting revision %s (%d%%)" % (
+                    change, (cnt * 100) // len(changes)))
                 sys.stdout.flush()
             cnt = cnt + 1
 
@@ -4363,13 +4292,11 @@ def printUsage(commands):
     print("")
 
 commands = {
-    "debug" : P4Debug,
     "submit" : P4Submit,
     "commit" : P4Submit,
     "sync" : P4Sync,
     "rebase" : P4Rebase,
     "clone" : P4Clone,
-    "rollback" : P4RollBack,
     "branches" : P4Branches,
     "unshelve" : P4Unshelve,
 }
diff --git a/git-send-email.perl b/git-send-email.perl
index 5262d88ee3..04087221aa 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -40,7 +40,8 @@ package main;
 
 sub usage {
 	print <<EOT;
-git send-email [options] <file | directory | rev-list options >
+git send-email' [<options>] <file|directory>
+git send-email' [<options>] <format-patch options>
 git send-email --dump-aliases
 
   Composing:
@@ -113,9 +114,38 @@ EOT
 	exit(1);
 }
 
+sub uniq {
+	my %seen;
+	grep !$seen{$_}++, @_;
+}
+
 sub completion_helper {
-    print Git::command('format-patch', '--git-completion-helper');
-    exit(0);
+	my ($original_opts) = @_;
+	my %not_for_completion = (
+		"git-completion-helper" => undef,
+		"h" => undef,
+	);
+	my @send_email_opts = ();
+
+	foreach my $key (keys %$original_opts) {
+		unless (exists $not_for_completion{$key}) {
+			$key =~ s/!$//;
+
+			if ($key =~ /[:=][si]$/) {
+				$key =~ s/[:=][si]$//;
+				push (@send_email_opts, "--$_=") foreach (split (/\|/, $key));
+			} else {
+				push (@send_email_opts, "--$_") foreach (split (/\|/, $key));
+			}
+		}
+	}
+
+	my @format_patch_opts = split(/ /, Git::command('format-patch', '--git-completion-helper'));
+	my @opts = (@send_email_opts, @format_patch_opts);
+	@opts = uniq (grep !/^$/, @opts);
+	# There's an implicit '\n' here already, no need to add an explicit one.
+	print "@opts";
+	exit(0);
 }
 
 # most mail servers generate the Date: header, but not all...
@@ -425,10 +455,11 @@ my %known_config_keys;
 	my $key = "sendemail.identity";
 	$identity = Git::config(@repo, $key) if exists $known_config_keys{$key};
 }
-my $rc = GetOptions(
+my %identity_options = (
 	"identity=s" => \$identity,
 	"no-identity" => \$no_identity,
 );
+my $rc = GetOptions(%identity_options);
 usage() unless $rc;
 undef $identity if $no_identity;
 
@@ -444,14 +475,17 @@ undef $identity if $no_identity;
 
 my $help;
 my $git_completion_helper;
-$rc = GetOptions("h" => \$help,
-                 "dump-aliases" => \$dump_aliases);
+my %dump_aliases_options = (
+	"h" => \$help,
+	"dump-aliases" => \$dump_aliases,
+);
+$rc = GetOptions(%dump_aliases_options);
 usage() unless $rc;
 die __("--dump-aliases incompatible with other options\n")
     if !$help and $dump_aliases and @ARGV;
-$rc = GetOptions(
+my %options = (
 		    "sender|from=s" => \$sender,
-                    "in-reply-to=s" => \$initial_in_reply_to,
+		    "in-reply-to=s" => \$initial_in_reply_to,
 		    "reply-to=s" => \$reply_to,
 		    "subject=s" => \$initial_subject,
 		    "to=s" => \@getopt_to,
@@ -508,7 +542,8 @@ $rc = GetOptions(
 		    "batch-size=i" => \$batch_size,
 		    "relogin-delay=i" => \$relogin_delay,
 		    "git-completion-helper" => \$git_completion_helper,
-	 );
+);
+$rc = GetOptions(%options);
 
 # Munge any "either config or getopt, not both" variables
 my @initial_to = @getopt_to ? @getopt_to : ($no_to ? () : @config_to);
@@ -516,7 +551,8 @@ my @initial_cc = @getopt_cc ? @getopt_cc : ($no_cc ? () : @config_cc);
 my @initial_bcc = @getopt_bcc ? @getopt_bcc : ($no_bcc ? () : @config_bcc);
 
 usage() if $help;
-completion_helper() if $git_completion_helper;
+my %all_options = (%options, %dump_aliases_options, %identity_options);
+completion_helper(\%all_options) if $git_completion_helper;
 unless ($rc) {
     usage();
 }
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 960982f9d5..b93f39288c 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -173,14 +173,6 @@ git_pager() {
 	eval "$GIT_PAGER" '"$@"'
 }
 
-sane_grep () {
-	GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@"
-}
-
-sane_egrep () {
-	GREP_OPTIONS= LC_ALL=C egrep @@SANE_TEXT_GREP@@ "$@"
-}
-
 is_bare_repository () {
 	git rev-parse --is-bare-repository
 }
diff --git a/git.c b/git.c
index 5ff21be21f..edda922ce6 100644
--- a/git.c
+++ b/git.c
@@ -185,7 +185,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "--git-dir")) {
 			if (*argc < 2) {
-				fprintf(stderr, _("no directory given for --git-dir\n" ));
+				fprintf(stderr, _("no directory given for '%s' option\n" ), "--git-dir");
 				usage(git_usage_string);
 			}
 			setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1);
@@ -213,7 +213,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "--work-tree")) {
 			if (*argc < 2) {
-				fprintf(stderr, _("no directory given for --work-tree\n" ));
+				fprintf(stderr, _("no directory given for '%s' option\n" ), "--work-tree");
 				usage(git_usage_string);
 			}
 			setenv(GIT_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);
@@ -297,7 +297,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				*envchanged = 1;
 		} else if (!strcmp(cmd, "-C")) {
 			if (*argc < 2) {
-				fprintf(stderr, _("no directory given for -C\n" ));
+				fprintf(stderr, _("no directory given for '%s' option\n" ), "-C");
 				usage(git_usage_string);
 			}
 			if ((*argv)[1][0]) {
@@ -421,27 +421,30 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	int status, help;
 	struct stat st;
 	const char *prefix;
+	int run_setup = (p->option & (RUN_SETUP | RUN_SETUP_GENTLY));
 
-	prefix = NULL;
 	help = argc == 2 && !strcmp(argv[1], "-h");
-	if (!help) {
-		if (p->option & RUN_SETUP)
-			prefix = setup_git_directory();
-		else if (p->option & RUN_SETUP_GENTLY) {
-			int nongit_ok;
-			prefix = setup_git_directory_gently(&nongit_ok);
-		}
-		precompose_argv_prefix(argc, argv, NULL);
-		if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY) &&
-		    !(p->option & DELAY_PAGER_CONFIG))
-			use_pager = check_pager_config(p->cmd);
-		if (use_pager == -1 && p->option & USE_PAGER)
-			use_pager = 1;
-
-		if ((p->option & (RUN_SETUP | RUN_SETUP_GENTLY)) &&
-		    startup_info->have_repository) /* get_git_dir() may set up repo, avoid that */
-			trace_repo_setup(prefix);
+	if (help && (run_setup & RUN_SETUP))
+		/* demote to GENTLY to allow 'git cmd -h' outside repo */
+		run_setup = RUN_SETUP_GENTLY;
+
+	if (run_setup & RUN_SETUP) {
+		prefix = setup_git_directory();
+	} else if (run_setup & RUN_SETUP_GENTLY) {
+		int nongit_ok;
+		prefix = setup_git_directory_gently(&nongit_ok);
+	} else {
+		prefix = NULL;
 	}
+	precompose_argv_prefix(argc, argv, NULL);
+	if (use_pager == -1 && run_setup &&
+		!(p->option & DELAY_PAGER_CONFIG))
+		use_pager = check_pager_config(p->cmd);
+	if (use_pager == -1 && p->option & USE_PAGER)
+		use_pager = 1;
+	if (run_setup && startup_info->have_repository)
+		/* get_git_dir() may set up repo, avoid that */
+		trace_repo_setup(prefix);
 	commit_pager_choice();
 
 	if (!help && get_super_prefix()) {
diff --git a/gpg-interface.c b/gpg-interface.c
index 3e7255a2a9..b52eb0e2e0 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -19,8 +19,8 @@ struct gpg_format {
 	const char **verify_args;
 	const char **sigs;
 	int (*verify_signed_buffer)(struct signature_check *sigc,
-				    struct gpg_format *fmt, const char *payload,
-				    size_t payload_size, const char *signature,
+				    struct gpg_format *fmt,
+				    const char *signature,
 				    size_t signature_size);
 	int (*sign_buffer)(struct strbuf *buffer, struct strbuf *signature,
 			   const char *signing_key);
@@ -53,12 +53,12 @@ static const char *ssh_sigs[] = {
 };
 
 static int verify_gpg_signed_buffer(struct signature_check *sigc,
-				    struct gpg_format *fmt, const char *payload,
-				    size_t payload_size, const char *signature,
+				    struct gpg_format *fmt,
+				    const char *signature,
 				    size_t signature_size);
 static int verify_ssh_signed_buffer(struct signature_check *sigc,
-				    struct gpg_format *fmt, const char *payload,
-				    size_t payload_size, const char *signature,
+				    struct gpg_format *fmt,
+				    const char *signature,
 				    size_t signature_size);
 static int sign_buffer_gpg(struct strbuf *buffer, struct strbuf *signature,
 			   const char *signing_key);
@@ -314,8 +314,8 @@ error:
 }
 
 static int verify_gpg_signed_buffer(struct signature_check *sigc,
-				    struct gpg_format *fmt, const char *payload,
-				    size_t payload_size, const char *signature,
+				    struct gpg_format *fmt,
+				    const char *signature,
 				    size_t signature_size)
 {
 	struct child_process gpg = CHILD_PROCESS_INIT;
@@ -343,14 +343,13 @@ static int verify_gpg_signed_buffer(struct signature_check *sigc,
 		     NULL);
 
 	sigchain_push(SIGPIPE, SIG_IGN);
-	ret = pipe_command(&gpg, payload, payload_size, &gpg_stdout, 0,
+	ret = pipe_command(&gpg, sigc->payload, sigc->payload_len, &gpg_stdout, 0,
 			   &gpg_stderr, 0);
 	sigchain_pop(SIGPIPE);
 
 	delete_tempfile(&temp);
 
 	ret |= !strstr(gpg_stdout.buf, "\n[GNUPG:] GOODSIG ");
-	sigc->payload = xmemdupz(payload, payload_size);
 	sigc->output = strbuf_detach(&gpg_stderr, NULL);
 	sigc->gpg_status = strbuf_detach(&gpg_stdout, NULL);
 
@@ -426,8 +425,8 @@ cleanup:
 }
 
 static int verify_ssh_signed_buffer(struct signature_check *sigc,
-				    struct gpg_format *fmt, const char *payload,
-				    size_t payload_size, const char *signature,
+				    struct gpg_format *fmt,
+				    const char *signature,
 				    size_t signature_size)
 {
 	struct child_process ssh_keygen = CHILD_PROCESS_INIT;
@@ -440,6 +439,13 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
 	struct strbuf ssh_principals_err = STRBUF_INIT;
 	struct strbuf ssh_keygen_out = STRBUF_INIT;
 	struct strbuf ssh_keygen_err = STRBUF_INIT;
+	struct strbuf verify_time = STRBUF_INIT;
+	const struct date_mode verify_date_mode = {
+		.type = DATE_STRFTIME,
+		.strftime_fmt = "%Y%m%d%H%M%S",
+		/* SSH signing key validity has no timezone information - Use the local timezone */
+		.local = 1,
+	};
 
 	if (!ssh_allowed_signers) {
 		error(_("gpg.ssh.allowedSignersFile needs to be configured and exist for ssh signature verification"));
@@ -457,11 +463,16 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
 		return -1;
 	}
 
+	if (sigc->payload_timestamp)
+		strbuf_addf(&verify_time, "-Overify-time=%s",
+			show_date(sigc->payload_timestamp, 0, &verify_date_mode));
+
 	/* Find the principal from the signers */
 	strvec_pushl(&ssh_keygen.args, fmt->program,
 		     "-Y", "find-principals",
 		     "-f", ssh_allowed_signers,
 		     "-s", buffer_file->filename.buf,
+		     verify_time.buf,
 		     NULL);
 	ret = pipe_command(&ssh_keygen, NULL, 0, &ssh_principals_out, 0,
 			   &ssh_principals_err, 0);
@@ -479,8 +490,9 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
 			     "-Y", "check-novalidate",
 			     "-n", "git",
 			     "-s", buffer_file->filename.buf,
+			     verify_time.buf,
 			     NULL);
-		pipe_command(&ssh_keygen, payload, payload_size,
+		pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len,
 				   &ssh_keygen_out, 0, &ssh_keygen_err, 0);
 
 		/*
@@ -513,6 +525,7 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
 				     "-f", ssh_allowed_signers,
 				     "-I", principal,
 				     "-s", buffer_file->filename.buf,
+				     verify_time.buf,
 				     NULL);
 
 			if (ssh_revocation_file) {
@@ -526,7 +539,7 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
 			}
 
 			sigchain_push(SIGPIPE, SIG_IGN);
-			ret = pipe_command(&ssh_keygen, payload, payload_size,
+			ret = pipe_command(&ssh_keygen, sigc->payload, sigc->payload_len,
 					   &ssh_keygen_out, 0, &ssh_keygen_err, 0);
 			sigchain_pop(SIGPIPE);
 
@@ -540,7 +553,6 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc,
 		}
 	}
 
-	sigc->payload = xmemdupz(payload, payload_size);
 	strbuf_stripspace(&ssh_keygen_out, 0);
 	strbuf_stripspace(&ssh_keygen_err, 0);
 	/* Add stderr outputs to show the user actual ssh-keygen errors */
@@ -558,12 +570,48 @@ out:
 	strbuf_release(&ssh_principals_err);
 	strbuf_release(&ssh_keygen_out);
 	strbuf_release(&ssh_keygen_err);
+	strbuf_release(&verify_time);
 
 	return ret;
 }
 
-int check_signature(const char *payload, size_t plen, const char *signature,
-	size_t slen, struct signature_check *sigc)
+static int parse_payload_metadata(struct signature_check *sigc)
+{
+	const char *ident_line = NULL;
+	size_t ident_len;
+	struct ident_split ident;
+	const char *signer_header;
+
+	switch (sigc->payload_type) {
+	case SIGNATURE_PAYLOAD_COMMIT:
+		signer_header = "committer";
+		break;
+	case SIGNATURE_PAYLOAD_TAG:
+		signer_header = "tagger";
+		break;
+	case SIGNATURE_PAYLOAD_UNDEFINED:
+	case SIGNATURE_PAYLOAD_PUSH_CERT:
+		/* Ignore payloads we don't want to parse */
+		return 0;
+	default:
+		BUG("invalid value for sigc->payload_type");
+	}
+
+	ident_line = find_commit_header(sigc->payload, signer_header, &ident_len);
+	if (!ident_line || !ident_len)
+		return 1;
+
+	if (split_ident_line(&ident, ident_line, ident_len))
+		return 1;
+
+	if (!sigc->payload_timestamp && ident.date_begin && ident.date_end)
+		sigc->payload_timestamp = parse_timestamp(ident.date_begin, NULL, 10);
+
+	return 0;
+}
+
+int check_signature(struct signature_check *sigc,
+		    const char *signature, size_t slen)
 {
 	struct gpg_format *fmt;
 	int status;
@@ -575,8 +623,10 @@ int check_signature(const char *payload, size_t plen, const char *signature,
 	if (!fmt)
 		die(_("bad/incompatible signature '%s'"), signature);
 
-	status = fmt->verify_signed_buffer(sigc, fmt, payload, plen, signature,
-					   slen);
+	if (parse_payload_metadata(sigc))
+		return 1;
+
+	status = fmt->verify_signed_buffer(sigc, fmt, signature, slen);
 
 	if (status && !sigc->output)
 		return !!status;
@@ -593,7 +643,7 @@ void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
 							    sigc->output;
 
 	if (flags & GPG_VERIFY_VERBOSE && sigc->payload)
-		fputs(sigc->payload, stdout);
+		fwrite(sigc->payload, 1, sigc->payload_len, stdout);
 
 	if (output)
 		fputs(output, stderr);
@@ -707,6 +757,21 @@ int git_gpg_config(const char *var, const char *value, void *cb)
 	return 0;
 }
 
+/*
+ * Returns 1 if `string` contains a literal ssh key, 0 otherwise
+ * `key` will be set to the start of the actual key if a prefix is present.
+ */
+static int is_literal_ssh_key(const char *string, const char **key)
+{
+	if (skip_prefix(string, "key::", key))
+		return 1;
+	if (starts_with(string, "ssh-")) {
+		*key = string;
+		return 1;
+	}
+	return 0;
+}
+
 static char *get_ssh_key_fingerprint(const char *signing_key)
 {
 	struct child_process ssh_keygen = CHILD_PROCESS_INIT;
@@ -714,15 +779,16 @@ static char *get_ssh_key_fingerprint(const char *signing_key)
 	struct strbuf fingerprint_stdout = STRBUF_INIT;
 	struct strbuf **fingerprint;
 	char *fingerprint_ret;
+	const char *literal_key = NULL;
 
 	/*
 	 * With SSH Signing this can contain a filename or a public key
 	 * For textual representation we usually want a fingerprint
 	 */
-	if (starts_with(signing_key, "ssh-")) {
+	if (is_literal_ssh_key(signing_key, &literal_key)) {
 		strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf", "-", NULL);
-		ret = pipe_command(&ssh_keygen, signing_key,
-				   strlen(signing_key), &fingerprint_stdout, 0,
+		ret = pipe_command(&ssh_keygen, literal_key,
+				   strlen(literal_key), &fingerprint_stdout, 0,
 				   NULL, 0);
 	} else {
 		strvec_pushl(&ssh_keygen.args, "ssh-keygen", "-lf",
@@ -757,6 +823,7 @@ static const char *get_default_ssh_signing_key(void)
 	const char **argv;
 	int n;
 	char *default_key = NULL;
+	const char *literal_key = NULL;
 
 	if (!ssh_default_key_command)
 		die(_("either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"));
@@ -774,7 +841,11 @@ static const char *get_default_ssh_signing_key(void)
 
 	if (!ret) {
 		keys = strbuf_split_max(&key_stdout, '\n', 2);
-		if (keys[0] && starts_with(keys[0]->buf, "ssh-")) {
+		if (keys[0] && is_literal_ssh_key(keys[0]->buf, &literal_key)) {
+			/*
+			 * We only use `is_literal_ssh_key` here to check validity
+			 * The prefix will be stripped when the key is used.
+			 */
 			default_key = strbuf_detach(keys[0], NULL);
 		} else {
 			warning(_("gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"),
@@ -889,19 +960,20 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
 	struct tempfile *key_file = NULL, *buffer_file = NULL;
 	char *ssh_signing_key_file = NULL;
 	struct strbuf ssh_signature_filename = STRBUF_INIT;
+	const char *literal_key = NULL;
 
 	if (!signing_key || signing_key[0] == '\0')
 		return error(
 			_("user.signingkey needs to be set for ssh signing"));
 
-	if (starts_with(signing_key, "ssh-")) {
+	if (is_literal_ssh_key(signing_key, &literal_key)) {
 		/* A literal ssh key */
 		key_file = mks_tempfile_t(".git_signing_key_tmpXXXXXX");
 		if (!key_file)
 			return error_errno(
 				_("could not create temporary file"));
-		keylen = strlen(signing_key);
-		if (write_in_full(key_file->fd, signing_key, keylen) < 0 ||
+		keylen = strlen(literal_key);
+		if (write_in_full(key_file->fd, literal_key, keylen) < 0 ||
 		    close_tempfile_gently(key_file) < 0) {
 			error_errno(_("failed writing ssh signing key to '%s'"),
 				    key_file->filename.buf);
diff --git a/gpg-interface.h b/gpg-interface.h
index beefacbb1e..b30cbdcd3d 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -15,8 +15,18 @@ enum signature_trust_level {
 	TRUST_ULTIMATE,
 };
 
+enum payload_type {
+	SIGNATURE_PAYLOAD_UNDEFINED,
+	SIGNATURE_PAYLOAD_COMMIT,
+	SIGNATURE_PAYLOAD_TAG,
+	SIGNATURE_PAYLOAD_PUSH_CERT,
+};
+
 struct signature_check {
 	char *payload;
+	size_t payload_len;
+	enum payload_type payload_type;
+	timestamp_t payload_timestamp;
 	char *output;
 	char *gpg_status;
 
@@ -70,9 +80,8 @@ const char *get_signing_key(void);
  * Either a GPG KeyID or a SSH Key Fingerprint
  */
 const char *get_signing_key_id(void);
-int check_signature(const char *payload, size_t plen,
-		    const char *signature, size_t slen,
-		    struct signature_check *sigc);
+int check_signature(struct signature_check *sigc,
+		    const char *signature, size_t slen);
 void print_signature_buffer(const struct signature_check *sigc,
 			    unsigned flags);
 
diff --git a/grep.c b/grep.c
index fe847a0111..7bb0360869 100644
--- a/grep.c
+++ b/grep.c
@@ -26,10 +26,10 @@ static struct grep_opt grep_defaults = {
 	.pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED,
 	.colors = {
 		[GREP_COLOR_CONTEXT] = "",
-		[GREP_COLOR_FILENAME] = "",
+		[GREP_COLOR_FILENAME] = GIT_COLOR_MAGENTA,
 		[GREP_COLOR_FUNCTION] = "",
-		[GREP_COLOR_LINENO] = "",
-		[GREP_COLOR_COLUMNNO] = "",
+		[GREP_COLOR_LINENO] = GIT_COLOR_GREEN,
+		[GREP_COLOR_COLUMNNO] = GIT_COLOR_GREEN,
 		[GREP_COLOR_MATCH_CONTEXT] = GIT_COLOR_BOLD_RED,
 		[GREP_COLOR_MATCH_SELECTED] = GIT_COLOR_BOLD_RED,
 		[GREP_COLOR_SELECTED] = "",
@@ -362,6 +362,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	int jitret;
 	int patinforet;
 	size_t jitsizearg;
+	int literal = !opt->ignore_case && (p->fixed || p->is_fixed);
 
 	/*
 	 * Call pcre2_general_context_create() before calling any
@@ -382,8 +383,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 		}
 		options |= PCRE2_CASELESS;
 	}
-	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&
-	    !(!opt->ignore_case && (p->fixed || p->is_fixed)))
+	if (!opt->ignore_locale && is_utf8_locale() && !literal)
 		options |= (PCRE2_UTF | PCRE2_MATCH_INVALID_UTF);
 
 #ifdef GIT_PCRE2_VERSION_10_36_OR_HIGHER
@@ -699,6 +699,14 @@ static struct grep_expr *compile_pattern_expr(struct grep_pat **list)
 	return compile_pattern_or(list);
 }
 
+static struct grep_expr *grep_not_expr(struct grep_expr *expr)
+{
+	struct grep_expr *z = xcalloc(1, sizeof(*z));
+	z->node = GREP_NODE_NOT;
+	z->u.unary = expr;
+	return z;
+}
+
 static struct grep_expr *grep_true_expr(void)
 {
 	struct grep_expr *z = xcalloc(1, sizeof(*z));
@@ -797,7 +805,7 @@ void compile_grep_patterns(struct grep_opt *opt)
 		}
 	}
 
-	if (opt->all_match || header_expr)
+	if (opt->all_match || opt->no_body_match || header_expr)
 		opt->extended = 1;
 	else if (!opt->extended)
 		return;
@@ -808,6 +816,9 @@ void compile_grep_patterns(struct grep_opt *opt)
 	if (p)
 		die("incomplete pattern expression: %s", p->pattern);
 
+	if (opt->no_body_match && opt->pattern_expression)
+		opt->pattern_expression = grep_not_expr(opt->pattern_expression);
+
 	if (!header_expr)
 		return;
 
@@ -1057,6 +1068,8 @@ static int match_expr_eval(struct grep_opt *opt, struct grep_expr *x,
 			if (h && (*col < 0 || tmp.rm_so < *col))
 				*col = tmp.rm_so;
 		}
+		if (x->u.atom->token == GREP_PATTERN_BODY)
+			opt->body_hit |= h;
 		break;
 	case GREP_NODE_NOT:
 		/*
@@ -1825,16 +1838,19 @@ int grep_source(struct grep_opt *opt, struct grep_source *gs)
 	 * we do not have to do the two-pass grep when we do not check
 	 * buffer-wide "all-match".
 	 */
-	if (!opt->all_match)
+	if (!opt->all_match && !opt->no_body_match)
 		return grep_source_1(opt, gs, 0);
 
 	/* Otherwise the toplevel "or" terms hit a bit differently.
 	 * We first clear hit markers from them.
 	 */
 	clr_hit_marker(opt->pattern_expression);
+	opt->body_hit = 0;
 	grep_source_1(opt, gs, 1);
 
-	if (!chk_hit_marker(opt->pattern_expression))
+	if (opt->all_match && !chk_hit_marker(opt->pattern_expression))
+		return 0;
+	if (opt->no_body_match && opt->body_hit)
 		return 0;
 
 	return grep_source_1(opt, gs, 0);
diff --git a/grep.h b/grep.h
index 3e8815c347..6a1f0ab017 100644
--- a/grep.h
+++ b/grep.h
@@ -148,6 +148,8 @@ struct grep_opt {
 	int word_regexp;
 	int fixed;
 	int all_match;
+	int no_body_match;
+	int body_hit;
 #define GREP_BINARY_DEFAULT	0
 #define GREP_BINARY_NOMATCH	1
 #define GREP_BINARY_TEXT	2
diff --git a/hash.h b/hash.h
index 9e25c40e9a..5d40368f18 100644
--- a/hash.h
+++ b/hash.h
@@ -95,12 +95,18 @@ static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *s
 /* Number of algorithms supported (including unknown). */
 #define GIT_HASH_NALGOS (GIT_HASH_SHA256 + 1)
 
+/* "sha1", big-endian */
+#define GIT_SHA1_FORMAT_ID 0x73686131
+
 /* The length in bytes and in hex digits of an object name (SHA-1 value). */
 #define GIT_SHA1_RAWSZ 20
 #define GIT_SHA1_HEXSZ (2 * GIT_SHA1_RAWSZ)
 /* The block size of SHA-1. */
 #define GIT_SHA1_BLKSZ 64
 
+/* "s256", big-endian */
+#define GIT_SHA256_FORMAT_ID 0x73323536
+
 /* The length in bytes and in hex digits of an object name (SHA-256 value). */
 #define GIT_SHA256_RAWSZ 32
 #define GIT_SHA256_HEXSZ (2 * GIT_SHA256_RAWSZ)
diff --git a/help.c b/help.c
index 973e47cdc3..71444906dd 100644
--- a/help.c
+++ b/help.c
@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)
 		else if (autocorrect == AUTOCORRECT_PROMPT) {
 			char *answer;
 			struct strbuf msg = STRBUF_INIT;
-			strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed);
+			strbuf_addf(&msg, _("Run '%s' instead [y/N]? "), assumed);
 			answer = git_prompt(msg.buf, PROMPT_ECHO);
 			strbuf_release(&msg);
 			if (!(starts_with(answer, "y") ||
diff --git a/http-backend.c b/http-backend.c
index 3d6e2ff17f..807fb8839e 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -480,7 +480,7 @@ static void run_service(const char **argv, int buffer_input)
 		strvec_pushf(&cld.env_array,
 			     "GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
 
-	cld.argv = argv;
+	strvec_pushv(&cld.args, argv);
 	if (buffer_input || gzipped_request || req_len >= 0)
 		cld.in = -1;
 	cld.git_cmd = 1;
@@ -659,8 +659,9 @@ static NORETURN void die_webcgi(const char *err, va_list params)
 {
 	if (dead <= 1) {
 		struct strbuf hdr = STRBUF_INIT;
+		report_fn die_message_fn = get_die_message_routine();
 
-		vreportf("fatal: ", err, params);
+		die_message_fn(err, params);
 
 		http_status(&hdr, 500, "Internal Server Error");
 		hdr_nocache(&hdr);
diff --git a/http-fetch.c b/http-fetch.c
index fa642462a9..58b394cd47 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -4,6 +4,7 @@
 #include "http.h"
 #include "walker.h"
 #include "strvec.h"
+#include "urlmatch.h"
 
 static const char http_fetch_usage[] = "git http-fetch "
 "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url";
@@ -63,8 +64,17 @@ static void fetch_single_packfile(struct object_id *packfile_hash,
 	if (start_active_slot(preq->slot)) {
 		run_active_slot(preq->slot);
 		if (results.curl_result != CURLE_OK) {
-			die("Unable to get pack file %s\n%s", preq->url,
-			    curl_errorstr);
+			struct url_info url;
+			char *nurl = url_normalize(preq->url, &url);
+			if (!nurl || !git_env_bool("GIT_TRACE_REDACT", 1)) {
+				die("unable to get pack file '%s'\n%s", preq->url,
+				    curl_errorstr);
+			} else {
+				die("failed to get '%.*s' url from '%.*s' "
+				    "(full URL redacted due to GIT_TRACE_REDACT setting)\n%s",
+				    (int)url.scheme_len, url.url,
+				    (int)url.host_len, &url.url[url.host_off], curl_errorstr);
+			}
 		}
 	} else {
 		die("Unable to start request");
@@ -131,7 +141,7 @@ int cmd_main(int argc, const char **argv)
 
 	if (packfile) {
 		if (!index_pack_args.nr)
-			die(_("--packfile requires --index-pack-args"));
+			die(_("the option '%s' requires '%s'"), "--packfile", "--index-pack-args");
 
 		fetch_single_packfile(&packfile_hash, argv[arg],
 				      index_pack_args.v);
@@ -140,7 +150,7 @@ int cmd_main(int argc, const char **argv)
 	}
 
 	if (index_pack_args.nr)
-		die(_("--index-pack-args can only be used with --packfile"));
+		die(_("the option '%s' requires '%s'"), "--index-pack-args", "--packfile");
 
 	if (commits_on_stdin) {
 		commits = walker_targets_stdin(&commit_id, &write_ref);
diff --git a/http.c b/http.c
index f92859f43f..229da4d148 100644
--- a/http.c
+++ b/http.c
@@ -2126,8 +2126,9 @@ int finish_http_pack_request(struct http_pack_request *preq)
 
 	ip.git_cmd = 1;
 	ip.in = tmpfile_fd;
-	ip.argv = preq->index_pack_args ? preq->index_pack_args
-					: default_index_pack_args;
+	strvec_pushv(&ip.args, preq->index_pack_args ?
+		     preq->index_pack_args :
+		     default_index_pack_args);
 
 	if (preq->preserve_index_pack_stdout)
 		ip.out = 0;
diff --git a/log-tree.c b/log-tree.c
index 644893fd8c..d3e7a40b64 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -513,8 +513,9 @@ static void show_signature(struct rev_info *opt, struct commit *commit)
 	if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
 		goto out;
 
-	status = check_signature(payload.buf, payload.len, signature.buf,
-				 signature.len, &sigc);
+	sigc.payload_type = SIGNATURE_PAYLOAD_COMMIT;
+	sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+	status = check_signature(&sigc, signature.buf, signature.len);
 	if (status && !sigc.output)
 		show_sig_lines(opt, status, "No signature\n");
 	else
@@ -583,8 +584,9 @@ static int show_one_mergetag(struct commit *commit,
 	status = -1;
 	if (parse_signature(extra->value, extra->len, &payload, &signature)) {
 		/* could have a good signature */
-		status = check_signature(payload.buf, payload.len,
-					 signature.buf, signature.len, &sigc);
+		sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+		sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+		status = check_signature(&sigc, signature.buf, signature.len);
 		if (sigc.output)
 			strbuf_addstr(&verify_message, sigc.output);
 		else
diff --git a/merge-ort.c b/merge-ort.c
index 0342f10483..c319797021 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -3841,9 +3841,22 @@ static void process_entry(struct merge_options *opt,
 		if (opt->renormalize &&
 		    blob_unchanged(opt, &ci->stages[0], &ci->stages[side],
 				   path)) {
-			ci->merged.is_null = 1;
-			ci->merged.clean = 1;
-			assert(!ci->df_conflict && !ci->path_conflict);
+			if (!ci->path_conflict) {
+				/*
+				 * Blob unchanged after renormalization, so
+				 * there's no modify/delete conflict after all;
+				 * we can just remove the file.
+				 */
+				ci->merged.is_null = 1;
+				ci->merged.clean = 1;
+				 /*
+				  * file goes away => even if there was a
+				  * directory/file conflict there isn't one now.
+				  */
+				ci->df_conflict = 0;
+			} else {
+				/* rename/delete, so conflict remains */
+			}
 		} else if (ci->path_conflict &&
 			   oideq(&ci->stages[0].oid, &ci->stages[side].oid)) {
 			/*
diff --git a/mergesort.c b/mergesort.c
index 6216835566..bd9c6ef8ee 100644
--- a/mergesort.c
+++ b/mergesort.c
@@ -63,7 +63,7 @@ void *llist_mergesort(void *list,
 		void *next = get_next_fn(list);
 		if (next)
 			set_next_fn(list, NULL);
-		for (i = 0; n & (1 << i); i++)
+		for (i = 0; n & ((size_t)1 << i); i++)
 			list = llist_merge(ranks[i], list, get_next_fn,
 					   set_next_fn, compare_fn);
 		n++;
diff --git a/midx.c b/midx.c
index 8433086ac1..837b46b2af 100644
--- a/midx.c
+++ b/midx.c
@@ -57,15 +57,15 @@ const unsigned char *get_midx_checksum(struct multi_pack_index *m)
 	return m->data + m->data_len - the_hash_algo->rawsz;
 }
 
-char *get_midx_filename(const char *object_dir)
+void get_midx_filename(struct strbuf *out, const char *object_dir)
 {
-	return xstrfmt("%s/pack/multi-pack-index", object_dir);
+	strbuf_addf(out, "%s/pack/multi-pack-index", object_dir);
 }
 
-char *get_midx_rev_filename(struct multi_pack_index *m)
+void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m)
 {
-	return xstrfmt("%s/pack/multi-pack-index-%s.rev",
-		       m->object_dir, hash_to_hex(get_midx_checksum(m)));
+	get_midx_filename(out, m->object_dir);
+	strbuf_addf(out, "-%s.rev", hash_to_hex(get_midx_checksum(m)));
 }
 
 static int midx_read_oid_fanout(const unsigned char *chunk_start,
@@ -89,28 +89,30 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 	size_t midx_size;
 	void *midx_map = NULL;
 	uint32_t hash_version;
-	char *midx_name = get_midx_filename(object_dir);
+	struct strbuf midx_name = STRBUF_INIT;
 	uint32_t i;
 	const char *cur_pack_name;
 	struct chunkfile *cf = NULL;
 
-	fd = git_open(midx_name);
+	get_midx_filename(&midx_name, object_dir);
+
+	fd = git_open(midx_name.buf);
 
 	if (fd < 0)
 		goto cleanup_fail;
 	if (fstat(fd, &st)) {
-		error_errno(_("failed to read %s"), midx_name);
+		error_errno(_("failed to read %s"), midx_name.buf);
 		goto cleanup_fail;
 	}
 
 	midx_size = xsize_t(st.st_size);
 
 	if (midx_size < MIDX_MIN_SIZE) {
-		error(_("multi-pack-index file %s is too small"), midx_name);
+		error(_("multi-pack-index file %s is too small"), midx_name.buf);
 		goto cleanup_fail;
 	}
 
-	FREE_AND_NULL(midx_name);
+	strbuf_release(&midx_name);
 
 	midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	close(fd);
@@ -179,12 +181,13 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 	trace2_data_intmax("midx", the_repository, "load/num_packs", m->num_packs);
 	trace2_data_intmax("midx", the_repository, "load/num_objects", m->num_objects);
 
+	free_chunkfile(cf);
 	return m;
 
 cleanup_fail:
 	free(m);
-	free(midx_name);
-	free(cf);
+	strbuf_release(&midx_name);
+	free_chunkfile(cf);
 	if (midx_map)
 		munmap(midx_map, midx_size);
 	if (0 <= fd)
@@ -1130,7 +1133,7 @@ static int write_midx_internal(const char *object_dir,
 			       const char *refs_snapshot,
 			       unsigned flags)
 {
-	char *midx_name;
+	struct strbuf midx_name = STRBUF_INIT;
 	unsigned char midx_hash[GIT_MAX_RAWSZ];
 	uint32_t i;
 	struct hashfile *f = NULL;
@@ -1141,10 +1144,10 @@ static int write_midx_internal(const char *object_dir,
 	int result = 0;
 	struct chunkfile *cf;
 
-	midx_name = get_midx_filename(object_dir);
-	if (safe_create_leading_directories(midx_name))
+	get_midx_filename(&midx_name, object_dir);
+	if (safe_create_leading_directories(midx_name.buf))
 		die_errno(_("unable to create leading directories of %s"),
-			  midx_name);
+			  midx_name.buf);
 
 	if (!packs_to_include) {
 		/*
@@ -1373,7 +1376,7 @@ static int write_midx_internal(const char *object_dir,
 		pack_name_concat_len += MIDX_CHUNK_ALIGNMENT -
 					(pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
 
-	hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
+	hold_lock_file_for_update(&lk, midx_name.buf, LOCK_DIE_ON_ERROR);
 	f = hashfd(get_lock_file_fd(&lk), get_lock_file_path(&lk));
 
 	if (ctx.nr - dropped_packs == 0) {
@@ -1410,9 +1413,9 @@ static int write_midx_internal(const char *object_dir,
 		ctx.pack_order = midx_pack_order(&ctx);
 
 	if (flags & MIDX_WRITE_REV_INDEX)
-		write_midx_reverse_index(midx_name, midx_hash, &ctx);
+		write_midx_reverse_index(midx_name.buf, midx_hash, &ctx);
 	if (flags & MIDX_WRITE_BITMAP) {
-		if (write_midx_bitmap(midx_name, midx_hash, &ctx,
+		if (write_midx_bitmap(midx_name.buf, midx_hash, &ctx,
 				      refs_snapshot, flags) < 0) {
 			error(_("could not write multi-pack bitmap"));
 			result = 1;
@@ -1442,7 +1445,7 @@ cleanup:
 	free(ctx.entries);
 	free(ctx.pack_perm);
 	free(ctx.pack_order);
-	free(midx_name);
+	strbuf_release(&midx_name);
 
 	return result;
 }
@@ -1506,20 +1509,22 @@ static void clear_midx_files_ext(const char *object_dir, const char *ext,
 
 void clear_midx_file(struct repository *r)
 {
-	char *midx = get_midx_filename(r->objects->odb->path);
+	struct strbuf midx = STRBUF_INIT;
+
+	get_midx_filename(&midx, r->objects->odb->path);
 
 	if (r->objects && r->objects->multi_pack_index) {
 		close_midx(r->objects->multi_pack_index);
 		r->objects->multi_pack_index = NULL;
 	}
 
-	if (remove_path(midx))
-		die(_("failed to clear multi-pack-index at %s"), midx);
+	if (remove_path(midx.buf))
+		die(_("failed to clear multi-pack-index at %s"), midx.buf);
 
 	clear_midx_files_ext(r->objects->odb->path, ".bitmap", NULL);
 	clear_midx_files_ext(r->objects->odb->path, ".rev", NULL);
 
-	free(midx);
+	strbuf_release(&midx);
 }
 
 static int verify_midx_error;
@@ -1572,12 +1577,15 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
 	if (!m) {
 		int result = 0;
 		struct stat sb;
-		char *filename = get_midx_filename(object_dir);
-		if (!stat(filename, &sb)) {
+		struct strbuf filename = STRBUF_INIT;
+
+		get_midx_filename(&filename, object_dir);
+
+		if (!stat(filename.buf, &sb)) {
 			error(_("multi-pack-index file exists, but failed to parse"));
 			result = 1;
 		}
-		free(filename);
+		strbuf_release(&filename);
 		return result;
 	}
 
@@ -1610,7 +1618,7 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
 		 * Remaining tests assume that we have objects, so we can
 		 * return here.
 		 */
-		return verify_midx_error;
+		goto cleanup;
 	}
 
 	if (flags & MIDX_PROGRESS)
@@ -1688,7 +1696,9 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
 	}
 	stop_progress(&progress);
 
+cleanup:
 	free(pairs);
+	close_midx(m);
 
 	return verify_midx_error;
 }
diff --git a/midx.h b/midx.h
index 6e32297fa3..b7d79a515c 100644
--- a/midx.h
+++ b/midx.h
@@ -48,8 +48,8 @@ struct multi_pack_index {
 #define MIDX_WRITE_BITMAP_HASH_CACHE (1 << 3)
 
 const unsigned char *get_midx_checksum(struct multi_pack_index *m);
-char *get_midx_filename(const char *object_dir);
-char *get_midx_rev_filename(struct multi_pack_index *m);
+void get_midx_filename(struct strbuf *out, const char *object_dir);
+void get_midx_rev_filename(struct strbuf *out, struct multi_pack_index *m);
 
 struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
 int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id);
diff --git a/object-file.c b/object-file.c
index c3d866a287..8be57f48de 100644
--- a/object-file.c
+++ b/object-file.c
@@ -165,7 +165,6 @@ static void git_hash_unknown_final_oid(struct object_id *oid, git_hash_ctx *ctx)
 	BUG("trying to finalize unknown hash");
 }
 
-
 const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 	{
 		NULL,
@@ -184,8 +183,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 	},
 	{
 		"sha1",
-		/* "sha1", big-endian */
-		0x73686131,
+		GIT_SHA1_FORMAT_ID,
 		GIT_SHA1_RAWSZ,
 		GIT_SHA1_HEXSZ,
 		GIT_SHA1_BLKSZ,
@@ -200,8 +198,7 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 	},
 	{
 		"sha256",
-		/* "s256", big-endian */
-		0x73323536,
+		GIT_SHA256_FORMAT_ID,
 		GIT_SHA256_RAWSZ,
 		GIT_SHA256_HEXSZ,
 		GIT_SHA256_BLKSZ,
@@ -683,6 +680,49 @@ void add_to_alternates_memory(const char *reference)
 			     '\n', NULL, 0);
 }
 
+struct object_directory *set_temporary_primary_odb(const char *dir, int will_destroy)
+{
+	struct object_directory *new_odb;
+
+	/*
+	 * Make sure alternates are initialized, or else our entry may be
+	 * overwritten when they are.
+	 */
+	prepare_alt_odb(the_repository);
+
+	/*
+	 * Make a new primary odb and link the old primary ODB in as an
+	 * alternate
+	 */
+	new_odb = xcalloc(1, sizeof(*new_odb));
+	new_odb->path = xstrdup(dir);
+
+	/*
+	 * Disable ref updates while a temporary odb is active, since
+	 * the objects in the database may roll back.
+	 */
+	new_odb->disable_ref_updates = 1;
+	new_odb->will_destroy = will_destroy;
+	new_odb->next = the_repository->objects->odb;
+	the_repository->objects->odb = new_odb;
+	return new_odb->next;
+}
+
+void restore_primary_odb(struct object_directory *restore_odb, const char *old_path)
+{
+	struct object_directory *cur_odb = the_repository->objects->odb;
+
+	if (strcmp(old_path, cur_odb->path))
+		BUG("expected %s as primary object store; found %s",
+		    old_path, cur_odb->path);
+
+	if (cur_odb->next != restore_odb)
+		BUG("we expect the old primary object store to be the first alternate");
+
+	the_repository->objects->odb = restore_odb;
+	free_object_directory(cur_odb);
+}
+
 /*
  * Compute the exact path an alternate is at and returns it. In case of
  * error NULL is returned and the human readable error is added to `err`
@@ -797,7 +837,7 @@ static void fill_alternate_refs_command(struct child_process *cmd,
 		}
 	}
 
-	cmd->env = local_repo_env;
+	strvec_pushv(&cmd->env_array, (const char **)local_repo_env);
 	cmd->out = -1;
 }
 
@@ -1306,7 +1346,7 @@ static void *unpack_loose_rest(git_zstream *stream,
 int parse_loose_header(const char *hdr, struct object_info *oi)
 {
 	const char *type_buf = hdr;
-	unsigned long size;
+	size_t size;
 	int type, type_len = 0;
 
 	/*
@@ -1341,12 +1381,12 @@ int parse_loose_header(const char *hdr, struct object_info *oi)
 			if (c > 9)
 				break;
 			hdr++;
-			size = size * 10 + c;
+			size = st_add(st_mult(size, 10), c);
 		}
 	}
 
 	if (oi->sizep)
-		*oi->sizep = size;
+		*oi->sizep = cast_size_t_to_ulong(size);
 
 	/*
 	 * The length must be followed by a zero byte
@@ -1809,8 +1849,11 @@ int hash_object_file(const struct git_hash_algo *algo, const void *buf,
 /* Finalize a file on disk, and close it. */
 static void close_loose_object(int fd)
 {
-	if (fsync_object_files)
-		fsync_or_die(fd, "loose object file");
+	if (!the_repository->objects->odb->will_destroy) {
+		if (fsync_object_files)
+			fsync_or_die(fd, "loose object file");
+	}
+
 	if (close(fd) != 0)
 		die_errno(_("error when closing loose object file"));
 }
@@ -2425,7 +2468,7 @@ struct oidtree *odb_loose_cache(struct object_directory *odb,
 	struct strbuf buf = STRBUF_INIT;
 	size_t word_bits = bitsizeof(odb->loose_objects_subdir_seen[0]);
 	size_t word_index = subdir_nr / word_bits;
-	size_t mask = 1u << (subdir_nr % word_bits);
+	size_t mask = (size_t)1u << (subdir_nr % word_bits);
 	uint32_t *bitmap;
 
 	if (subdir_nr < 0 ||
diff --git a/object-store.h b/object-store.h
index 952efb6a4b..6f89482df0 100644
--- a/object-store.h
+++ b/object-store.h
@@ -28,6 +28,18 @@ struct object_directory {
 	struct oidtree *loose_objects_cache;
 
 	/*
+	 * This is a temporary object store created by the tmp_objdir
+	 * facility. Disable ref updates since the objects in the store
+	 * might be discarded on rollback.
+	 */
+	int disable_ref_updates;
+
+	/*
+	 * This object store is ephemeral, so there is no need to fsync.
+	 */
+	int will_destroy;
+
+	/*
 	 * Path to the alternative object store. If this is a relative path,
 	 * it is relative to the current working directory.
 	 */
@@ -59,6 +71,17 @@ void add_to_alternates_file(const char *dir);
 void add_to_alternates_memory(const char *dir);
 
 /*
+ * Replace the current writable object directory with the specified temporary
+ * object directory; returns the former primary object directory.
+ */
+struct object_directory *set_temporary_primary_odb(const char *dir, int will_destroy);
+
+/*
+ * Restore a previous ODB replaced by set_temporary_main_odb.
+ */
+void restore_primary_odb(struct object_directory *restore_odb, const char *old_path);
+
+/*
  * Populate and return the loose object cache array corresponding to the
  * given object ID.
  */
@@ -68,6 +91,9 @@ struct oidtree *odb_loose_cache(struct object_directory *odb,
 /* Empty the loose object cache for the specified object directory. */
 void odb_clear_loose_cache(struct object_directory *odb);
 
+/* Clear and free the specified object directory */
+void free_object_directory(struct object_directory *odb);
+
 struct packed_git {
 	struct hashmap_entry packmap_ent;
 	struct packed_git *next;
diff --git a/object.c b/object.c
index 23a24e678a..c37501fc12 100644
--- a/object.c
+++ b/object.c
@@ -199,7 +199,7 @@ struct object *lookup_object_by_type(struct repository *r,
 	case OBJ_BLOB:
 		return (struct object *)lookup_blob(r, oid);
 	default:
-		die("BUG: unknown object type %d", type);
+		BUG("unknown object type %d", type);
 	}
 }
 
@@ -513,7 +513,7 @@ struct raw_object_store *raw_object_store_new(void)
 	return o;
 }
 
-static void free_object_directory(struct object_directory *odb)
+void free_object_directory(struct object_directory *odb)
 {
 	free(odb->path);
 	odb_clear_loose_cache(odb);
diff --git a/pack-bitmap.c b/pack-bitmap.c
index f47a0a7db4..f772d3cb7f 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -292,9 +292,12 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 
 char *midx_bitmap_filename(struct multi_pack_index *midx)
 {
-	return xstrfmt("%s-%s.bitmap",
-		       get_midx_filename(midx->object_dir),
-		       hash_to_hex(get_midx_checksum(midx)));
+	struct strbuf buf = STRBUF_INIT;
+
+	get_midx_filename(&buf, midx->object_dir);
+	strbuf_addf(&buf, "-%s.bitmap", hash_to_hex(get_midx_checksum(midx)));
+
+	return strbuf_detach(&buf, NULL);
 }
 
 char *pack_bitmap_filename(struct packed_git *p)
@@ -324,10 +327,12 @@ static int open_midx_bitmap_1(struct bitmap_index *bitmap_git,
 	}
 
 	if (bitmap_git->pack || bitmap_git->midx) {
+		struct strbuf buf = STRBUF_INIT;
+		get_midx_filename(&buf, midx->object_dir);
 		/* ignore extra bitmap file; we can only handle one */
-		warning("ignoring extra bitmap file: %s",
-			get_midx_filename(midx->object_dir));
+		warning("ignoring extra bitmap file: %s", buf.buf);
 		close(fd);
+		strbuf_release(&buf);
 		return -1;
 	}
 
@@ -1721,6 +1726,12 @@ void test_bitmap_walk(struct rev_info *revs)
 	else
 		die("mismatch in bitmap results");
 
+	bitmap_free(result);
+	bitmap_free(tdata.base);
+	bitmap_free(tdata.commits);
+	bitmap_free(tdata.trees);
+	bitmap_free(tdata.blobs);
+	bitmap_free(tdata.tags);
 	free_bitmap_index(bitmap_git);
 }
 
@@ -1748,7 +1759,7 @@ int test_bitmap_hashes(struct repository *r)
 	struct object_id oid;
 	uint32_t i, index_pos;
 
-	if (!bitmap_git->hashes)
+	if (!bitmap_git || !bitmap_git->hashes)
 		goto cleanup;
 
 	for (i = 0; i < bitmap_num_objects(bitmap_git); i++) {
@@ -1848,9 +1859,17 @@ void free_bitmap_index(struct bitmap_index *b)
 	ewah_pool_free(b->trees);
 	ewah_pool_free(b->blobs);
 	ewah_pool_free(b->tags);
+	if (b->bitmaps) {
+		struct stored_bitmap *sb;
+		kh_foreach_value(b->bitmaps, sb, {
+			ewah_pool_free(sb->root);
+			free(sb);
+		});
+	}
 	kh_destroy_oid_map(b->bitmaps);
 	free(b->ext_index.objects);
 	free(b->ext_index.hashes);
+	kh_destroy_oid_pos(b->ext_index.positions);
 	bitmap_free(b->result);
 	bitmap_free(b->haves);
 	if (bitmap_is_midx(b)) {
diff --git a/pack-revindex.c b/pack-revindex.c
index 0e4a31d9db..70d0fbafcb 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -296,14 +296,14 @@ int load_pack_revindex(struct packed_git *p)
 
 int load_midx_revindex(struct multi_pack_index *m)
 {
-	char *revindex_name;
+	struct strbuf revindex_name = STRBUF_INIT;
 	int ret;
 	if (m->revindex_data)
 		return 0;
 
-	revindex_name = get_midx_rev_filename(m);
+	get_midx_rev_filename(&revindex_name, m);
 
-	ret = load_revindex_from_disk(revindex_name,
+	ret = load_revindex_from_disk(revindex_name.buf,
 				      m->num_objects,
 				      &m->revindex_map,
 				      &m->revindex_len);
@@ -313,7 +313,7 @@ int load_midx_revindex(struct multi_pack_index *m)
 	m->revindex_data = (const uint32_t *)((const char *)m->revindex_map + RIDX_HEADER_SIZE);
 
 cleanup:
-	free(revindex_name);
+	strbuf_release(&revindex_name);
 	return ret;
 }
 
diff --git a/packfile.c b/packfile.c
index 89402cfc69..835b2d2716 100644
--- a/packfile.c
+++ b/packfile.c
@@ -324,7 +324,8 @@ void close_pack_index(struct packed_git *p)
 	}
 }
 
-void close_pack_revindex(struct packed_git *p) {
+static void close_pack_revindex(struct packed_git *p)
+{
 	if (!p->revindex_map)
 		return;
 
@@ -1060,7 +1061,7 @@ 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;
+	size_t size, c;
 	unsigned long used = 0;
 
 	c = buf[used++];
@@ -1068,16 +1069,16 @@ unsigned long unpack_object_header_buffer(const unsigned char *buf,
 	size = c & 15;
 	shift = 4;
 	while (c & 0x80) {
-		if (len <= used || bitsizeof(long) <= shift) {
+		if (len <= used || (bitsizeof(long) - 7) < shift) {
 			error("bad object header");
 			size = used = 0;
 			break;
 		}
 		c = buf[used++];
-		size += (c & 0x7f) << shift;
+		size = st_add(size, st_left_shift(c & 0x7f, shift));
 		shift += 7;
 	}
-	*sizep = size;
+	*sizep = cast_size_t_to_ulong(size);
 	return used;
 }
 
diff --git a/packfile.h b/packfile.h
index 186146779d..a3f6723857 100644
--- a/packfile.h
+++ b/packfile.h
@@ -90,7 +90,6 @@ uint32_t get_pack_fanout(struct packed_git *p, uint32_t value);
 
 unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
 void close_pack_windows(struct packed_git *);
-void close_pack_revindex(struct packed_git *);
 void close_pack(struct packed_git *);
 void close_object_store(struct raw_object_store *o);
 void unuse_pack(struct pack_window **);
diff --git a/pager.c b/pager.c
index 52f27a6765..27877f8ebb 100644
--- a/pager.c
+++ b/pager.c
@@ -8,7 +8,7 @@
 #define DEFAULT_PAGER "less"
 #endif
 
-static struct child_process pager_process = CHILD_PROCESS_INIT;
+static struct child_process pager_process;
 static const char *pager_program;
 
 /* Is the value coming back from term_columns() just a guess? */
@@ -124,6 +124,8 @@ void setup_pager(void)
 
 	setenv("GIT_PAGER_IN_USE", "true", 1);
 
+	child_process_init(&pager_process);
+
 	/* spawn the pager */
 	prepare_pager_args(&pager_process, pager);
 	pager_process.in = -1;
diff --git a/parallel-checkout.c b/parallel-checkout.c
index ed9c999520..8dd7e7bad4 100644
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -261,7 +261,7 @@ static int write_pc_item_to_fd(struct parallel_checkout_item *pc_item, int fd,
 	struct stream_filter *filter;
 	struct strbuf buf = STRBUF_INIT;
 	char *blob;
-	unsigned long size;
+	size_t size;
 	ssize_t wrote;
 
 	/* Sanity check */
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 3c811e1e4a..d346dbe210 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "parse-options.h"
+#include "branch.h"
 #include "cache.h"
 #include "commit.h"
 #include "color.h"
@@ -293,3 +294,18 @@ int parse_opt_passthru_argv(const struct option *opt, const char *arg, int unset
 
 	return 0;
 }
+
+int parse_opt_tracking_mode(const struct option *opt, const char *arg, int unset)
+{
+	if (unset)
+		*(enum branch_track *)opt->value = BRANCH_TRACK_NEVER;
+	else if (!arg || !strcmp(arg, "direct"))
+		*(enum branch_track *)opt->value = BRANCH_TRACK_EXPLICIT;
+	else if (!strcmp(arg, "inherit"))
+		*(enum branch_track *)opt->value = BRANCH_TRACK_INHERIT;
+	else
+		return error(_("option `%s' expects \"%s\" or \"%s\""),
+			     "--track", "direct", "inherit");
+
+	return 0;
+}
diff --git a/parse-options.c b/parse-options.c
index fc5b43ff0b..a8283037be 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -404,8 +404,9 @@ is_abbreviated:
 	return PARSE_OPT_UNKNOWN;
 }
 
-static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
-			    const struct option *options)
+static enum parse_opt_result parse_nodash_opt(struct parse_opt_ctx_t *p,
+					      const char *arg,
+					      const struct option *options)
 {
 	const struct option *all_opts = options;
 
@@ -415,7 +416,7 @@ static int parse_nodash_opt(struct parse_opt_ctx_t *p, const char *arg,
 		if (options->short_name == arg[0] && arg[1] == '\0')
 			return get_value(p, options, all_opts, OPT_SHORT);
 	}
-	return -2;
+	return PARSE_OPT_ERROR;
 }
 
 static void check_typos(const char *arg, const struct option *options)
@@ -1075,6 +1076,6 @@ void NORETURN usage_msg_opt(const char *msg,
 		   const char * const *usagestr,
 		   const struct option *options)
 {
-	fprintf(stderr, "fatal: %s\n\n", msg);
+	die_message("%s\n", msg); /* The extra \n is intentional */
 	usage_with_options(usagestr, options);
 }
diff --git a/parse-options.h b/parse-options.h
index 275fb44081..e22846d3b7 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -301,6 +301,8 @@ enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
 					   const char *, int);
 int parse_opt_passthru(const struct option *, const char *, int);
 int parse_opt_passthru_argv(const struct option *, const char *, int);
+/* value is enum branch_track* */
+int parse_opt_tracking_mode(const struct option *, const char *, int);
 
 #define OPT__VERBOSE(var, h)  OPT_COUNTUP('v', "verbose", (var), (h))
 #define OPT__QUIET(var, h)    OPT_COUNTUP('q', "quiet",   (var), (h))
diff --git a/pathspec.h b/pathspec.h
index 2341dc9901..402ebb8080 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -58,8 +58,7 @@ struct pathspec {
 #define GUARD_PATHSPEC(ps, mask) \
 	do { \
 		if ((ps)->magic & ~(mask))	       \
-			die("BUG:%s:%d: unsupported magic %x",	\
-			    __FILE__, __LINE__, (ps)->magic & ~(mask)); \
+			BUG("unsupported magic %x", (ps)->magic & ~(mask)); \
 	} while (0)
 
 /* parse_pathspec flags */
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 35ff5a6896..6ce2e283c8 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -6,7 +6,7 @@ use constant rev_map_fmt => 'NH*';
 use vars qw/$_no_metadata
             $_repack $_repack_flags $_use_svm_props $_head
             $_use_svnsync_props $no_reuse_existing
-	    $_use_log_author $_add_author_from $_localtime/;
+	    $_use_log_author $_add_author_from $_localtime $_use_fsync/;
 use Carp qw/croak/;
 use File::Path qw/mkpath/;
 use IPC::Open3;
@@ -2269,6 +2269,19 @@ sub mkfile {
 	}
 }
 
+# TODO: move this to Git.pm?
+sub use_fsync {
+	if (!defined($_use_fsync)) {
+		my $x = $ENV{GIT_TEST_FSYNC};
+		if (defined $x) {
+			my $v = command_oneline('-c', "test.fsync=$x",
+					qw(config --type=bool test.fsync));
+			$_use_fsync = defined($v) ? ($v eq "true\n") : 1;
+		}
+	}
+	$_use_fsync;
+}
+
 sub rev_map_set {
 	my ($self, $rev, $commit, $update_ref, $uuid) = @_;
 	defined $commit or die "missing arg3\n";
@@ -2290,7 +2303,7 @@ sub rev_map_set {
 	my $sync;
 	# both of these options make our .rev_db file very, very important
 	# and we can't afford to lose it because rebuild() won't work
-	if ($self->use_svm_props || $self->no_metadata) {
+	if (($self->use_svm_props || $self->no_metadata) && use_fsync()) {
 		require File::Copy;
 		$sync = 1;
 		File::Copy::copy($db, $db_lock) or die "rev_map_set(@_): ",
diff --git a/pkt-line.c b/pkt-line.c
index 2dc8ac274b..8e43c2def4 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -370,6 +370,32 @@ int packet_length(const char lenbuf_hex[4])
 	return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2);
 }
 
+static char *find_packfile_uri_path(const char *buffer)
+{
+	const char *URI_MARK = "://";
+	char *path;
+	int len;
+
+	/* First char is sideband mark */
+	buffer += 1;
+
+	len = strspn(buffer, "0123456789abcdefABCDEF");
+	/* size of SHA1 and SHA256 hash */
+	if (!(len == 40 || len == 64) || buffer[len] != ' ')
+		return NULL; /* required "<hash>SP" not seen */
+
+	path = strstr(buffer + len + 1, URI_MARK);
+	if (!path)
+		return NULL;
+
+	path = strchr(path + strlen(URI_MARK), '/');
+	if (!path || !*(path + 1))
+		return NULL;
+
+	/* position after '/' */
+	return ++path;
+}
+
 enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 						size_t *src_len, char *buffer,
 						unsigned size, int *pktlen,
@@ -377,6 +403,7 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 {
 	int len;
 	char linelen[4];
+	char *uri_path_start;
 
 	if (get_packet_data(fd, src_buffer, src_len, linelen, 4, options) < 0) {
 		*pktlen = -1;
@@ -427,7 +454,18 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 		len--;
 
 	buffer[len] = 0;
-	packet_trace(buffer, len, 0);
+	if (options & PACKET_READ_REDACT_URI_PATH &&
+	    (uri_path_start = find_packfile_uri_path(buffer))) {
+		const char *redacted = "<redacted>";
+		struct strbuf tracebuf = STRBUF_INIT;
+		strbuf_insert(&tracebuf, 0, buffer, len);
+		strbuf_splice(&tracebuf, uri_path_start - buffer,
+			      strlen(uri_path_start), redacted, strlen(redacted));
+		packet_trace(tracebuf.buf, tracebuf.len, 0);
+		strbuf_release(&tracebuf);
+	} else {
+		packet_trace(buffer, len, 0);
+	}
 
 	if ((options & PACKET_READ_DIE_ON_ERR_PACKET) &&
 	    starts_with(buffer, "ERR "))
diff --git a/pkt-line.h b/pkt-line.h
index 467ae01357..6d2a63db23 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -87,6 +87,7 @@ void packet_fflush(FILE *f);
 #define PACKET_READ_CHOMP_NEWLINE        (1u<<1)
 #define PACKET_READ_DIE_ON_ERR_PACKET    (1u<<2)
 #define PACKET_READ_GENTLE_ON_READ_ERROR (1u<<3)
+#define PACKET_READ_REDACT_URI_PATH      (1u<<4)
 int packet_read(int fd, char *buffer, unsigned size, int options);
 
 /*
diff --git a/po/README.md b/po/README.md
index dcd8436c25..19fabb4acf 100644
--- a/po/README.md
+++ b/po/README.md
@@ -221,6 +221,10 @@ General advice:
 - Adjust the strings so that they're easy to translate. Most of the
   advice in `info '(gettext)Preparing Strings'` applies here.
 
+- Strings referencing numbers of items may need to be split into singular and
+  plural forms; see the Q\_() wrapper in the C sub-section below for an
+  example.
+
 - If something is unclear or ambiguous you can use a "TRANSLATORS"
   comment to tell the translators what to make of it. These will be
   extracted by xgettext(1) and put in the "po/\*.po" files, e.g. from
diff --git a/po/bg.po b/po/bg.po
index 51d7c7242f..8328531d33 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
 # Bulgarian translation of git po-file.
 # Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Alexander Shopov <ash@kambanaria.org>.
 # This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022.
 #
 # ========================
 # DICTIONARY TO MERGE IN GIT GUI
@@ -33,6 +33,7 @@
 # switch to branch преминавам към клон
 # sparse entry/blob ча�тично изтеглена директори�/път/обект-BLOB
 # sparse index ча�тичен индек�
+# sparcity ча�тично�т
 # revision range диапазон на вер�иите
 # cover letter придружаващо пи�мо
 # reference repository еталонно хранилище
@@ -163,6 +164,10 @@
 # prefetch предварително до�тав�не
 # scheduler планиращ модул
 # snapshot �нимка
+# enlistment зачи�лена директори�
+# zealous merge за�илено �ливане
+# unregister отчи�л�вам
+# marked counting избро�ване
 # ------------------------
 # „$var“ - може да не �работва за shell има gettext и eval_gettext - проверка - намират �е ле�но по „$
 # ------------------------
@@ -177,12 +182,13 @@
 # msgcat todo1.po todo2.po > todo.po
 # grep '^#: ' todo.po | sed 's/^#: //' | tr ' ' '\n' | sed 's/:[0-9]*$//' > FILES
 # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: git 2.34\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-12 19:22+0100\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
+"PO-Revision-Date: 2022-01-16 10:50+0100\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -196,8 +202,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "�еу�пешен анализ — „%s“."
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "индек�ът не може да бъде прочетен"
@@ -226,7 +232,7 @@ msgstr "Обнов�ване"
 msgid "could not stage '%s'"
 msgstr "неу�пешно добав�не в индек�а на „%s“"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "индек�ът не може да бъде запи�ан"
 
@@ -242,8 +248,8 @@ msgstr[1] "%d файла обновени\n"
 msgid "note: %s is untracked now.\n"
 msgstr "БЕЛЕЖК�: „%s“ вече не �е �леди.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "неу�пешно �ъздаване на запи� в кеша чрез „make_cache_entry“ за „%s“"
@@ -284,21 +290,21 @@ msgstr[1] "%d файла добавени\n"
 msgid "ignoring unmerged: %s"
 msgstr "пренебрегване на не�л�тото: „%s“"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Само двоични файлове �а променени.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "��ма промени.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Обнов�ване на кръпка"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Преглед на разликата"
 
@@ -366,11 +372,11 @@ msgstr "избор на номериран елемент"
 msgid "(empty) select nothing"
 msgstr "(празно) без избор на нищо"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "��� Команди ���"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Избор на �ледващо дей�твие"
 
@@ -382,13 +388,13 @@ msgstr "в индек�а"
 msgid "unstaged"
 msgstr "извън индек�а"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "път"
@@ -398,27 +404,27 @@ msgid "could not refresh index"
 msgstr "индек�ът не може да бъде обновен"
 
 #
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Изход.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Добав�не на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Добав�не на изтриването [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Добав�не на добав�нето [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Добав�не на това парче [y,n,q,a,d%s,?]? "
@@ -445,22 +451,22 @@ msgstr ""
 "a — добав�не на това и в�ички �ледващи парчета от файла в индек�а\n"
 "d — без добав�не на това и в�ички �ледващи парчета от файла в индек�а\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на добав�нето [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
@@ -487,22 +493,22 @@ msgstr ""
 "a — �катаване на това и в�ички �ледващи парчета от файла\n"
 "d — без �катаване на това и в�ички �ледващи парчета от файла\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на добав�нето [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
@@ -529,23 +535,23 @@ msgstr ""
 "a — изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
 "d — без изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на пром�ната на правата за до�тъп към индек�а [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на изтриването към индек�а [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на добав�нето към индек�а [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на това парче към индек�а [y,n,q,a,d%s,?]? "
@@ -572,28 +578,28 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на пром�ната в правата за до�тъп от работното дърво [y,n,q,a,d"
 "%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на добав�нето от работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
@@ -623,26 +629,26 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от работното "
 "дърво\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на пром�ната в правата за до�тъп от индек�а и работното дърво [y,"
 "n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на изтриването от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Премахване на добав�нето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Премахване на парчето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
@@ -664,25 +670,25 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на пром�ната в правата за до�тъп от индек�а и работното дърво [y,n,"
 "q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на изтриването от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на добав�нето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на парчето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
@@ -824,7 +830,7 @@ msgstr "неу�пешно изпълнение на „git apply --cached“"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -836,11 +842,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Избраните парчета не може да �е добав�т в индек�а!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Да �е приложат ли към работното дърво? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "�ищо не е приложено.\n"
 
@@ -878,11 +884,11 @@ msgstr "��ма друго парче �лед това"
 msgid "No other hunks to goto"
 msgstr "��ма други парчета"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "към кое парче да �е придвижи (за повече варианти нати�нете „enter“)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "към кое парче да �е придвижи? "
 
@@ -902,7 +908,7 @@ msgstr[1] "Има �амо %d парчета."
 msgid "No other hunks to search"
 msgstr "��ма други парчета за тър�ене"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "да �е тър�и � регул�рен израз? "
 
@@ -984,7 +990,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Изход от програмата заради некоригиран конфликт."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува)."
 
@@ -1081,21 +1087,33 @@ msgstr "непозната опциÑ� за знаците за интервалÐ
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "непозната опци� за игнориране на знаците за интервали „%s“"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "опциите „--reject“ и „--3way“ �а не�ъвме�тими"
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "като „--3way“, но извън хранилище"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "като „--index“, но извън хранилище"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
 
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "като „--cached“, но извън хранилище"
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "„%s“ извън хранилище"
 
 #: apply.c:800
 #, c-format
@@ -1320,8 +1338,8 @@ msgstr "неу�пешно прилагане на кръпка: „%s:%ld“"
 msgid "cannot checkout %s"
 msgstr "„%s“ не може да �е изтегли"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "файлът „%s“ не може да бъде прочетен"
@@ -1331,249 +1349,250 @@ msgstr "файлът „%s“ не може да бъде прочетен"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "изчитане на „%s“ �лед про�лед�ване на �имволна връзка"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "обектът � път „%s“ е преименуван или изтрит"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "„%s“ не �ъще�твува в индек�а"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "„%s“ не �ъответ�тва на индек�а"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "в хранилището лип�ват необходимите обекти-BLOB, за тройно �ливане."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Тройно �ливане…\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "текущото �ъдържание на „%s“ не може да бъде прочетено"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "�еу�пешно тройно �ливане…\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Кръпката бе приложена чи�то към „%s“.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Преминаване към пр�ко прилагане…\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "изтриващата кръпка о�тав� файла непразен"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "„%s“: неправилен вид"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "„%s“ е от вид „%o“, а �е очакваше „%o“"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправилен път: „%s“"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "„%s“: вече �ъще�твува в индек�а"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "„%s“: вече �ъще�твува в работното дърво"
 
-#: apply.c:3998
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o)"
 
-#: apply.c:4003
+#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o) на „%s“"
 
-#: apply.c:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "за�егнати�т файл „%s“ е �лед �имволна връзка"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Провер�ване на кръпката „%s“…"
 
-#: apply.c:4134
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "информаци�та за �умата по SHA1 за подмодула лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4141
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "�м�на на режима на до�тъпа на „%s“, който не е в текущи� връх „HEAD“"
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци�та за �умата по SHA1 лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "„%s“ не може да �е добави към временни� индек�"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "временни�т индек� не може да �е запази в „%s“"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "„%s“ не може да �е извади от индек�а"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "повредена кръпка за модула „%s“"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "не може да �е получи информаци� чрез „stat“ за ново�ъздадени� файл „%s“"
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "не може да �е за �ъздаде м��тото за �ъхранение на ново�ъздадени� файл „%s“"
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не може да �е добави запи� в кеша за „%s“"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "в „%s“ не може да �е пише"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "затвар�не на файла „%s“"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "файлът „%s“ не може да �е запише � режим на до�тъп „%o“"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Кръпката „%s“ бе приложена чи�то."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "вътрешна грешка"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
-msgstr "�ъкращаване на името на файла � отхвърлените парчета на „ %.*s.rej“"
+msgstr "�ъкращаване на името на файла � отхвърлените парчета на „%.*s.rej“"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "„%s“ не може да бъде отворен"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-то парче бе у�пешно приложено."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-то парче бе отхвърлено."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Пропу�ната кръпка: „%s“"
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "непознат вход"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"�а входа н�ма непразни кръпки (те �е приемат при опци� „--allow-empty“)"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "кръпката „%s“ не може да бъде отворена: %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
 msgstr[1] "пренебрегнати �а %d грешки в знаците за интервали"
 
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ред добав� грешки в знаците за интервали."
 msgstr[1] "%d реда добав�т грешки в знаците за интервали."
 
-#: apply.c:4973
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1582,141 +1601,139 @@ msgstr[0] ""
 msgstr[1] ""
 "Добавени �а %d реда �лед корекци�та на грешките в знаците за интервали."
 
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "�ови�т индек� не може да бъде запи�ан"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "без прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "БРОЙ"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "игнориране на редовете добавени от тази кръпка"
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "извеждане на �тати�тика на промените без прилагане на кръпката"
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "извеждане на бро� на добавените и изтритите редове"
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "извеждане на �тати�тика на входните данни без прилагане на кръпката"
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "проверка дали кръпката може да �е приложи, без дей�твително прилагане"
 
-#: apply.c:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверка дали кръпката може да бъде приложена към текущи� индек�"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "отбел�зване на новите файлове � „git add --intent-to-add“"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "прилагане на кръпката без пром�на на работното дърво"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, ко�то промен� и файлове извън работното дърво"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена.  Опци�та �е комбинира � „--check“/„--stat“/„--"
 "summary“"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "пробване � тройно �ливане, ако това не �работи — �тандартно прилагане на "
 "кръпка"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "�ъздаване на временен индек� на база на включената информаци� за индек�а"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "да �е о�игури контек�т от поне такъв БРОЙ �ъвпадащи редове"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "дей�твие"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "за�ичане на нови или променени редове � грешки в знаците за интервали"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "игнориране на промените в знаците за интервали при откриване на контек�та"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна по�ока"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "без изи�кване на дори и един ред контек�т"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тав�не на отхвърлените парчета във файлове � разширение „.rej“"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "позвол�ване на за�тъпващи �е парчета"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "повече подробно�ти"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно лип�ващ знак за нов ред в кра� на файл"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без довер�ване на номерата на редовете в заглавните ча�ти на парчетата"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "��Ч�Л��_ДИРЕКТОРИЯ"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "добав�не на тази ��Ч�Л��_ДИРЕКТОРИЯ към имената на в�ички файлове"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "да не �е връща грешка при празни кръпки"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1727,16 +1744,16 @@ msgstr "обектът-BLOB „%s“ не може да бъде обработÐ
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "неподдържани права за до�тъп до файл: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "филтърът „%s“ не може да бъде �тартиран"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "де�крипторът не може да бъде прена�очен"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "филтърът „%s“ върна грешка"
@@ -1780,19 +1797,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote ХР��ИЛИЩЕ [--exec КОМ��Д�] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "път�т „%s“ не �ъвпада � никой файл"
@@ -1834,7 +1845,7 @@ msgstr "ФОРМ�Т"
 msgid "archive format"
 msgstr "ФОРМ�Т на архива"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "ПРЕФИКС"
 
@@ -1844,9 +1855,9 @@ msgstr "добавÑ�не на този ПРЕФИКС към вÑ�еки път Ð
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "Ф�ЙЛ"
@@ -1876,7 +1887,7 @@ msgid "list supported archive formats"
 msgstr "извеждане на �пи�ъка � поддържаните формати"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "хранилище"
 
@@ -1884,7 +1895,7 @@ msgstr "хранилище"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получаване на архива от отдалеченото ХР��ИЛИЩЕ"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "команда"
@@ -1897,18 +1908,20 @@ msgstr "път към отдалечената команда „git-upload-arch
 msgid "Unexpected option --remote"
 msgstr "�еочаквана опци� „--remote“"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "опци�та „--exec“ изи�ква „--remote“"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "опци�та „%s“ изи�ква „%s“"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "�еочаквана опци� „--output“"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "опциите „--add-file“ и „--remote“ �а не�ъвме�тими"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -2016,7 +2029,7 @@ msgstr "необходима е вер�и� „%s“"
 msgid "could not create file '%s'"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
@@ -2070,10 +2083,10 @@ msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на крайно подаване"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -2096,101 +2109,97 @@ msgstr "н�ма път на име „%s“ в „%s“"
 msgid "cannot read blob %s for path %s"
 msgstr "обектът-BLOB „%s“ в път� %s не може да бъде прочетен"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"След корекци� на грешката, може да обновите\n"
-"информаци�та за �ледени� клон чрез:\n"
-"git branch --set-upstream-to=%s%s%s"
+"на�троените множе�тво указатели, които да �е �лед�т, не може да �е на�лед�т "
+"при пребазиране"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "not setting branch '%s' as its own upstream"
 msgstr ""
-"Клонът „%s“ не може да �лужи като източник за �об�твената �и �инхронизаци�."
+"клонът „%s“ не може да �лужи като източник за �об�твената �и �инхронизаци�"
 
-#: branch.c:93
+#: branch.c:144
 #, 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 '%s' by rebasing."
+msgstr "клонът „%s“ ще �леди „%s“ чрез пребазиране."
 
-#: branch.c:94
+#: branch.c:145
 #, 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 '%s'."
+msgstr "клонът „%s“ ще �леди „%s“."
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Клонът „%s“ ще �леди локални� клон „%s“ чрез пребазиране."
+msgid "branch '%s' set up to track:"
+msgstr "клонът „%s“ ще �леди:"
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Клонът „%s“ ще �леди локални� клон „%s“."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "на�тройките за �ледени� клон не може да бъдат запи�ани"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Клонът „%s“ ще �леди отдалечени� указател „%s“ чрез пребазиране."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"След корекци� на грешката, може да обновите\n"
+"информаци�та за �ледени� клон чрез:"
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Клонът „%s“ ще �леди отдалечени� указател „%s“."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"за�вка за на�лед�ване на �леденето от „%s“, но не е зададено отдалечено "
+"хранилище"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Клонът „%s“ ще �леди локални� указател „%s“ чрез пребазиране."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"за�вка за на�лед�ване на �леденето от „%s“, но не е на�троен режим за "
+"пребазиране"
 
-#: branch.c:110
+#: branch.c:252
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Клонът „%s“ ще �леди локални� указател „%s“."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "�а�тройките за �ледени� клон не може да бъдат запи�ани"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "н�ма �ледене: информаци�та за указател� „%s“ не е еднозначна"
 
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "��ма �ледене: информаци�та за указател� „%s“ не е еднозначна"
+msgid "'%s' is not a valid branch name"
+msgstr "„%s“ не е позволено име за клон"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "„%s“ не е позволено име за клон."
+msgid "a branch named '%s' already exists"
+msgstr "вече �ъще�твува клон � име „%s“."
 
-#: branch.c:208
+# FIXME
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Вече �ъще�твува клон � име „%s“."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Текущи�т клон не може да бъде принудително обновен."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"не може принудително да обновите клона „%s“, който е изтеглен в път� „%s“"
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "Зададените на�тройки за �леденето �а грешни — началото „%s“ не е клон."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"на�тройките за �леденето не може да �е зададат — началото „%s“ не е клон"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "за�вени�т отдалечен клон „%s“ не �ъще�твува"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2209,27 +2218,28 @@ msgstr ""
 "може да използвате „git push -u“, за да на�троите към кой клон да �е "
 "изтла�ква."
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "�еправилно име на обект: „%s“"
+msgid "not a valid object name: '%s'"
+msgstr "неправилно име на обект: „%s“"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Името на обект не е еднозначно: „%s“"
+msgid "ambiguous object name: '%s'"
+msgstr "името на обект не е еднозначно: „%s“"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "�еправилно м��то за начало на клон: „%s“"
+msgid "not a valid branch point: '%s'"
+msgstr "неправилно м��то за начало на клон: „%s“"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "„%s“ вече е изтеглен в „%s“"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "Указател�т „HEAD“ на работното дърво „%s“ не е обновен"
@@ -2254,7 +2264,7 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi
 msgid "unrecognized header: %s%s (%d)"
 msgstr "непозната заглавна ча�т: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2314,7 +2324,7 @@ msgstr "неподдържана вер�и� на индек�а %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "пратка %d не може да �е запише � алгоритъм %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "непознат аргумент: %s"
@@ -2351,7 +2361,7 @@ msgstr "повтар�щ �е идентификатор на откъ� %<PRIx3
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "ненулев идентификатор за краен откъ� %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "неправилна �тойно�т за цв�т: %.*s"
@@ -2402,197 +2412,197 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr "н�кои файлове на гра̀фа � подавани�та не може да бъдат открити"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "неправилна позици� на подаването.  Веро�тно графът � подавани�та е повреден"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "подаването „%s“ не може да бъде открито"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 "графът � подавани�та изи�ква генериране на данни за отме�тването, но такива "
 "лип�ват"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "подаването не може да бъде анализирано: %s"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "видът на обекта „%s“ не може да бъде определен"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Зареждане на познатите подавани� в гра̀фа � подавани�та"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Разшир�ване на до�тижимите подавани� в гра̀фа"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Изчи�тване на отбел�звани�та на подавани�та в гра̀фа � подавани�та"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Изчи�л�ване на топологичните нива в гра̀фа � подавани�та"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Изчи�л�ване на номерата на поколени�та в гра̀фа � подавани�та"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Изчи�л�ване на филтрите на Блум на пътищата � пром�на при подаването"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Събиране на �вързаните подавани�"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Откриване на подавани�та в гра̀фа в %d пакетен файл"
 msgstr[1] "Откриване на подавани�та в гра̀фа в %d пакетни файла"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "грешка при добав�не на пакетен файл „%s“"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "грешка при отвар�не на индек�а на „%s“"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Откриване на подавани�та в гра̀фа измежду пакетираните обекти"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Откриване на още върхове в гра̀фа � подавани�та"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "правилни�т брой на базовите идентификатори не може да �е запише"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "не може да бъде �ъздаден временен �лой за гра̀фа � подавани�та"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "правата за �поделен до�тъп до „%s“ не може да бъдат зададени"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Запазване на гра̀фа � подавани�та в %d па�"
 msgstr[1] "Запазване на гра̀фа � подавани�та в %d па�а"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "файлът � веригата на гра̀фа � подавани�та не може да �е отвори"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "о�новни�т файл на гра̀фа � подавани�та не може да бъде преименуван"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "временни�т файл на гра̀фа � подавани�та не може да бъде преименуван"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Тър�ене на подавани�та �ъ� �ливани�"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Сливане на гра̀фа � подавани�та"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "опит за запи� на гра̀фа � подавани�та, но на�тройката „core.commitGraph“ е "
 "изключена"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "прекалено много подавани� за запи�ване на гра̀фа"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "графът � подавани�та е � грешна �ума за проверка — веро�тно е повреден"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 "неправилна подредба на обектите по идентификатор в гра̀фа � подавани�та: „%s“ "
 "е преди „%s“, а не тр�бва"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "неправилна �тойно�т за откъ� в гра̀фа � подавани�та: fanout[%d] = %u, а "
 "тр�бва да е %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "подаване „%s“ в гра̀фа � подавани�та не може да �е анализира"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Проверка на подавани�та в гра̀фа"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "подаване „%s“ в базата от данни към гра̀фа � подавани�та не може да �е "
 "анализира"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа � "
 "подавани�та е „%s“, а тр�бва да е „%s“"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�пи�ъкът � родители на „%s“ в гра̀фа � подавани�та е прекалено дълъг"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "родител�т на „%s“ в гра̀фа � подавани�та е „%s“, а тр�бва да е „%s“"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�пи�ъкът � родители на „%s“ в гра̀фа � подавани�та е прекалено къ�"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2600,7 +2610,7 @@ msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е 0, а другаде "
 "не е"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2608,22 +2618,22 @@ msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та не е 0, а "
 "другаде е"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е %<PRIuMAX> < "
 "%<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "датата на подаване на „%s“ в гра̀фа � подавани�та е %<PRIuMAX>, а тр�бва да е "
 "%<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "„%s“ не може да �е анализира"
@@ -2656,29 +2666,29 @@ msgstr ""
 "\n"
 "    git config advice.graftFileDeprecated false"
 
-#: commit.c:1239
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 "Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Подаването „%s“ е без подпи� от GPG."
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2745,7 +2755,7 @@ msgstr "ключът не �ъдържа раздел: „%s“"
 msgid "key does not contain variable name: %s"
 msgstr "ключът не �ъдържа име на променлива: „%s“"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "неправилен ключ: „%s“"
@@ -2896,17 +2906,17 @@ msgstr "наÑ�тройката „core.commentChar“ Ñ‚Ñ€Ñ�бва да е Ñ�аÐ
 msgid "invalid mode for object creation: %s"
 msgstr "неправилен режим за �ъздаването на обекти: %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "неправилна �тойно�т за „%s“"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "тр�бва да е една от �ледните �тойно�ти: „nothing“ (без изтла�кване при лип�а "
@@ -2914,132 +2924,132 @@ msgstr ""
 "„simple“ (клонът �ъ� �ъщото име, от който �е издърпва), „upstream“ (клонът, "
 "от който �е издърпва) или „current“ (клонът �ъ� �ъщото име)"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправилно ниво на компре�иране при пакетиране: %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "обектът-BLOB „%s“ � конфигурации не може да �е зареди"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "указател�т „%s“ не �очи към обект-BLOB"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "обектът-BLOB „%s“ � конфигурации не може да бъде открит"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "„%s“ не може да бъде анализиран"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "неправилни на�тройки от командни� ред"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�еправилен %s: „%s“"
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "�тойно�тта на „splitIndex.maxPercentChange“ тр�бва да е между 1 и 100, а не "
 "%d"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "неразпозната �тойно�т „%s“ от командни� ред"
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправилна на�тройка „%s“ във файла „%s“ на ред №%d"
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "неправилно име на раздел: „%s“"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "зададени �а н�колко �тойно�ти за „%s“"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "нови�т конфигурационен файл „%s“ не може да бъде запазен"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде заключен"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "отвар�не на „%s“"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "неправилен шаблон: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "неправилен конфигурационен файл: „%s“"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "неу�пешно изпълнение на „fstat“ върху „%s“"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "неу�пешно изпълнение на „mmap“ върху „%s“%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "неу�пешна �м�на на права � „chmod“ върху „%s“"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде запи�ан"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "„%s“ не може да �е зададе да е „%s“"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "„%s“ не може да �е премахне"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "неправилно име на раздел: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "лип�ва �тойно�т за „%s“"
@@ -3223,7 +3233,7 @@ msgstr "необичайни�т път „%s“ е блокиран"
 msgid "unable to fork"
 msgstr "неу�пешно �ъздаване на проце�"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Проверка на �вързано�тта"
 
@@ -3535,19 +3545,19 @@ msgstr ""
 "�е е хранилище на git.  Ползвайте опци�та „--no-index“, за да �равните "
 "пътища извън работно дърво"
 
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  �еу�пешно разпознаване на „%s“ като процент-праг за �тати�тиката по "
 "директории\n"
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  �епознат параметър „%s“ за �тати�тиката по директории'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3556,7 +3566,7 @@ msgstr ""
 "„default“ (�тандартно), „blocks“ (парчета), „zebra“ (райе), „dimmed-"
 "zebra“ (тъмно райе), „plain“ (обикновено)"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3569,7 +3579,7 @@ msgstr ""
 "„allow-indentation-change“ (позвол�ване на промените в празните знаци за "
 "форматиране)"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3577,12 +3587,12 @@ msgstr ""
 "„color-moved-ws“: „allow-indentation-change“ е не�ъвме�тима � другите режими "
 "за празни знаци"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „diff.submodule“"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3591,53 +3601,49 @@ msgstr ""
 "Грешки в на�тройката „diff.dirstat“:\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "външната програма за разлики завърши неу�пешно.  Спиране на работата при „%s“"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr ""
-"опциите „--name-only“, „--name-status“, „--check“ и „-s“ �а не�ъвме�тими "
-"една � друга"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“, „%s“ и „%s“ �а не�ъвме�тими"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "опциите „-G“, „-S“ и „--find-object“ �а не�ъвме�тими една � друга"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "опциите „%s“, „%s“ и „%s“ �а не�ъвме�тими"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"опциите „-G“ и „--pickaxe-regex“ �а не�ъвме�тими една � друга.  Пробвайте „--"
-"pickaxe-regex“ �ъ� „-S“"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими, използвайте „%s“ � „%s“"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"опциите „--pickaxe-all“ и „--find-object“ �а не�ъвме�тими една � друга.  "
-"Пробвайте „--pickaxe-all“ � „-G“ и „-S“"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими, използвайте „%s“ � „%s“ и „%s“"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "опци�та „--follow“ изи�ква точно един път"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "неправилна �тойно�т за „--stat“: %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "опци�та „%s“ очаква чи�ло за аргумент"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3646,44 +3652,44 @@ msgstr ""
 "�еразпознат параметър към опци�та „--dirstat/-X“:\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "непознат вид пром�на: „%c“ в „--diff-filter=%s“"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "непозната �тойно�т �лед „ws-error-highlight=%.*s“"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "„%s“ не може да �е открие"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 "опци�та „%s“ изи�ква �тойно�ти за МИ�ИМ�ЛЕ�_%%_ПРОМЯ��_З�_ИЗТОЧ�ИК_/"
 "М�КСИМ�ЛЕ�_%%_ПРОМЯ��_З�_З�МЯ�� от"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "опци�та „%s“ изи�ква знак, а не: „%s“"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "неправилен аргумент за „--color-moved“: „%s“"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3692,158 +3698,158 @@ msgstr ""
 "Майер�), „minimal“ (минимизиране на разликите), „patience“ (па�иан�) и "
 "„histogram“ (хи�тограмен)"
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "неправилен аргумент към „%s“"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "неправилен регул�рен израз подаден към „-I“: „%s“"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "неразпознат параметър към опци�та „--submodule“: „%s“"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "неправилен аргумент към „--word-diff“: „%s“"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Формат на изхода за разликите"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "�ъздаване на кръпки"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "без извеждане на разликите"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "БРОЙ"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "файловете � разлики да �а � контек�т � такъв БРОЙ редове"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "файловете � разлики да �а в �уров формат"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "п�евдоним на „-p --raw“"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "п�евдоним на „-p --stat“"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "„--stat“ във формат за четене от програма"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "извеждане �амо на по�ледни� ред на „--stat“"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "П�Р�МЕТЪР_1, П�Р�МЕТЪР_2, …"
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "извеждане на разпределението на промените за в��ка поддиректори�"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "п�евдоним на „--dirstat=cumulative“"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "п�евдоним на „--dirstat=Ф�ЙЛ…,П�Р�МЕТЪР_1,П�Р�МЕТЪР_2,…“"
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "предупреждаване, ако промените вод�т до маркери за конфликт или грешки в "
 "празните знаци"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "�ъкратено резюме на �ъздадените, преименуваните и файловете � пром�на на "
 "режима на до�тъп"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "извеждане �амо на имената на променените файлове"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "извеждане �амо на имената и �тати�тиката за променените файлове"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "ШИРОЧИ��[,ИМЕ-ШИРОЧИ��[,БРОЙ]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "извеждане на �тати�тика за промените"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "ШИРОЧИ��"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "�тати�тика � такава ШИРОЧИ�� за промените"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "�тати�тика за промените � такава ШИРОЧИ�� на имената"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "�тати�тика за промените � такава ШИРОЧИ�� на гра̀фа"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "БРОЙ"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "ограничаване на БРО� на редовете в �тати�тиката за промените"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "кратко резюме в �тати�тиката за промените"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "извеждане на двоична разлика във вид за прилагане"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "показване на пълните имена на обекти в редовете за индек�а при вариантите "
 "преди и �лед пром�ната"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "разлики в цв�т"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "ВИД"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3851,7 +3857,7 @@ msgstr ""
 "грешките в празните знаци да �е указват в редовете за контек�та, вариантите "
 "преди и �лед разликата,"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3859,261 +3865,261 @@ msgstr ""
 "без преименуване на пътищата.  Да �е използват нулеви байтове за разделители "
 "на полета в изхода при ползване на опци�та „--raw“ или „--numstat“"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "ПРЕФИКС"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "префик� вме�то „a/“ за източник"
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "префик� вме�то „b/“ за цел"
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "добав�не на допълнителен префик� за в�еки ред на изхода"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "без префик� за източника и целта"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "извеждане на контек�т между по�ледователните парчета � разлики от указани� "
 "БРОЙ редове"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "З��К"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "знак вме�то „+“ за нов вариант на ред"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "знак вме�то „-“ за �тар вариант на ред"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "знак вме�то „ “ за контек�т"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "�а�тройки за разлики � преименуване"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "МИ�ИМ�ЛЕ�_%_ПРОМЯ��_З�_ИЗТОЧ�ИК[/М�КСИМ�ЛE�_%_ПРОМЯ��_З�_З�МЯ��]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "заме�тване на пълните промени � по�ледователно�т от изтриване и �ъздаване"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "за�ичане на преименувани�та"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "без предварителен вариант при изтриване"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "за�ичане на копирани�та"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "тър�ене на копирано и от непроменените файлове"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "без тър�ене на преименувани�"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "празни обекти като източник при преименувани�"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "продължаване на извеждането на и�тори�та — без отр�зването при преименувани� "
 "на файл"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 "без за�ичане на преименувани�/копирани�, ако бро�т им надвишава тази �тойно�т"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Опции към алгоритъма за разлики"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "тър�ене на възможно най-малка разлика"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "без промени в празните знаци при �равн�ване на редове"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "без промени в празните знаци"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "без промени в празните знаци в кра� на редовете"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "без промени в знаците за край на ред"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "без промени в редовете, които �а изц�ло от празни знаци"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "РЕГУЛЯРЕ�_ИЗР�З"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "без промени в редовете, които напа�ват РЕГУЛЯР�и�_ИЗР�З"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "еври�тика за преме�тване на границите на парчетата за уле�н�ване на четенето"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "разлика чрез алгоритъм за подредба като па�иан�"
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "разлика по хи�тограмни� алгоритъм"
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "�ЛГОРИТЪМ"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "избор на �ЛГОРИТЪМа за разлики"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "ТЕКСТ"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "разлика чрез алгоритъма �ъ� закотв�не"
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "РЕЖИМ"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "разлика по думи, като �е ползва този РЕЖИМ за отдел�нето на променените думи"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "РЕГУЛЯРЕ�_ИЗР�З за раздел�не по думи"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "п�евдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕ�_ИЗР�З“"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "различен цв�т за извеждане на преме�тените редове"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 "режим за пре�качането на празните знаци при задаването на „--color-moved“"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Други опции за разлики"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "при изпълнение от поддиректори� да �е пренебрегват разликите извън не� и да "
 "�е ползват отно�ителни пътища"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "обработка на в�ички файлове като тек�тови"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "разм�на на двата входа — обръщане на разликата"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 "завършване � код за �ъ�то�ние 1 при наличието на разлики, а в противен "
 "�лучай — � 0"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "без в��какъв изход от програмата"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "позвол�ване на изпълнение на външна помощна програма за разлики"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "изпълнение на външни програми-филтри при �равнението на двоични файлове"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "КОГ�"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "игнориране на промените в подмодулите при извеждането на разликите"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "ФОРМ�Т"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "начин за извеждане на промените в подмодулите"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "без включване в индек�а на запи�ите, добавени � „git add -N“"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "включване в индек�а на запи�ите, добавени � „git add -N“"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "�ИЗ"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "тър�ене на разлики, които промен�т бро� на по�ва на указаните низове"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -4121,69 +4127,69 @@ msgstr ""
 "тър�ене на разлики, които промен�т бро� на по�ва на низовете, които напа�ват "
 "на регул�рни� израз"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "извеждане на в�ички промени � „-G“/„-S“"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "�ИЗът към „-S“ да �е тълкува като разширен регул�рен израз по POSIX"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "управление на подредбата на файловете в изхода"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "ПЪТ"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "първо извеждане на пром�ната в указани� път"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "пре�качане на изхода към указани� път"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "ИДЕ�ТИФИК�ТОР_��_ОБЕКТ"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "тър�ене на разлики, които промен�т бро� на по�ва на указани� обект"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "избор на файловете по вид разлика"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "Ф�ЙЛ"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Изход към указани� файл"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 "пълното тър�ене на преименувани� на обекти �е пре�кача поради многото "
 "файлове."
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "у�тановени �а �амо точните копи� на променените пътища поради многото "
 "файлове."
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4225,30 +4231,30 @@ msgstr ""
 "файлът определ�щ ча�тично�тта на изтегленото хранилище може да има проблем: "
 "шаблонът „%s“ �е повтар�"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "изключване на пътеводното напа�ване"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "„%s“ не може да �е ползва за игнорираните файлове (като gitignore)"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "името и вер�и�та на �дрото не б�ха получени"
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 "кешът за не�ледените файлове е изключен на тази �и�тема или ме�тоположение"
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4256,36 +4262,36 @@ msgstr ""
 "Името на директори�та не може да бъде отгатнато.\n"
 "Задайте директори�та изрично на командни� ред"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "файлът � индек�а е повреден в хранилището „%s“"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "директори�та на git не може да �е мигрира от „%s“ до „%s“"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "Под�казка: чака �е редакторът ви да затвори файла …%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "Филтриране на �ъдържанието"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху файла „%s“"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "неправилен път към про�тран�тва от имена „%s“"
@@ -4295,276 +4301,272 @@ msgstr "неправилен път към проÑ�транÑ�тва от имеÐ
 msgid "too many args to run %s"
 msgstr "прекалено много аргументи за изпълнение „%s“"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: очаква �е плитък �пи�ък"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: �лед плитък �пи�ък �е очаква изчи�тващ пакет „flush“"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 "git fetch-pack: очаква �е „ACK“/„NAK“, а бе получен изчи�тващ пакет „flush“"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: очаква �е „ACK“/„NAK“, а бе получено „%s“"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "невъзможно пи�ане към отдалечено хранилище"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "опци�та „--stateless-rpc“ изи�ква  „multi_ack_detailed“"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправилен плитък ред: „%s“"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправилен неплитък ред: „%s“"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "обектът „%s“ лип�ва"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "грешка в обекта: „%s“"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "не е открит плитък обект: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "очаква �е плитък или не обект, а бе получено: „%s“"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено бе %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "неправилно подаване: „%s“"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "преу�танов�ване"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "дей�твието завърши"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено бе %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Отбел�зване на „%s“ като пълно"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "вече има „%s“ (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за демултиплек�ора"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "протоколна грешка: неправилна заглавна ча�т на пакет"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за „%s“"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: неправилен изход от командата „index-pack“"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "грешка в демултиплек�ора"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и�та на �ървъра е: %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Сървърът поддържа „%s“"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Сървърът не поддържа плитки клиенти"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Сървърът не поддържа опци�та „--shallow-since“"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Сървърът не поддържа опци�та „--shallow-exclude“"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Сървърът не поддържа опци�та „--deepen“"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "н�ма общи подавани�"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "клонираното хранилище е плитко, затова н�ма да �е клонира."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: неу�пешно до�тав�не."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "различни алгоритми — на клиента: „%s“, на �ървъра: „%s“"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "�ървърът не поддържа алгоритъм „%s“"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Сървърът не поддържа плитки за�вки"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Сървърът поддържа филтри"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "невъзможно пи�ане към отдалечено хранилище"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "грешка при прочитане на заглавната ча�т на раздел „%s“"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "очаква �е „%s“, а бе получено „%s“"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "неочакван ред за потвърждение: „%s“"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "грешка при обработка на потвърждени�та: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 "очакваше �е пакетни�т файл да бъде изпратен �лед отговор за готовно�т (ready)"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "очакваше �е �лед лип�а на отговор за готовно�т (ready) да не �е �е пращат "
 "други раздели"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "грешка при обработка на информаци� за дълбочината/плитко�тта: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "очаква �е и�кан указател, а бе получено: „%s“"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "неочакван и�кан указател: „%s“"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "грешка при обработката на и�каните указатели: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: очаква �е пакет за край на отговора"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "не може да бъде открит подход�щ връх от отдалеченото хранилище"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "отдалеченото хранилище не изпрати в�ички необходими обекти."
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "неочаквано �ъ�то�ние за готовно�т от отдалечено хранилище"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "такъв отдалечен указател н�ма: %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сървърът не позвол�ва за�вка за необ�вен обект „%s“"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "не може да �е �ъздаде временен файл"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Програмата не у�п� да запише �амо�то�телни� подпи� в „%s“"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4572,7 +4574,7 @@ msgstr ""
 "на�тройката „gpg.ssh.allowedSignersFile“ тр�бва да е зададена за проверка на "
 "подпи�ите на ssh"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4582,62 +4584,62 @@ msgstr ""
 "\n"
 "    ssh-keygen -Y find-principals/verify"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr ""
 "файлът за отхвърл�не на подпи�и на ssh е на�троен, но не може да �е открие: "
 "%s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "лош/не�ъвме�тим подпи� „%s“"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "отпечатъкът по ssh на ключа „%s“ не може да бъде получен"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 "Поне една от на�тройките „user.signingkey“ или „gpg.ssh.defaultKeyCommand“ "
 "тр�бва да е зададена"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
 "командата „gpg.ssh.defaultKeyCommand“ завърши у�пешно, но не върна никакви "
 "ключове: %s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "неу�пешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "Програмата „gpg“ не подпи�а данните"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr ""
 "за подпи�ване �ъ� ssh е необходимо да зададете на�тройката „user.signingkey“"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "неу�пешно запазване на ключа за подпи�ване на ssh в „%s“"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "неу�пешно запазване на буфера за подпи�ване на ssh в „%s“"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4647,7 +4649,7 @@ msgstr ""
 "\n"
 "    ssh-keygen -Y"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "неу�пешно прочитане на буфера за подпи�ване на ssh от „%s“"
@@ -4657,7 +4659,7 @@ msgstr "неуÑ�пешно прочитане на буфера за подпиÑ
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "пре�качане на неправилни� цв�т „%.*s“ в „log.graphColors“"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4665,18 +4667,18 @@ msgstr ""
 "зададени�т шаблон �ъдържа нулев знак (идва от -f „Ф�ЙЛ“).  Това �е поддържа "
 "в комбинаци� � „-P“ �амо при ползването на „PCRE v2“"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s“: файлът �очен от „%s“ не може да бъде прочетен"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
@@ -4800,8 +4802,8 @@ msgstr ""
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Да �е изпълни „%s“ вме�то това? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Да �е изпълни „%s“ вме�то това [y/N]? "
 
 #: help.c:654
 #, c-format
@@ -5032,7 +5034,7 @@ msgstr "Ñ�лед аргументите към „ls-refs“ Ñ�е очаква Ð
 msgid "quoted CRLF detected"
 msgstr "цитирани знаци CRLF"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "неправилно дей�твие „%s“ за „%s“"
@@ -5266,7 +5268,7 @@ msgstr "ПОДМОДУЛ"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5275,7 +5277,7 @@ msgstr ""
 "КО�ФЛИКТ (пром�на/изтриване): „%s“ е изтрит в %s, а е променен в %s.  Вер�и� "
 "%s на „%s“ е о�тавена в дървото."
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5287,7 +5289,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "неу�пешно �ъбиране на информаци�та за �ливането на „%s“, „%s“ и „%s“"
@@ -5301,7 +5303,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "    %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Вече е обновено."
 
@@ -5594,7 +5596,7 @@ msgstr "�ливането не върна подаване"
 msgid "Could not parse object '%s'"
 msgstr "�еу�пешен анализ на обекта „%s“"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Индек�ът не може да бъде прочетен"
@@ -5603,8 +5605,8 @@ msgstr "Индек�ът не може да бъде прочетен"
 msgid "failed to read the cache"
 msgstr "кешът не може да бъде прочетен"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "неу�пешно запи�ване на нови� индек�"
@@ -5613,166 +5615,166 @@ msgstr "неу�пешно запи�ване на нови� индек�"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "неправилен размер на откъ� (OID fanout) на индек�а за множе�тво пакети"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "файлът � индек�а за множе�тво пакети „%s“ е твърде малък"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "отпечатъкът на индек�а за множе�тво пакети 0x%08x не �ъвпада � 0x%08x"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "непозната вер�и� на индек� за множе�тво пакети — %d"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 "вер�и�та на контролната �ума на индек�а за множе�тво пакети %u не �ъвпада � "
 "%u"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "лип�ва откъ� (pack-name) от индек� за множе�тво пакети"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "лип�ва откъ� (OID fanout) от индек� за множе�тво пакети"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "лип�ва откъ� (OID lookup) от индек� за множе�тво пакети"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "лип�ва откъ� за отме�твани�та на обекти от индек� за множе�тво пакети"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "неправилна подредба на имената в индек� за множе�тво пакети: „%s“ �е по�ви "
 "преди „%s“"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "индек�ът за множе�тво пакети �ъдържа 64-битови отме�твани�, но размерът на "
 "„off_t“ е недо�татъчен"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде добавен"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "индек�ът за пакети „%s“ не може да бъде отворен"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "обект %d в пакетни� файл лип�ва"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "файлът за индек�а не може да бъде �ъхранен"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "редът не може да �е анализира: „%s“"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "неправилен ред: „%s“."
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr ""
 "индек�ът за множе�тво пакети �е пре�кача, защото контролната �ума не �ъвпада"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "пакетът не може да �е зареди"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "индек�ът за „%s“ не може да �е отвори"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Добав�не на пакетни файлове към индек� за множе�тво пакети"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "непознат предпочитан пакет: %s"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr ""
 "не може да изберете „%s“, който не �ъдържа обекти, за предпочитан пакет"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "пакетни�т файл за триене „%s“ не може да �е открие"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "предпочитани�т пакет „%s“ е о�тар�л"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "н�ма пакетни файлове за индек�иране"
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "многопакетната битова ма�ка не може да бъде запазена"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "индек�ът за множе�тво пакети не може да бъде запазен"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "индек�ът за множе�тво пакети не може да бъде изчи�тен при „%s“"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "файлът � индек�а за множе�тво пакети, но не може да бъде анализиран"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "неправилна контролна �ума"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Тър�ене на указаните пакетни файлове"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5780,58 +5782,58 @@ msgstr ""
 "неправилна подредба на откъ�и (OID fanout): fanout[%d] = %<PRIx32> > "
 "%<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "във файла � индек�а за множе�тво пакети н�ма идентификатори на обекти"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 "Проверка на подредбата на идентификатори на обекти във файл � индек� към "
 "множе�тво пакетни файлове"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 "неправилна подредба на откъ�и (OID lookup): oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Подредба на обектите по пакетни файлове"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Проверка на отме�тването на обекти"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "запи�ът в пакета за обекта oid[%d] = %s не може да бъде зареден"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "индек�ът на пакета „%s“ не може да бъде зареден"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "неправилно отме�тване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Пребро�ване на �вързаните обекти"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Тър�ене и изтриване на не�вързаните пакетни файлове"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "командата „pack-objects“ не може да бъде �тартирана"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "командата „pack-objects“ не може да бъде завършена"
 
@@ -5898,263 +5900,263 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Зададена е лоша �тойно�т на променливата „%s“: „%s“"
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "директори�та за обекти „%s“ не �ъще�твува, проверете „.git/objects/info/"
 "alternates“"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "алтернативни�т път към обекти не може да бъде нормализиран: „%s“"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: алтернативните хранилища за обекти �е пренебрегват поради прекалено "
 "дълбоко влагане"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "директори�та за обекти „%s“ не може да бъде нормализирана"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "заключващи�т файл за алтернативите не може да �е отвори � „fdopen“"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "файлът � алтернативите не може да бъде прочетен"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "нови�т файл � алтернативите не може да бъде преме�тен на м��тото му"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "път�т „%s“ не �ъще�твува."
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "еталонното хранилище „%s“ не е локално"
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "еталонното хранилище „%s“ е плитко"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "еталонното хранилище „%s“ е � при�аждане"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "директори�та � обекти, ко�то отговар� на „%s“, не може да бъде открита"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 "неу�пешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "неу�пешно изпълнение на „mmap“%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "файлът � обектите „%s“ е празен"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "непакетирани�т обект „%s“ е повреден"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "грешни данни в кра� на непакетирани� обект „%s“"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "неправилен вид обект"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "заглавната ча�т на „%s“ е прекалено дълга — надхвърл� %d байта"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "обектът „%s“ не може да бъде прочетен"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "заме�тител�т „%s“ на „%s“ не може да бъде открит"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "непакетирани�т обект „%s“ (в „%s“) е повреден"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "пакетирани�т обект „%s“ (в „%s“) е повреден"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "файлът „%s“ не може да бъде запи�ан"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "правата за до�тъп до „%s“ не може да бъдат зададени"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "грешка при запи� на файл"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "грешка при затвар�нето на файла � непакетиран обект"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "н�ма права за добав�не на обект към базата от данни на хранилището „%s“"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "не може да бъде �ъздаден временен файл"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "грешка при запи�а на файла � непакетиран обект"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "нови�т обект „%s“ не може да �е компре�ира � „deflate“: %d"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "неу�пешно приключване на „deflate“ върху „%s“: %d"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "грешка поради не�табилни� източник данни за обектите „%s“"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "неу�пешно задаване на време на до�тъп/�ъздаване чрез „utime“ на „%s“"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "обектът за „%s“ не може да �е прочете"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "повредено подаване"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "повреден етикет"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "грешка при четене по време на индек�иране на „%s“"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "непълно прочитане по време на индек�иране на „%s“"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "„%s“ не може да �е вмъкне в базата от данни"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "неподдържан вид файл: „%s“"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "„%s“ е неправилен обект"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "„%s“ е неправилен обект от вид „%s“"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "обектът „%s“ не може да бъде отворен"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "неправилна контролна �ума за „%s“ (тр�бва да е %s)"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "неу�пешно изпълнение на „mmap“ върху „%s“"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "�ъдържанието на „%s“ не може да бъде разпакетирано"
@@ -6283,27 +6285,27 @@ msgstr "обектът „%s“ не може да бъде анализиран
 msgid "hash mismatch %s"
 msgstr "разлика в контролната �ума: „%s“"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "задължителни�т обратен индек� лип�ва в многопакетната битова ма�ка"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr ""
 "load_reverse_index: пакетът не може да �е отвори (при зареждане на обратни� "
 "индек�)"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "размерът на „%s“ не може да бъде получен"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "„%s“ лип�ва в пакет „%s“ при отме�тване %<PRIuMAX>"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "използваното м��то за „%s“ не може да бъде получено"
@@ -6354,52 +6356,57 @@ msgstr "не може да �е дадат права за четене на „
 msgid "could not write '%s' promisor file"
 msgstr "гарантиращи�т файл „%s“ не може да �е запише"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 "отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "не може да �е изпълни „mmap“ върху пакетни� файл „%s“%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
 "индек�ът да е повреден)"
 
-#: packfile.c:1927
+#: packfile.c:1928
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "отме�тване преди кра� на индек�а на пакетни� файл „%s“ (възможно е индек�ът "
 "да е отр�зан)"
 
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "опци�та „%s“ очаква чи�ло за аргумент"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "неправилна дата на �рок: „%s“"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr ""
 "опци�та „%s“ изи�ква н�ко� от �тойно�тите: „always“ (винаги), "
 "„auto“ (автоматично) или „never“ (никога)"
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "неправилно име на обект „%s“"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "опци�та „%s“ изи�ква н�ко� от �тойно�тите: „%s“ или „%s“"
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6436,36 +6443,36 @@ msgstr ""
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "нееднозначна опци�: „%s“ (може да е „--%s%s“ или „--%s%s“)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "„--%s“ (� 2 тирета) ли имахте предвид?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "п�евдоним на „--%s“"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "непозната опци�: „%s“"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "непознат флаг „%c“"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "непозната �тойно�т извън „ascii“ в низа: „%s“"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "употреба: %s"
@@ -6473,7 +6480,7 @@ msgstr "употреба: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "     или: %s"
@@ -6497,17 +6504,17 @@ msgstr "     или: %s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-ЧИСЛО"
 
@@ -6638,17 +6645,17 @@ msgstr "грешка при четене"
 msgid "the remote end hung up unexpectedly"
 msgstr "отдалеченото хранилище неочаквано прекъ�на връзката"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "протоколна грешка: неправилна дължина на ред: %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "отдалечена грешка: %s"
@@ -6703,7 +6710,7 @@ msgid "could not read `log` output"
 msgstr ""
 "изходът от командата за журнала � подавани� „log“ не може да �е прочете"
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "подаването „%s“ не може да бъде анализирано"
@@ -6726,62 +6733,58 @@ msgstr "заглавната чаÑ�Ñ‚ на git „%.*s“ не може да Ñ�Ð
 msgid "failed to generate diff"
 msgstr "неу�пешно тър�ене на разлика"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "опциите „--left-only“ и „--right-only“ �а не�ъвме�тими"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "журналът � подавани�та на „%s“ не може да бъде анализиран"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 "н�ма да бъде добавен п�евдоним за файл „%s“ („%s“ вече �ъще�твува в индек�а)"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "в базата от данни за обектите не може да �е �ъздаде празен обект-BLOB"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: може да добав�те �амо обикновени файлове, �имволни връзки и директории "
 "на git"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "не е изтеглено подаване в „%s“"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "файлът „%s“ не може да бъде индек�иран"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "„%s“ не може да �е добави в индек�а"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "„stat“ не може да �е изпълни върху „%s“"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "„%s“ �ъще�твува и като файл, и като директори�"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Обнов�ване на индек�а"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6790,7 +6793,7 @@ msgstr ""
 "Зададена е неправилна �тойно�т на на�тройката „index.version“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6800,152 +6803,152 @@ msgstr ""
 "„GIT_INDEX_VERSION“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "неправилен подпи�: „0x%08x“"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "неправилна вер�и� на индек�а %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "неправилен подпи� за контролна �ума по SHA1 на файла на индек�а"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 "индек�ът ползва разширение „%.4s“, което не �е поддържа от тази вер�и� на git"
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "игнориране на разширението „%.4s“"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "непознат формат на запи� в индек�а: „0x%08x“"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "неправилно име на поле в индек�а близо до път� „%s“"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "неподредени запи�и в индек�а"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "множе�тво запи�и за �лети� файл „%s“"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "неподредени запи�и за „%s“"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "файлът � индек�а е повреден"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 "не може да �е �ъздаде нишка за зареждане на обектите от кеша "
 "(load_cache_entries): %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 "не може да �е изчака нишка за зареждане на обектите от кеша "
 "(load_cache_entries): %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: неу�пешно отвар�не на файла на индек�а"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: не може да �е получи информаци� за отворени� индек� �ъ� „stat“"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: файлът на индек�а е по-малък от очакваното"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s: неу�пешно изпълнение на „mmap“ върху индек�ни� файл%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 "не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а "
 "(load_index_extensions): %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 "не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а "
 "(load_index_extensions): %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "�поделени�т индек� „%s“ не може да �е обнови"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "грешки в индек�а — в „%2$s“ �е очаква „%1$s“, а бе получено „%3$s“"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "„%s“ не може да �е затвори"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "индек�ът не може да бъде превърнат в ча�тичен"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху „%s“"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не може да �е отвори директори�та на git: %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "правата за до�тъп до „%s“ не може да бъдат поправени"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: не може да �е премине към етап №0"
@@ -7068,8 +7071,8 @@ msgstr ""
 "�ко изтриете в�ичко, пребазирането ще бъде преу�тановено.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -7111,7 +7114,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s: „merges“ замен� „preserve“"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "изтрит"
 
@@ -7150,7 +7153,8 @@ msgstr "очаква �е ц�ло чи�ло за „refname:lstrip=%s“"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:rstrip=%s“"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "непознат аргумент за „%%(%s)“: %s"
@@ -7160,11 +7164,6 @@ msgstr "непознат аргумент за „%%(%s)“: %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) не приема аргументи"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "непознат аргумент за %%(objectsize): %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -7175,11 +7174,6 @@ msgstr "%%(deltabase) не приема аргументи"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) не приема аргументи"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "непознат аргумент за %%(subject): %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -7195,26 +7189,11 @@ msgstr "непознат аргумент „%%(trailers)“: %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "очаква �е положителна �тойно�т за „contents:lines=%s“"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "непознат аргумент за %%(contents): %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "непознат аргумент за „%%(raw)“: %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "очаква �е положителна �тойно�т за „%s“ в %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "непознат аргумент „%s“ в %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -7235,21 +7214,11 @@ msgstr "непозната позици�: %s"
 msgid "unrecognized width:%s"
 msgstr "непозната широчина: %s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "непознат аргумент за %%(align): %s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "очаква �е положителна широчина � лек�емата „%%(align)“"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "непознат аргумент за „%%(if)“: %s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -7271,15 +7240,10 @@ msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "не е хранилище на git, а полето „%.*s“ изи�ква до�тъп данни на обектни"
 
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "формат: лек�емата %%(if) е използвана без �ъответната � %%(then)"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "формат: лек�емата %%(then) е използвана без �ъответната � %%(if)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "формат: лек�емата %%(%s) е използвана без �ъответната � %%(%s)"
 
 #: ref-filter.c:912
 #, c-format
@@ -7291,16 +7255,6 @@ msgstr "формат: лек�емата %%(then) е използвана пов
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: лек�емата %%(then) е използвана �лед %%(else)"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(if)"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(then)"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7376,22 +7330,22 @@ msgstr "обект �ъ� �грешен формат при „%s“"
 msgid "ignoring ref with broken name %s"
 msgstr "игнориране на указател� � грешно име „%s“"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "игнориране на повредени� указател „%s“"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправилно име на обект „%s“"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "опци�та „%s“ не �очи към подаване"
@@ -7436,71 +7390,71 @@ msgstr "„%s“ не може да бъде получен"
 msgid "invalid branch name: %s = %s"
 msgstr "неправилно име на клон: „%s = %s“"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "игнориране на указател на обект извън клон „%s“"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "има пропу�ки в журнала � подавани�та за указател� „%s“ �лед „%s“"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "журналът � подавани�та за указател� „%s“ �вършва неочаквано �лед „%s“"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "журналът � подавани�та за указател� „%s“ е празен"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "указател не може да �е обнови � грешно име „%s“"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "неу�пешно обнов�ване на указател� (update_ref) „%s“: %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "не �а позволени повече от една промени на указател� „%s“"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "обнов�вани�та на указатели �а забранени в �реди под карантина"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "обнов�вани�та на указатели �а преу�тановени от кука"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "„%s“ �ъще�твува, не може да �е �ъздаде „%s“"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "невъзможно е едновременно да �е обработват „%s“ и „%s“"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "Указател�т „%s“ не може да бъде изтрит: %s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "Указателите не може да бъдат изтрити: %s"
@@ -7510,51 +7464,51 @@ msgstr "Указателите не може да бъдат изтрити: %s"
 msgid "invalid refspec '%s'"
 msgstr "неправилен указател: „%s“"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "�ъкращението за отдалечено хранилище не може за започва �ъ� знака „/“: %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "зададен е повече от един пакет за получаване, ще �е ползва първи�т"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "зададен е повече от един пакет за изпращане, ще �е ползва първи�т"
 
-#: remote.c:590
+#: remote.c:699
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�евъзможно е да �е до�тав�т едновременно и „%s“, и „%s“ към „%s“"
 
-#: remote.c:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "„%s“ обикновено �леди „%s“, а не „%s“"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "„%s“ �леди както „%s“, така и „%s“"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "ключ „%s“ на шаблона не �ъдържа „*“"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "�тойно�т „%s“ на шаблона не �ъдържа „*“"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "указател�т на вер�и�-източник „%s“ не �ъвпада � никой обект"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "указател�т на вер�и�-източник „%s“ �ъвпада � повече от един обект"
@@ -7563,7 +7517,7 @@ msgstr "указателÑ�Ñ‚ на верÑ�иÑ�-източник „%s“ Ñ�ъвÐ
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7587,7 +7541,7 @@ msgstr ""
 "�икой от вариантите не �работи.  Тр�бва �ами да укажете пълното име на\n"
 "указател�."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7598,7 +7552,7 @@ msgstr ""
 "като\n"
 "изтла�кате към „%s:refs/heads/%s“?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7609,7 +7563,7 @@ msgstr ""
 "като\n"
 "изтла�кате към „%s:refs/tags/%s“?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7619,7 +7573,7 @@ msgstr ""
 "ИЗТОЧ�ИКът е обект-дърво.  �е целите ли в�ъщно�т да �ъздадете нов клон като\n"
 "изтла�кате към „%s:refs/tags/%s“?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7629,118 +7583,118 @@ msgstr ""
 "ИЗТОЧ�ИКът е обект-BLOB.  �е целите ли в�ъщно�т да �ъздадете нов клон като\n"
 "изтла�кате към „%s:refs/tags/%s“?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "не е открит клон �ъответ�тващ на „%s“"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "„%s“ не може да �е изтрие: отдалечени� указател не �ъще�твува"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "указател�т на вер�и�-цел „%s“ �ъвпада � повече от един обект"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 "указател�т на вер�и�-цел „%s“ �ъответ�тва и ще получава от повече от един "
 "източник"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "Указател�т „HEAD“ не �очи към клон"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "н�ма клон на име „%s“"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "не е зададен клон-източник за клона „%s“"
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "клонът-източник „%s“ не е �ъхранен като �лед�щ клон"
 
-#: remote.c:1757
+#: remote.c:1867
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "лип�ва локален �лед�щ клон за ме�тоположението за изтла�кване „%s“ в "
 "хранилището „%s“"
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "н�ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "указател�т за изтла�кване на „%s“ не включва „%s“"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "указател�т за изтла�кване не включва цел („push.default“ е „nothing“)"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "про�тото (simple) изтла�кване не �ъответ�тва на една цел"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "отдалечени�т указател „%s“ не може да бъде открит"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "• пре�качане на неочаквани� локален указател „%s“"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Този клон �леди „%s“, но �ледени�т клон е изтрит.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Клонът е обновен към „%s“.\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Клонът ви и „%s“ �очат към различни подавани�.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (за повече информаци� ползвайте „%s“)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Клонът ви е � %2$d подаване пред „%1$s“.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� пред „%1$s“.\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (публикувайте локалните �и промени чрез „git push“)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7748,11 +7702,11 @@ msgid_plural ""
 msgstr[0] "Клонът ви е � %2$d подаване зад „%1$s“ и може да бъде превърт�н.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� зад „%1$s“ и може да бъде превърт�н.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (обновете локални� �и клон чрез „git pull“)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7767,11 +7721,11 @@ msgstr[1] ""
 "Текущи�т клон �е е отделил от „%s“,\n"
 "двата имат �ъответно по %d и %d не�ъвпадащи подавани�.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (�лейте отдалечени� клон в локални� чрез „git pull“)\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
@@ -7804,7 +7758,7 @@ msgstr "приложеното коригиране на конфликт не Ð
 msgid "there were errors while writing '%s' (%s)"
 msgstr "грешки при запи�ването на „%s“ (%s)"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "грешка при изчи�тването на буферите при запи�ването на „%s“"
@@ -7852,8 +7806,8 @@ msgstr "излишниÑ�Ñ‚ обект „%s“ не може да Ñ�е изтрÐ
 msgid "Recorded preimage for '%s'"
 msgstr "Предварителни�т вариант на „%s“ е запазен"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
@@ -7891,39 +7845,31 @@ msgstr "директори�та „rr-cache“ не може да �е отво
 msgid "could not determine HEAD revision"
 msgstr "не може да �е определи към какво да �очи указател�т „HEAD“"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "дървото, �очено от „%s“, не може да бъде открито"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "опциите „--unsorted-input“ и „--no-walk“ �а не�ъвме�тими"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "опци�та „--unpacked=П�КЕТЕ�_Ф�ЙЛ“ вече не �е поддържа"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "опциите „--no-walk“ и „--unsorted-input“ �а не�ъвме�тими"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "Текущи�т клон е повреден"
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Текущи�т клон „%s“ е без подавани� "
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 "опци�та „-L“ поддържа един�твено форматирането на разликите �поред опциите „-"
 "p“ и „-s“"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "не може да �е �ъздаде а�инхронна нишка: %s"
@@ -7992,8 +7938,8 @@ msgstr "не�ъще�твуващ режим на изчи�тване „%s“
 msgid "could not delete '%s'"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "„%s“ не може да бъде изтрит"
@@ -8080,13 +8026,13 @@ msgstr ""
 "\n"
 "    git revert --abort"
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "„%s“ не може да �е заключи"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "в „%s“ не може да �е пише"
@@ -8096,12 +8042,18 @@ msgstr "в „%s“ не може да �е пише"
 msgid "could not write eol to '%s'"
 msgstr "кра�т на ред не може да �е запише в „%s“"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "„%s“ не може да �е завърши"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -8116,7 +8068,7 @@ msgstr "подайте или Ñ�катайте промените, за да пÑ
 msgid "%s: fast-forward"
 msgstr "%s: превъртане"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�е�ъще�твуващ режим на изчи�тване „%s“"
@@ -8147,8 +8099,8 @@ msgstr "в „%.*s“ н�ма ключове"
 msgid "unable to dequote value of '%s'"
 msgstr "цитирането на �тойно�тта на „%s“ не може да бъде изчи�тено"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "файлът не може да бъде прочетен: „%s“"
@@ -8211,13 +8163,13 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 "неу�пешно изпълнение на куката при пром�на на �ъобщението при подаване "
 "(prepare-commit-msg)"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8245,7 +8197,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8270,361 +8222,362 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде открито"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде анализирано"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 "�ъ�то�нието �очено от указател� „HEAD“ не може да бъде открито �лед "
 "подаването"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "не�вързан връх „HEAD“"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (начално подаване)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "указател�т „HEAD“ не може да бъде анализиран"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "указател�т „HEAD“ „%s“ �очи към нещо, което не е подаване!"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "авторът на подаването не може да бъде анализиран"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "Командата „git write-tree“ не у�п� да запише обект-дърво"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�ъобщението за подаване не може да бъде прочетено от „%s“"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "неправилна �амолично�т за автор: „%s“"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "повредена информаци� за автор: лип�ва дата"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "обектът за подаването не може да бъде запи�ан"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "„%s“ не може да �е обнови"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "родител�кото подаване „%s“ не може да бъде анализирано"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "непозната команда: %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Това е 1-то �ъобщение при подаване:"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Това е �ъобщение при подаване №%d:"
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Съобщението при подаване №1 ще бъде пре�кочено:"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Съобщението при подаване №%d ще бъде пре�кочено:"
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Това е обединение от %d подавани�"
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "„%s“ не може да �е запази"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "За вкарване в предходното подаване ви тр�бва указател „HEAD“"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "указател�т „HEAD“ не може да �е прочете"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr ""
 "�ъобщението за подаване към указател� „HEAD“ не може да бъде прочетено: %s"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде прочетено"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "индек�ът не е �л�т."
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "началното подаване не може да �е вкара в предходното му"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "подаването „%s“ е �ливане, но не е дадена опци�та „-m“"
 
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "подаването „%s“ н�ма родител %d"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: неразпозната �тойно�т за родител�кото подаване „%s“"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "„%s“ не може да �е преименува на „%s“"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "подаването „%s“… не може да бъде отменено: „%s“"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "подаването „%s“… не може да бъде приложено: „%s“"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "пре�качане на %s %s — кръпката вече е приложена\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: неу�пешно изчитане на индек�а"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: неу�пешно обнов�ване на индек�а"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "„%s“ не приема аргументи: „%s“"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "„%s“ изи�ква аргументи"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "„%s“ не може да �е анализира"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправилен ред %d: %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „%s“"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "от „%s“ не може да �е чете."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "преу�танов�ване на извършваното в момента отбиране на подавани�"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "преу�танов�ване на извършваното в момента отм�на на подаване"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "коригирайте това чрез „git rebase --edit-todo“."
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "неизползваем файл � опи�ание на пред�то�щите дей�тви�: „%s“"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "никое от подавани�та не може да �е разпознае."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 "по време на отм�на на подаване не може да �е извърши отбиране на подаване."
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши отм�на на подаване."
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "подаването, в което другите да �е вкарат, не може да �е използва"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "неправилен файл � опции: „%s“"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "зададено е празно множе�тво от подавани�"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "в момента вече �е извършва отм�на на подавани�"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "използвайте „git revert (--continue | %s--abort | --quit)“"
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "в момента вече �е извършва отбиране на подавани�"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 "директори�та за определ�нето на по�ледователно�тта „%s“ не може да бъде "
 "�ъздадена"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "указател�т „HEAD“ не може да �е заключи"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "в момента не �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "дей�твието не може да бъде преу�тановено, когато �те на клон, който тепърва "
 "пред�тои да бъде �ъздаден"
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "„%s“ не може да бъде отворен"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "„%s“ не може да бъде прочетен: %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "неочакван край на файл"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "запазени�т преди започването на отбирането файл за указател� „HEAD“ — „%s“ е "
 "повреден"
 
-#: sequencer.c:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Изглежда указател�т „HEAD“ е променен.  Проверете към какво �очи.\n"
 "�е �е прав�т промени."
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "в момента не тече пребазиране"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "в момента не �е извършва отбиране на подавани�"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "неу�пешно пре�качане на подаването"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "н�ма какво да �е пре�кочи"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8634,16 +8587,16 @@ msgstr ""
 "\n"
 "    git %s --continue"
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "указател�т „HEAD“ не може да бъде прочетен"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8662,27 +8615,27 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�евъзможно �ливане на „%.*s“"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "В момента �е изпълн�ва: %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8697,11 +8650,11 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и промен� индек�а и/или работното дърво\n"
 
-#: sequencer.c:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8718,90 +8671,90 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "неправилно име на етикет: „%.*s“"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "запазване на фалшиво начално подаване"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "запазване на подаването, в което другите да �е вкарат"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "„%s“ не може да бъде открит"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "без текущо подаване не може да �е �лива"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "„%.*s“ не може да �е анализира"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "н�ма нищо за �ливане: „%.*s“"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "върху начално подаване не може да �е извърши множе�твено �ливане"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде получено"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "�ливането на „%.*s“ не може даже да започне"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "�ливане: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "�е може да �е �катае автоматично"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "�еочакван резултат при �катаване: „%s“"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Директори�та за „%s“ не може да бъде �ъздадена"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "�втоматично �катано: „%s“\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "неу�пешно изпълнение на „git reset --hard“"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�втоматично �катаното е приложено.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "„%s“ не може да бъде запазен"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8813,29 +8766,29 @@ msgstr ""
 "„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
 "пои�кате.\n"
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Конфликти при прилагането на автоматично �катаното."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Вече има запи� за автоматично �катано, затова �е �ъздава нов запи�."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "указател�т „HEAD“ не може да �е отдели"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Бе �пр�но при „HEAD“\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Бе �пр�но при „%s“\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8858,58 +8811,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Пребазиране (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Спиране при „%s“…  %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "непозната команда %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "указател�т за „orig-head“ не може да �е прочете"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "указател�т за „onto“ не може да �е прочете"
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "„HEAD“ не може да бъде обновен до „%s“"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "У�пешно пребазиране и обнов�ване на „%s“.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не може да пребазирате, защото има промени, които не �а в индек�а."
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "не�ъще�твуващо подаване не може да �е поправи"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "неправилен файл: „%s“"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "неправилно �ъдържание: „%s“"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8919,69 +8872,69 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "файлът „%s“ не може да бъде запи�ан"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "промените в индек�а не може да бъдат подадени."
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не може да �е отбере „%s“"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: неправилна вер�и�"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "първоначалното подаване не може да бъде отменено"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "пре�качане на вече приложеното подаване „%s“"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr ""
 "може да включите пропу�натите подавани� � опци�та „--reapply-cherry-picks“"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: неподдържани опции"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: грешка при подготовката на вер�ии"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "н�ма какво да �е прави"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "излишните команди за отбиране не б�ха пре�кочени"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "�криптът вече е преподреден."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "„%s“ е извън хранилището при „%s“"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8992,7 +8945,7 @@ msgstr ""
 "\n"
 "    git КОМ��Д� -- ПЪТ…"
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -9005,12 +8958,12 @@ msgstr ""
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "опци�та „%s“ тр�бва да е преди първи� аргумент, който не е опци�"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -9022,103 +8975,103 @@ msgstr ""
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "не може да �е зададе текуща работна директори� при неправилни на�тройки"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "тази команда тр�бва да �е изпълни в работно дърво"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Очаква �е вер�и� на хранилището на git <= %d, а не %d"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "открито е непознато разширение в хранилището:"
 msgstr[1] "открити �а непознати разширени� в хранилището:"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "вер�и�та на хранилището е 0, но е открито разширение за вер�и� 1:"
 msgstr[1] "вер�и�та на хранилището е 0, но �а открити разширени� за вер�и� 1:"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "„%s“ не може да �е отвори"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "прекалено гол�м файл „.git“: „%s“"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "грешка при прочитане на „%s“"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "неправилен формат на gitfile: %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "лип�ва път в gitfile: „%s“"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "не е хранилище на Git: %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "„%s“ е прекалено гол�м"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "не е хранилище на git: „%s“"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "проце�ът не може да �е върне към предишната работна директори�"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%*s%s%s“"
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Текущата работна директори� не може да бъде прочетена"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "нито тази, нито ко�то и да е от по-горните директории, не е хранилище на "
 "git: %s"
 
-#: setup.c:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -9129,7 +9082,7 @@ msgstr ""
 "Git работи в рамките на една файлова �и�тема, защото променливата на �редата "
 "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -9139,15 +9092,15 @@ msgstr ""
 "(0%.3o).\n"
 "Соб�твеникът на файла тр�бва да има права за пи�ане и четене."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "неу�пешно �ъздаване на проце� чрез „fork“"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "неу�пешно изпълнение на „setsid“"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "обектът в индек�а е директори�, но не ча�тично изтеглена (%08x)"
@@ -9204,13 +9157,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u байт/�ек."
 msgstr[1] "%u байта/�ек."
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "„%s“ не може да бъде отворен за запи�"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "„%s“ не може да �е редактира"
@@ -9304,7 +9257,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "проце�ът за подмодула „%s“ завърши неу�пешно"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
 
@@ -9557,7 +9510,7 @@ msgstr "протоколът не поддържа задаването на пÑ
 msgid "invalid remote service path"
 msgstr "неправилен път на отдалечената у�луга"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "опци�та не �е поддържа от протокола"
 
@@ -9781,7 +9734,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "Преу�танов�ване на дей�твието."
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "неу�пешно изтла�кване на в�ички необходими подмодули"
 
@@ -9801,7 +9754,7 @@ msgstr "празно име на файл в запи� в дърво"
 msgid "too-short tree file"
 msgstr "прекалено кратък файл-дърво"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9810,7 +9763,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да преминете към нов клон."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9819,7 +9772,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9828,7 +9781,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да �леете."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9837,7 +9790,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9846,7 +9799,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да извършите „%s“."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9855,7 +9808,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9864,7 +9817,16 @@ msgstr ""
 "Обнов�ването на �ледните директории ще изтрие не�ледените файлове в т�х:\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Текущата работна директори� н�ма да бъде изтрита:\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9873,7 +9835,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да преминете на друг клон."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9882,7 +9844,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9891,7 +9853,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �леете."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9900,7 +9862,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9909,7 +9871,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9918,7 +9880,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9928,7 +9890,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �мените клон."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9938,7 +9900,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9947,7 +9909,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �леете."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9956,7 +9918,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9965,7 +9927,7 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9974,12 +9936,12 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запи�ът за „%s“ �ъвпада � този за „%s“.  �е може да �е при�вои."
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9988,7 +9950,7 @@ msgstr ""
 "Подмодулът не може да бъде обновен:\n"
 "„%s“"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9999,7 +9961,7 @@ msgstr ""
 "изтегл�не:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -10009,7 +9971,7 @@ msgstr ""
 "изтегл�не:\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -10020,12 +9982,12 @@ msgstr ""
 "ча�тично изтегл�не:\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "Преу�танов�ване на дей�твието\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -10036,11 +9998,11 @@ msgstr ""
 "\n"
 "    git sparse-checkout reapply\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "Обнов�ване на файлове"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -10050,17 +10012,17 @@ msgstr ""
 "във файлови �и�теми, които не различават главни от малки букви)\n"
 "и �амо един от уча�тниците в конфликта е в работното дърво:\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Обнов�ване на флаговете на индек�а"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "работното дърво и не�леденото подаване �ъдържат повтар�щи �е обекти: %s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "�лед аргументите на „fetch“ �е очаква изчи�тване на буферите"
 
@@ -10097,102 +10059,102 @@ msgstr "неправилна ча�т от път� „..“"
 msgid "Fetching objects"
 msgstr "До�тав�не на обектите"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "„%s“ не може да бъде прочетен"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "„%s“ в о�новното работно дърво не е директори�та на хранилището"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "файлът „%s“ не �ъдържа аб�олютни� път към ме�тоположението на работното дърво"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "„%s“ не �ъще�твува."
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "„%s“ не е файл на .git, код за грешка: %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "„%s“ не �очи към обратно към „%s“"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "не е директори�"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr "„.git“ не е файл"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "„.git“ е повреден"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "„.git“ е неправилен"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "неправилен път"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "не може да �е открие хранилище: „.git“ не е файл"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "не може да �е открие хранилище: файлът „.git“ не �очи към хранилище"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "не може да �е открие хранилище: „.git“ е повреден"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "директори�та „gitdir“ не може да �е прочете"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "неправилна директори� „gitdir“"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "не е валидна директори�"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "файлът „gitdir“ не �ъще�твува"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr ""
 "изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
 "получени: %<PRIuMAX>)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "неправилен файл „gitdir“"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "файлът „gitdir“ �очи не�ъще�твуващо ме�тоположение"
 
@@ -10257,11 +10219,11 @@ msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git rm Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Промени, които ще бъдат подадени:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Промени, които не �а в индек�а за подаване:"
 
@@ -10366,22 +10328,22 @@ msgstr "променено �ъдържание, "
 msgid "untracked content, "
 msgstr "не�ледено �ъдържание, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, 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:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Подмодулите �а променени, но не �а обновени:"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Промени в подмодулите за подаване:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10389,7 +10351,7 @@ msgstr ""
 "�е промен�йте и не изтривайте горни� ред.\n"
 "В�ичко отдолу ще бъде изтрито."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10400,275 +10362,282 @@ msgstr ""
 "Изчи�л�ването на бро� различаващи �е подавани� отне %.2f �ек.\n"
 "За да избегнете това, ползвайте „--no-ahead-behind“.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "��кои пътища не �а �лети."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (използвайте „git merge --abort“, за да преу�тановите �ливането)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�ички конфликти �а решени, но продължавате �ливането."
 
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (използвайте „git commit“, за да завършите �ливането)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "В момента прилагате поредица от кръпки чрез „git am“."
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Текущата кръпка е празна."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (използвайте „git am --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (използвайте „git am --allow-empty“, за да включите кръпката като празно "
+"подаване)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (използвайте „git am --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "„git-rebase-todo“ лип�ва."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "�е �а изпълнени команди."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "По�ледно изпълнена команда (изпълнена е общо %d команда):"
 msgstr[1] "По�ледно изпълнени команди (изпълнени �а общо %d команди):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (повече информаци� има във файла „%s“)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "�е о�тават повече команди."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Следваща команда за изпълнение (о�тава още %d команда):"
 msgstr[1] "Следващи команди за изпълнение (о�тават още %d команди):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 "  (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "В момента пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "В момента пребазирате."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (коригирайте конфликтите и използвайте „git rebase --continue“)"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (използвайте „git rebase --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (използвайте „git rebase --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (в�ички конфликти �а коригирани: изпълнете „git rebase --continue“)"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "В момента раздел�те подаване докато пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "В момента раздел�те подаване докато пребазирате."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (След като работното ви дърво �тане чи�то, използвайте „git rebase --"
 "continue“)"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "В момента редактирате подаване докато пребазирате."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (използвайте „git commit --amend“, за да редактирате текущото подаване)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (използвайте „git rebase --continue“, �лед като завършите промените �и)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "В момента �е извършва отбиране на подавани�."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "В момента отбирате подаването „%s“."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (за да продължите, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (в�ички конфликти �а коригирани, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (използвайте „git cherry-pick --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (използвайте „git cherry-pick --abort“, за да отмените в�ички дей�тви� � "
 "отбиране)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "В момента тече отм�на на подаване."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "В момента отмен�те подаване „%s“."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git revert --continue“)"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (за да продължите, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (в�ички конфликти �а коригирани, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (използвайте „git revert --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (използвайте „git revert --abort“, за да преу�тановите отм�ната на "
 "подаване)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "В момента тър�ите двоично, като �те �тартирали от клон „%s“."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "В момента тър�ите двоично."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (използвайте „git bisect reset“, за да �е върнете към първоначалното "
 "�ъ�то�ние и клон)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Вие �те в ча�тично изтегл�не."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 "�амирате �е в ча�тично изтеглено хранилище � %d%% налични, �ледени файла."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "�а клон "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "извършвате интерактивно пребазиране върху "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "извършвате пребазиране върху "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "Указател�т „HEAD“ не е �вързан и е при "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Извън в�ички клони."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Първоначално подаване"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "В�е още лип�ват подавани�"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "�е�ледени файлове"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Игнорирани файлове"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10680,32 +10649,32 @@ msgstr ""
 "изпълнението, но ще тр�бва да добав�те новите файлове ръчно.\n"
 "За повече подробно�ти погледнете „git status help“."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�е�ледените файлове не �а изведени%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (използвайте опци�та „-u“, за да изведете не�ледените файлове)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "��ма промени"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "към индек�а за подаване не �а добавени промени (използвайте „git add“ и/или "
 "„git commit -a“)\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "към индек�а за подаване не �а добавени промени\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10714,84 +10683,84 @@ msgstr ""
 "към индек�а за подаване не �а добавени промени, но има нови файлове "
 "(използвайте „git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "към индек�а за подаване не �а добавени промени, но има нови файлове\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "лип�ват каквито и да е промени (�ъздайте или копирайте файлове и използвайте "
 "„git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "лип�ват каквито и да е промени\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "лип�ват каквито и да е промени (използвайте опци�та „-u“, за да �е изведат и "
 "не�ледените файлове)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "лип�ват каквито и да е промени, работното дърво е чи�то\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "В�е още лип�ват подавани� в "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (извън клон)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "различен"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "назад � "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "напред � "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "не може да извършите „%s“, защото има промени, които не �а в индек�а."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "о�вен това в индек�а има неподадени промени."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не може да извършите „%s“, защото в индек�а има неподадени промени."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "командата за комуникаци� между проце�и не може да бъде пратена"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "отговорът за комуникаци�та между проце�и не може да бъде прочетен"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "неу�пешно изпълнение на „accept_thread“ върху нишката „%s“"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "не може да �е �тартира нишката worker[0] за „%s“"
@@ -10828,113 +10797,119 @@ msgstr "изтриване на „%s“\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Промени, които и �лед обнов�ването на индек�а не �а добавени към него:"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Кръпката не може да бъде запи�ана"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "неу�пешно редактиране на кръпка"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�е може да �е получи информаци� чрез „stat“ за файла „%s“"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Празна кръпка, преу�танов�ване на дей�твието."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани �поред н�кой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "пробно изпълнение"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "повече подробно�ти"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "интерактивно отбиране на промени"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "редактиране на текущата разлика и прилагане"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "добав�не и на иначе игнорираните файлове"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "обнов�ване на �ледените файлове"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "уеднакв�ване на знаците за край на файл (включва опци�та „-u“)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "отбел�зване �амо на факта, че път�т ще бъде добавен по-къ�но"
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "добав�не на в�ички промени в �ледените и не�ледените файлове"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "игнориране на пътищата, които �а изтрити от работното дърво (�ъщото като „--"
 "no-all“)"
 
-#: builtin/add.c:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "без добав�не на нови файлове, �амо обнов�ване на индек�а"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "пре�качане на файловете, които не може да бъдат добавени поради грешки"
 
-#: builtin/add.c:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "проверка, че при пробно изпълнение в�ички файлове, дори и изтритите, �е "
 "игнорират"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr ""
 "обнов�ване и на запи�ите извън пътеводни� �егмент на ча�тичното изтегл�не"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "изрично задаване на �тойно�тта на флага дали файлът е изпълним"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "предупреждаване при добав�не на вградено хранилище"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "реализаци� на „git stash -p“"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10965,12 +10940,12 @@ msgstr ""
 "\n"
 "За повече информаци� погледнете „git help submodule“."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добав�не на вградено хранилище: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10981,56 +10956,27 @@ msgstr ""
 "\n"
 "    git config advice.addIgnoredFile false"
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "неу�пешно добав�не на файлове"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-"опци�та „--dry-run“ е не�ъвме�тима � в��ка от опциите „--interactive“/„--"
-"patch“"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-"опци�та „--pathspec-from-file“ е не�ъвме�тима � в��ка от опциите „--"
-"interactive“/„--patch“"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "опциите „--pathspec-from-file“ и „--edit“ �а не�ъвме�тими"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "опциите „-A“ и „-u“ �а не�ъвме�тими"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "опци�та „--ignore-missing“ изи�ква „--dry-run“"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-"опци�та „--pathspec-from-file“ е не�ъвме�тима � аргументи, указващи пътища"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "опци�та „--pathspec-file-nul“ изи�ква опци� „--pathspec-from-file“"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "опци�та „%s“ и път �а не�ъвме�тими"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "�ищо не е зададено и нищо не е добавено.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -11041,110 +10987,128 @@ msgstr ""
 "\n"
 "    git config advice.addEmptyPathspec false"
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "�еправилна �тойно�т за „--empty“: „%s“"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "�криптът за автор не може да �е анализира"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Дадени�т входен ред е � неправилен формат: „%s“."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Бележката не може да �е копира от „%s“ към „%s“"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "неу�пешно изпълнение на „fseek“"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "кръпката „%s“ не може да �е анализира"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
 
-#: builtin/am.c:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "неправилна �тойно�т за време"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "неправилен ред за дата „Date“"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "неправилно отме�тване на ча�ови� по��"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Кръпките не може да бъдат разделени."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "След коригирането на този проблем изпълнете „%s --continue“."
+msgstr ""
+"След коригирането на този проблем изпълнете:\n"
+"\n"
+"    %s --continue“"
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr "�ко предпочитате да пре�кочите тази кръпка, изпълнете „%s --skip“."
+msgstr ""
+"�ко предпочитате да пре�кочите тази кръпка, изпълнете:\n"
+"\n"
+"    %s --skip"
 
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"За да включите празната кръпка като празно подаване, изпълнете:\n"
+"\n"
+"    %s --allow-empty"
+
+#: builtin/am.c:1161
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "За да �е върнете към първоначалното �ъ�то�ние, изпълнете „%s --abort“."
+msgstr ""
+"За да �е върнете към първоначалното �ъ�то�ние, изпълнете:\n"
+"\n"
+"    %s --abort"
 
-#: builtin/am.c:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Кръпката е пратена � форматиране „format=flowed“.  Празните знаци в кра� на "
 "редовете може да �е загуб�т."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Кръпката е празна."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "лип�ва ред за автор�тво в подаването „%s“"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "грешен ред � идентично�т: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището лип�ват необходимите обекти-BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво �е рекон�труира от информаци�та в индек�а…"
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -11152,24 +11116,24 @@ msgstr ""
 "Кръпката не може да �е приложи към обектите-BLOB в индек�а.\n"
 "Да не би да �те � редактирали на ръка?"
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно �ливане…"
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "�еу�пешно �ливане на промените."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "прилагане върху празна и�тори�"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да �е продължи — „%s“ не �ъще�твува."
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Т�лото на кръпката за прилагане е:"
 
@@ -11177,45 +11141,63 @@ msgstr "Т�лото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
 "на в�ичко:"
 
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 "Индек�ът не е чи�т: кръпките не може да бъдат приложени (замър�ени �а: %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Пре�качане: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Създаване на празно подаване: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Кръпката е празна."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Прилагане: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Без промени — кръпката вече е приложена."
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�еу�пешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "За да видите неу�пешно приложени кръпки, използвайте:\n"
 "\n"
 "    git am --show-current-patch=diff"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "��ма промени — �ъздаване на празно подаване."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11225,7 +11207,7 @@ msgstr ""
 "�ко н�ма друга пром�на за включване в индек�а, най-веро�тно н�ко� друга\n"
 "кръпка е довела до �ъщите промени и в такъв �лучай про�то пропу�нете тази."
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11236,17 +11218,17 @@ msgstr ""
 "След корекци� на конфликтите изпълнете „git add“ върху поправените файлове.\n"
 "За да приемете „изтрити от т�х“, изпълнете „git rm“ върху изтритите файлове."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "„%s“ не е разпознат като обект."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "индек�ът не може да бъде изчи�тен"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11257,166 +11239,173 @@ msgstr ""
 "�очи към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправилна �тойно�т за „--patch-format“: „%s“"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "�еправилна �тойно�т за „--show-current-patch“: „%s“"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr ""
-"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ �а не�ъвме�тими"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "опциите „%s=%s“ и „%s=%s“ �а не�ъвме�тими"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [(Ф�ЙЛ_С_ПОЩ�|ДИРЕКТОРИЯ_С_ПОЩ�)…]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "изо�тавена опци�, �ъще�твува по и�ториче�ки причини, нищо не прави"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "да �е преминава към тройно �ливане при нужда."
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "добав�не на епилог за подпи� „Signed-off-by“ в �ъобщението за подаване"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (�тандартно)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опци�та „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опци�та „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опци�та „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "без подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ незави�имо "
 "от „am.keepcr“"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "пропу�кане на в�ичко преди реда за отр�зване"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "прекарване през „git-mailinfo“"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "прекарване през „git-apply“"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "БРОЙ"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "ФОРМ�Т"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "избрано от ва� �ъобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки �лед коригирането на конфликт"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "п�евдоними на „--continue“"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "пре�качане на текущата кръпка"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "въз�танов�ване на първоначалното �ъ�то�ние на клона и преу�танов�ване на "
 "прилагането на кръпката"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 "преу�танов�ване на прилагането на кръпката без пром�на към кое �очи „HEAD“"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "показване на прилаганата кръпка"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "прилагане на празна кръпка като празно подаване"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "дата за подаване различна от първоначалната"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "използване на текущото време като това за автор"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_КЛЮЧ"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "подпи�ване на подавани�та � GPG"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "как да �е обработват празните подавани�"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(ползва �е вътрешно за „git-rebase“)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -11424,18 +11413,18 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не прав�т нищо и\n"
 "ще бъдат премахнати в бъдеще.  �е ги ползвайте."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "неу�пешно изчитане на индек�а"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директори� за пребазиране „%s“ в�е още �ъще�твува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11444,11 +11433,11 @@ msgstr ""
 "Открита е излишна директори� „%s“.\n"
 "Може да � изтриете � командата „git am --abort“."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операци� по коригиране и н�ма как да �е продължи."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "интерактивни�т режим изи�ква кръпки на командни� ред"
 
@@ -11921,11 +11910,11 @@ msgstr ""
 msgid "show work cost statistics"
 msgstr "извеждане на �тати�тика за извършените дей�тви�"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "извеждане на напредъка"
@@ -11982,7 +11971,7 @@ msgstr ""
 msgid "ignore whitespace differences"
 msgstr "без разлики в знаците за интервали"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "ВЕРС"
 
@@ -12040,7 +12029,7 @@ msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "информаци� �амо за редовете в диапазона ��Ч�ЛО,КР�Й или �амо на :ФУ�КЦИЯта"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "опци�та „--progress“ е не�ъвме�тима � „--incremental“ и форма̀та на командите "
@@ -12054,18 +12043,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "преди 4 години и 11 ме�еца"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "има �амо %2$lu ред във файла „%1$s“"
 msgstr[1] "има �амо %2$lu реда във файла „%1$s“"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Редове � автор�тво"
 
@@ -12097,7 +12086,7 @@ msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -12106,7 +12095,7 @@ msgstr ""
 "изтриване на клона „%s“, който е �л�т към „%s“,\n"
 "    но още не е �л�т към върха „HEAD“."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -12115,12 +12104,12 @@ msgstr ""
 "отказване на изтриване на клона „%s“, който не е �л�т към\n"
 "    „%s“, но е �л�т към върха „HEAD“."
 
-#: builtin/branch.c:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Обектът-подаване за „%s“ не може да бъде открит"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -12129,7 +12118,7 @@ msgstr ""
 "Клонът „%s“ не е �л�т напълно.  �ко �те �игурни, че и�кате\n"
 "да го изтриете, изпълнете „git branch -D %s“."
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "�еу�пешно обнов�ване на конфигурационни� файл"
 
@@ -12141,100 +12130,100 @@ msgstr "опциите „-a“ и „-d“ �а не�ъвме�тими"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Обектът-подаване, �очен от указател� „HEAD“, не може да бъде открит"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "�е може да изтриете клона „%s“, който е изтеглен в път� „%s“"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "�лед�щи�т клон „%s“ не може да бъде открит."
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "клонът „%s“ не може да бъде открит."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Изтрит �лед�щ клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Изтрит клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "форматиращи�т низ не може да бъде анализиран: %s"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "подаването, �очено от указател� „HEAD“, не може да �е у�танови"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "„HEAD“ (%s) �очи извън директори�та „refs/heads“"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Клонът „%s“ �е пребазира върху „%s“"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Тър�и �е двоично в клона „%s“ при „%s“"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "не може да копирате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:516
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 "не може да преименувате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�еправилно име на клон: „%s“"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "�еу�пешно преименуване на клон"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "�еу�пешно копиране на клон"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Клонът � неправилно име „%s“ е копиран"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Клонът � неправилно име „%s“ е преименуван"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Клонът е преименуван на „%s“, но указател�т „HEAD“ не е обновен"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Клонът е преименуван, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Клонът е копиран, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12245,183 +12234,179 @@ msgstr ""
 "    %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Общи на�тройки"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 "извеждане на контролната �ума и темата.  Повтар�нето на опци�та прибав� "
 "отдалечените клони"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "задаване на режима на �ледене (виж git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "на�тройване кой клон да �е �леди"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "да не �е ползва"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "клон-източник"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "�м�на на клона-източник"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "изчи�тване на информаци�та за клон-източник"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "цветен изход"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "дей�твие върху �лед�щите клони"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "извеждане �амо на клоните, които �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "извеждане �амо на клоните, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Специални дей�тви� на „git-branch“:"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "извеждане както на �лед�щите, така и на локалните клони"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "изтриване на клони, които �а напълно �лети"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "изтриване и на клони, които не �а напълно �лети"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr ""
 "преме�тване/преименуване на клон и принадлежащи�т му журнал на указателите"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "преме�тване/преименуване на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "копиране на клон и принадлежащи� му журнал на указателите"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "копиране на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "извеждане на имената на клоните"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "извеждане на името на текущи� клон"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "�ъздаване на журнала на указателите на клона"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "редактиране на опи�анието на клона"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "принудително �ъздаване, преме�тване, преименуване, изтриване"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "извеждане �амо на �летите клони"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "извеждане �амо на не�летите клони"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "ОБЕКТ"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "извеждане �амо на клоните на ОБЕКТ�"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "ФОРМ�Т за изхода"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "В директори�та „refs/heads“ лип�ва файл „HEAD“"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "опциите „--column“ и „--verbose“ �а не�ъвме�тими"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "�еобходимо е име на клон"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "�е може да зададете опи�ание на не�вързан „HEAD“"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "�е може да редактирате опи�анието на повече от един клон едновременно"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "В клона „%s“ в�е още н�ма подавани�."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Лип�ва клон на име „%s“."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "прекалено много клони за копиране"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "прекалено много аргументи към командата за преименуване"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "прекалено много аргументи към командата за �ледене"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12429,31 +12414,31 @@ msgstr ""
 "Следеното от „HEAD“ не може да �е зададе да е „%s“, защото то не �очи към "
 "никой клон."
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "��ма клон на име „%s“."
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "�е �ъще�твува клон на име „%s“."
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "прекалено много аргументи към командата за �пиране на �ледене"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Следеното от „HEAD“ не може да махне, защото то не �очи към никой клон."
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "��ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -12461,7 +12446,7 @@ msgstr ""
 "опциите „-a“ и „-r“ на „git branch“ �а не�ъвме�тими � име на клон.\n"
 "Пробвайте �: „-a|-r --list Ш�БЛО�“"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12740,8 +12725,8 @@ msgstr "изчитане на имената на файловете от �та
 msgid "terminate input and output records by a NUL character"
 msgstr "раздел�не на входните и изходните запи�и � нулеви� знак „NUL“"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
@@ -12799,10 +12784,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [ОПЦИЯ…]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "�ИЗ"
 
@@ -12866,99 +12851,94 @@ msgstr "git switch [ОПЦИЯ…] КЛО�"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [ОПЦИЯ…] [--source=КЛО�] Ф�ЙЛ…"
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "вашата вер�и� лип�ва в път� „%s“"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "чуждата вер�и� лип�ва в път� „%s“"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "н�ко� от необходимите вер�ии лип�ва в път� „%s“"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "н�ко� от необходимите вер�ии лип�ва в път� „%s“"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "път�т „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Резултатът за „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Пре�ъздаден е %d конфликт при �ливане"
 msgstr[1] "Пре�ъздадени �а %d конфликта при �ливане"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Обновен е %d път от „%s“"
 msgstr[1] "Обновени �а %d път� от „%s“"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Обновен е %d път от индек�а"
 msgstr[1] "Обновени �а %d път� от индек�а"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "опци�та „%s“ е не�ъвме�тима � обнов�ването на пътища"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "�евъзможно е едновременно да обнов�вате пътища и да преминете към клона „%s“."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "не е указано нито „%s“, нито „%s“"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "опци�та „%s“ е задължителна, когато „%s“ не е зададена"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "опци�та „%3$s“ е не�ъвме�тима както � „%1$s“, така и � „%2$s“"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "път�т „%s“ не е �л�т"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "първо тр�бва да коригирате индек�а �и"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12968,50 +12948,50 @@ msgstr ""
 "индек�а:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да �е про�леди: %s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "Указател�т „HEAD“ в момента �очи към"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде обновен"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Занул�ване на клона „%s“\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Вече �те на „%s“\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Преминаване към клона „%s“ и занул�ване на промените\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към нови� клон „%s“\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Преминахте към клона „%s“\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "… и още %d.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -13033,7 +13013,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -13060,19 +13040,19 @@ msgstr[1] ""
 "    git branch ИМЕ_��_�ОВИЯ_КЛО� %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "вътрешна грешка при обхождането на вер�иите"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ �очеше към"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "В момента �те на клон, който в�е още не е �ъздаден"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -13081,7 +13061,7 @@ msgstr ""
 "„%s“ може да е както локален файл, така и �лед�щ клон.  За уточн�ване\n"
 "ползвайте разделител� „--“ (и евентуално опци�та „--no-guess“)"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -13103,51 +13083,51 @@ msgstr ""
 "\n"
 "    checkout.defaultRemote=origin"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "„%s“ напа�ва � множе�тво (%d) отдалечени клони"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "очаква �е �амо един указател"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "очаква �е един указател, а �те подали %d."
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указател�т не �очи към обект-дърво: %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "очаква �е клон, а не етикет — „%s“"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "очаква �е локален, а не отдалечен клон — „%s“"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "очаква �е клон, а не „%s“"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "очаква �е клон, а не подаване — „%s“"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -13155,7 +13135,7 @@ msgstr ""
 "по време на �ливане не може да преминете към друг клон.\n"
 "Пробвайте � „git merge --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -13164,7 +13144,7 @@ msgstr ""
 "клон.\n"
 "Пробвайте � „git am --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -13172,7 +13152,7 @@ msgstr ""
 "по време на пребазиране не може да преминете към друг клон.\n"
 "Пробвайте � „git rebase --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -13180,7 +13160,7 @@ msgstr ""
 "по време на отбиране на подавани� не може да преминете към друг клон.\n"
 "Пробвайте � „git cherry-pick --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -13188,139 +13168,129 @@ msgstr ""
 "по време на отм�на на подавани� не може да преминете към друг клон.\n"
 "Пробвайте � „git revert --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "преминаване към друг клон по време на двоично тър�ене"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е не�ъвме�тимо � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "опци�та „%s“ е не�ъвме�тима � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "опци�та „%s“ е не�ъвме�тима �ъ� задаването на ��Ч�ЛО"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който �очи към подаване.  „%s“ "
 "не е такъв"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "лип�ва аргумент — клон или подаване"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно �ливане � нови� клон"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "СТИЛ"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "дей�твие при конфликт (�ливане или тройна разлика)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr ""
+"дей�твие при конфликт („merge“ — �ливане или тройна разлика � „diff3“ или "
+"„zdiff3“)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "задаване на кой клон бива �леден при �ъздаването на нови� клон"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "задаване на режима на �ледене (виж git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "принудително изтегл�не (вашите промени ще бъдат занулени)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "�ОВ_КЛО�"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "обнов�ване на игнорираните файлове (�тандартно)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указател�"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "изтегл�не на вашата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "изтегл�не на чуждата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища �амо до ча�тично изтеглените"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "опциите „-%c“, „-%c“ и „--orphan“ �а не�ъвме�тими една � друга"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "опциите „-p“ и „--overlay“ �а не�ъвме�тими"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "опциите „-%c“, „-%c“ и „%s“ �а не�ъвме�тими"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "опци�та „--track“ изи�ква име на клон"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "лип�ва име на клон, използвайте опци�та „-%c“"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "„%s“ не може да бъде открит"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "„%s“ не е подаване, затова от него не може да �е �ъздаде клон „%s“"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: опци�та „--detach“ не приема аргумент-път „%s“"
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "опциите „--pathspec-from-file“ и „--detach“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "опциите „--pathspec-from-file“ и „--patch“ �а не�ъвме�тими"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13328,75 +13298,75 @@ msgstr ""
 "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
 "�а не�ъвме�тими � изтегл�не от индек�а."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "тр�бва да укажете поне един път за въз�танов�ване"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "клон"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "�ъздаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git checkout "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“ (�тандартно)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "използване на припокриващ режим (�тандартно)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git switch "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "занул�ване на локалните промени"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "към кой указател към дърво да �е премине"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "въз�танов�ване на индек�а"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "въз�танов�ване на работното дърво (�тандартно)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "пренебрегване на не�летите елементи"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "използване на припокриващ режим"
 
@@ -13430,7 +13400,15 @@ msgstr "Хранилището „%s“ ще бъде пре�кочено\n"
 msgid "could not lstat %s\n"
 msgstr "не може да �е получи информаци� чрез „lstat“ за „%s“\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Текущата работна директори� н�ма да бъде изтрита\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Текущата работна директори� н�ма да бъде изтрита\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13443,7 +13421,7 @@ msgstr ""
 "ПРЕФИКС    — избор на един�твен обект по този уникален префик�\n"
 "           — (празно) нищо да не �е избира\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13464,33 +13442,33 @@ msgstr ""
 "*          — избиране на в�ички обекти\n"
 "           — (празно) завършване на избирането\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "�еправилен избор (%s).\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблони за игнорирани елементи≫ "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �икой обект не напа�ва на „%s“"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Избиране на обекти за изтриване"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Да �е изтрие ли „%s“? „y“ —  да, „N“ — �Е"
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13508,52 +13486,52 @@ msgstr ""
 "help                — този край\n"
 "?                   — под�казка за шаблоните"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Следни�т обект ще бъде изтрит:"
 msgstr[1] "Следните обекти ще бъдат изтрити:"
 
-#: builtin/clean.c:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Файловете за изчи�тване �вършиха.  Изход от програмата."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "принудително изтриване"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "интерактивно изтриване"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "Ш�БЛО�"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "добав�не на Ш�БЛО� от файлове, които да не �е три�т"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "изтриване и на игнорираните файлове"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "изтриване �амо на игнорирани файлове"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13561,7 +13539,7 @@ msgstr ""
 "�а�тройката „clean.requireForce“ е зададена като и�тина, което изи�ква н�ко� "
 "от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши изчи�тване"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13570,7 +13548,7 @@ msgstr ""
 "което изи�ква н�ко� от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши "
 "изчи�тване"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "опциите „-x“ и „-X“ �а не�ъвме�тими"
 
@@ -13627,19 +13605,20 @@ msgstr "директори� � шаблони"
 msgid "directory from which templates will be used"
 msgstr "директори�, ко�то �ъдържа шаблоните, които да �е ползват"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "еталонно хранилище"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "опци�та „--reference“ може да �е използва �амо при клониране"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "ИМЕ"
@@ -13656,7 +13635,7 @@ msgstr "изтегл�не на този КЛО�, а не �очени�т от
 msgid "path to git-upload-pack on the remote"
 msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "ДЪЛБОЧИ��"
@@ -13665,7 +13644,7 @@ msgstr "ДЪЛБОЧИ��"
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИ��"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "ВРЕМЕ"
@@ -13674,17 +13653,17 @@ msgstr "ВРЕМЕ"
 msgid "create a shallow clone since a specific time"
 msgstr "плитко клониране до момент във времето"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "ВЕРСИЯ"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до изключващ указател"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране �амо на един клон — или �очени� от отдалечени� „HEAD“, или изрично "
@@ -13715,22 +13694,22 @@ msgstr "КЛЮЧ=СТОЙ�ОСТ"
 msgid "set config inside the new repository"
 msgstr "задаване на на�тройките на новото хранилище"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "�пецифични за �ървъра"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "опци� за прено�"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "�амо адре�и IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�амо адре�и IPv6"
@@ -13832,29 +13811,25 @@ msgstr "не може да Ñ�е извърши пакетиране за изчÐ
 msgid "cannot unlink temporary alternates file"
 msgstr "временни�т файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Тр�бва да укажете кое хранилище и�кате да клонирате."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "опциите „--bare“ и „--origin %s“ �а не�ъвме�тими."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "опциите „--bare“ и „--separate-git-dir“ �а не�ъвме�тими."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "опциите „%s“ и „%s %s“ �а не�ъвме�тими"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не �ъще�твува хранилище „%s“"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината тр�бва да е положително ц�ло чи�ло, а не „%s“"
@@ -13874,8 +13849,8 @@ msgstr "път�т в хранилището „%s“ �ъще�твува и н
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече �ъще�твува работно дърво."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
@@ -14002,7 +13977,7 @@ msgstr ""
 "split[=СТР�ТЕГИЯ]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] ОПЦИИ_З�_Р�ЗДЕЛЯ�Е"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "директори�"
 
@@ -14088,7 +14063,7 @@ msgstr ""
 msgid "Collecting commits from input"
 msgstr "Получаване на подавани�та от входа"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "непозната подкоманда: %s"
@@ -14106,7 +14081,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "пре�качане на повтар�щ �е родител: „%s“"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "неправилно име на обект: „%s“"
@@ -14129,13 +14104,13 @@ msgstr "родител"
 msgid "id of a parent commit object"
 msgstr "ИДЕ�ТИФИК�ТОР на обекта за подаването-родител"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "СЪОБЩЕ�ИЕ"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "СЪОБЩЕ�ИЕ при подаване"
 
@@ -14143,7 +14118,7 @@ msgstr "СЪОБЩЕ�ИЕ при подаване"
 msgid "read commit log message from file"
 msgstr "изчитане на �ъобщението за подаване от Ф�ЙЛ"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "подпи�ване на подаването � GPG"
@@ -14231,10 +14206,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "опциите „-a“ и „--pathspec-from-file“ �а не�ъвме�тими"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "опциите „--include“ и „--only“ изи�кват аргументи."
@@ -14322,8 +14293,8 @@ msgstr "файлът Ñ�ÑŠÑ� Ñ�ъобщението за подаване „%sâ€
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "опциите „-m“ и „--fixup“ �а не�ъвме�тими:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "опциите „--%s“ и „--%s:%s“ �а не�ъвме�тими"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -14432,7 +14403,7 @@ msgstr "епилогът не може да �е подаде на „--trailers
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Подайте �ъобщението � н�ко� от опциите „-m“ или „-F“.\n"
@@ -14449,15 +14420,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "�еправилен режим за игнорираните файлове: „%s“"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправилен режим за не�ледените файлове: „%s“"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "опциите „--long“ и „-z“ �а не�ъвме�тими."
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
@@ -14471,120 +14438,115 @@ msgstr ""
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"опци�та за пром�на на �ъобщението на „--fixup“ и указването на път „%s“ �а "
-"не�ъвме�тими"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "опци�та за пром�на на �ъобщението „%s“ и път�т „%s“ �а не�ъвме�тими"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"опци�та за пром�на на �ъобщението на „--fixup“ и „--patch“/„--interactive“/"
-"„--all“/„--include“/„--only“ �а не�ъвме�тими"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
-msgstr "опциите „--reset-author“ и „--author“ �а не�ъвме�тими."
+msgstr "опциите „--reset-author“ и „--author“ �а не�ъвме�тими"
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "��ма какво да бъде поправено."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "В момента �е извършва �ливане, не може да поправ�те."
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "В момента �е извършва отбиране на подаване, не може да поправ�те."
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "В момента �е извършва пребазиране, не може да поправ�те."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "опци�та „-m“ е не�ъвме�тима � „-c“, „-C“ и „-F“."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "опци�та „--reset-author“ може да �е използва �амо заедно � „-C“, „-c“ или\n"
 "„--amend“."
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ �а\n"
 "не�ъвме�тими."
 
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "непозната опци�: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "опци�та „-a“ е не�ъвме�тима �ъ� задаването на пътища: „%s…“"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "кратка информаци� за �ъ�то�нието"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "информаци� за клоните"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "информаци� за �катаното"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "изчи�л�ване на точните �тойно�ти напред/назад"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "подробна информаци� за �ъ�то�нието (�тандартно)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "раздел�не на елементите � нулеви� знак „NUL“"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "РЕЖИМ"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "извеждане на не�ледените файлове.  Възможните РЕЖИМи �а „all“ (подробна "
 "информаци�), „normal“ (кратка информаци�), „no“ (без не�ледените файлове).  "
 "Стандартни�т РЕЖИМ е: „all“."
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14593,11 +14555,11 @@ msgstr ""
 "„traditional“ (традиционен), „matching“ (напа�ващи), „no“ (без игнорираните "
 "файлове).  Стандартни�т РЕЖИМ е: „traditional“."
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "КОГ�"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14606,197 +14568,197 @@ msgstr ""
 "една от „all“ (в�ички), „dirty“ (тези � неподадени промени), "
 "„untracked“ (не�ледени)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "извеждане на не�ледените файлове в колони"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "без за�ичане на преименувани�та"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "за�ичане на преименувани�та, може да �е зададе коефициент на прилика"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�еподдържана комбинаци� от аргументи за игнорирани и не�ледени файлове"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "без информаци� �лед у�пешно подаване"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "добав�не на разликата към шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Опции за �ъобщението при подаване"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "взимане на �ъобщението от Ф�ЙЛ"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "�ВТОР"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "задаване на �ВТОР за подаването"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "Д�Т�"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "задаване на Д�Т� за подаването"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "ПОД�В��Е"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "преизползване и редактиране на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "преизползване на �ъобщението от указаното ПОД�В��Е"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]подаване"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение за вкарване на указаното ПОД�В��Е в "
 "предходното без �леда или за пром�на на подаването или �ъобщението"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение за вкарване на указаното ПОД�В��Е в "
 "предното"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "�м�на на автора да �ъвпада � подаващи� (използва �е � „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "ЕПИЛОГ"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "добав�не на друг ЕПИЛОГ"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "добав�не на епилог за подпи� „Signed-off-by“"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "използване на указани� шаблонен Ф�ЙЛ"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "вмъкване на �ъ�то�нието в шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "подаване на в�ички променени файлове"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "добав�не на указаните файлове към индек�а за подаване"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "интерактивно добав�не на файлове"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "интерактивно добав�не на промени"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "подаване �амо на указаните файлове"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и при пром�на на �ъобщението за "
 "подаване (pre-commit и commit-msg)"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "поправ�не на предишното подаване"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката �лед презапи�ване (post-rewrite)"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "позвол�ване на празни подавани�"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "позвол�ване на подавани� � празни �ъобщени�"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за �ливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "режимът на �ливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�ъобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -15322,7 +15284,7 @@ msgstr "да �е тър�и �амо измежду етикетите напа
 msgid "do not consider tags matching <pattern>"
 msgstr "да не �е тър�и измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "извеждане на �ъкратено име на обект като резервен вариант"
 
@@ -15339,25 +15301,14 @@ msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "добав�не на такъв М�РКЕР на �чупеното работно дърво (�тандартно е „-broken“)"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "опциите „--long“ и „--abbrev=0“ �а не�ъвме�тими"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "�е �а открити имена — нищо не може да бъде опи�ано."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "опци�та „--dirty“ е не�ъвме�тима � указател към подаване"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "опци�та „--broken“ е не�ъвме�тима � указател към подаване"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "опциите „--stdin“ и „--merge-base“ �а не�ъвме�тими"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "опциите „%s“ и указателите към обекти �а не�ъвме�тими"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -15378,26 +15329,26 @@ msgstr "неправилна опци�: %s"
 msgid "%s...%s: no merge base"
 msgstr "„%s..%s“: лип�ва база за �ливане"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "�е е хранилище на Git"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "зададен е неправилен обект „%s“."
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "зададени �а повече от 2 обекта-BLOB: „%s“"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "зададен е неподдържан обект „%s“."
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: много бази за �ливане, ще �е ползва „%s“"
@@ -15406,22 +15357,22 @@ msgstr "%s...%s: много бази за �ливане, ще �е ползва
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [ОПЦИЯ…] [ПОД�В��Е [ПОД�В��Е]] [[--] ПЪТ…]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "файлът, �очен от �имволната връзка „%s“, не може да бъде прочетен"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "обектът „%s“ за �имволната връзка „%s“ не може да бъде прочетен"
 
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15429,60 +15380,60 @@ msgstr ""
 "комбинираните формати на разликите („-c“ и „--cc“) не �е поддържат\n"
 "в режима за разлики върху директории („-d“ и „--dir-diff“)."
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "и двата файла �а променени: „%s“ и „%s“."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "работното дърво е изо�тавено."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "в „%s“ има временни файлове."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "възможно е да ги изчи�тите или въз�тановите"
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "неу�пешно дей�твие � изходен код: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "използвайте „diff.guitool“ вме�то „diff.tool“"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "разлика по директории"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "�тартиране на ПРОГР�М�та за разлики без предупреждение"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "�ледване на �имволните връзки при разлика по директории"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "ПРОГР�М�"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "използване на указаната ПРОГР�М�"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "извеждане на �пи�ък � в�ички ПРОГР�Ми, които може да �е ползват � опци�та „--"
 "tool“"
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15490,31 +15441,23 @@ msgstr ""
 "„git-difftool“ да �пре работа, когато �тартираната ПРОГР�М� за разлики "
 "завърши � ненулев код"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "команда за разглеждане на разлики"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "подава �е към „diff“"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "„git-difftool“ изи�ква работно дърво или опци�та „--no-index“"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "опциите „--dir-diff“ и „--no-index“ �а не�ъвме�тими"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "опциите „--gui“, „--tool“ и „--extcmd“ �а не�ъвме�тими една � друга"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не е зададена програма за „--tool=ПРОГР�М�“"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не е зададена команда за „--extcmd=КОМ��Д�“"
 
@@ -15554,128 +15497,120 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [ОПЦИИ_З�_СПИСЪК�_С_ВЕРСИИ]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Грешка: непреките етикети не �е изна��т, о�вен ако не зададете „--mark-tags“."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "опци�та „--anonymize-map“ изи�ква аргумент"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "Съобщение за напредъка на в�еки такъв БРОЙ обекта"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "Как да �е обработват подпи�аните етикети"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "Как да �е обработват етикетите на филтрираните обекти"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "как да �е обработват �ъобщени�та за подаване, които �а в друго кодиране"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "запазване на маркерите в този Ф�ЙЛ"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "вна��не на маркерите от този Ф�ЙЛ"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "вна��не на маркерите от този Ф�ЙЛ, ако �ъще�твува"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr ""
 "да �е използва изку�твено име на човек при лип�а на �ъздател на етикета"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "извеждане на ц�лото дърво за в��ко подаване"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "използване на маркер за завършване на потока"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "без извеждане на �ъдържанието на обектите-BLOB"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "УК�З�ТЕЛ_��_ВЕРСИЯ"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към изне�ените указатели"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "анонимизиране на извежданата информаци�"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "ОТ:КЪМ"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "заме�тване ОТ �ъ� КЪМ в анонимизирани� изход"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "указване на родителите, които не �а в потока на бързо изна��не, � "
 "идентификатор на обект"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подав�ни�"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "задаване на идентификатори на маркери на етикетите"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "опци�та „--anonymize-map“ изи�ква „--anonymize“"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ �а не�ъвме�тими"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Лип�ват маркери „от“ за подмодула „%s“"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Лип�ват маркери „до“ за подмодула „%s“"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Очаква �е команда „mark“, а бе получена: „%s“"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Очаква �е команда „to“, а бе получена: „%s“"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "опци�та за презапи� на подмодул изи�ква формат: име:име_на_файл"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "„%s“ изи�ква изричното задаване на опци�та „--allow-unsafe-features“"
@@ -15685,120 +15620,120 @@ msgstr "„%s“ изиÑ�ква изричното задаване на опцÐ
 msgid "Lockfile created but not reported: %s"
 msgstr "Заключващи�т файл е �ъздаден, но не е докладван: „%s“"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [ОПЦИЯ…] ГРУП�"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [ОПЦИЯ…] [(ХР��ИЛИЩЕ | ГРУП�)…]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ОПЦИЯ…]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "опци�та „fetch.parallel“ тр�бва да е неотрицателна"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "до�тав�не от в�ички отдалечени хранилища"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "задаване на клон за �ледене за издърпване/до�тав�не"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "добав�не към „.git/FETCH_HEAD“ вме�то зам�на"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "изи�кване на атомарни операции за обнов�ване на указателите"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "отдалечен път, където да �е качи пакетът"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "принудително презапи�ване на локален указател"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "до�тав�не от множе�тво отдалечени хранилища"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "до�тав�не на в�ички етикети и принадлежащи обекти"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "без до�тав�нето на в�ички етикети „--no-tags“"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "брой подмодули до�тавени паралелно"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "пром�на на указател�, така че и той, както о�таналите, да бъде в „refs/"
 "prefetch/“"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ока�тр�не на клоните �лед�щи вече не�ъще�твуващи отдалечени клони"
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "ока�тр�не на локалните етикети, които вече не �ъще�твуват в отдалеченото "
 "хранилище и презапи�ване на променените"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "ПРИ �УЖД�"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "запазване на до�тавените указатели във файла „FETCH_HEAD“"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "запазване на изтеглените пакети � обекти"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "позвол�ване на обнов�ването на указател� „HEAD“"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "задълбочаване на и�тори�та на плитко хранилище"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до определено време"
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "превръщане в пълно хранилище"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "добав�не на това пред път� на подмодула"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15806,121 +15741,127 @@ msgstr ""
 "�тандартно рекур�ивно изтегл�не на подмодулите (файловете � на�тройки �а � "
 "приоритет)"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "приемане на указатели, които обнов�ват „.git/shallow“"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "К�РТ�_С_УК�З�ТЕЛИ"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "указване на К�РТ�та_С_УК�З�ТЕЛИ за до�тав�не"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "докладване, че в�ички обекти може �а до�тижими при започване от този"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "без до�тав�не на пакетни файлове, вме�то това да �е извеждат предше�твеници "
 "на договорните върхове"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "изпълн�ване на „maintenance --auto“ �лед до�тав�не"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "проверка за принудителни обнов�вани� на в�ички клони"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "запазване на гра̀фа � подавани�та �лед до�тав�не"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "четене на указателите от �тандартни� вход"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Указател�т „HEAD“ в отдалеченото хранилище не може да бъде открит"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "указател�т „HEAD“ в отдалеченото хранилище не може да бъде открит"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "на�тройката „fetch.output“ е � неправилна �тойно�т „%s“"
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ лип�ва"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[актуален]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "в текущи� клон не може да �е до�тав�"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "изтеглен в друго работно дърво"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[обнов�ване на етикетите]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "локален указател не може да бъде обновен"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "�ъще�твуващ етикет ще бъде презапи�ан"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "принудително обнов�ване"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "�ъщин�ко �ливане"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"За да � включите еднократно ползвайте опци�та „--show-forced-updates“, а за "
-"да � включите за по�то�нно, изпълнете:\n"
+"Обичайно при до�тав�не �е извежда, кои клони �а били принудително обновени,\n"
+"но тази проверка е изключена.  За да � включите за командата, ползвайте "
+"опци�та\n"
+"„--show-forced-updates“, а за да � включите за по�то�нно, изпълнете:\n"
 "\n"
 "    git config fetch.showForcedUpdates true"
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
 "Проверката за принудителни изтла�квани� отне %.2f �ек.  Може да � пре�кочите "
 "еднократно � опци�та „--no-show-forced-updates“, а за да � изключите за "
@@ -15928,23 +15869,23 @@ msgstr ""
 "\n"
 "    git config fetch.showForcedUpdates false\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати в�ички необходими обекти\n"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 "отхвърл�не на „%s“, защото плитките върхове не може да бъдат обнов�вани"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15954,143 +15895,144 @@ msgstr ""
 "„git remote prune %s“, за да премахнете о�тарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще �е окаже извън клон)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "�е може да до�тавите в текущи� клон „%s“ на хранилище, което не е голо"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "не може да до�тавите в клона „%s“, който е изтеглен в път� „%s“"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Стойно�тта „%2$s“ за опци�та „%1$s“ не е �ъвме�тима � „%3$s“"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "�тойно�тта „%2$s“ за опци�та „%1$s“ не е �ъвме�тима � „%3$s“"
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
 msgstr "опци�та „%s“ �е пре�кача при „%s“\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "обектът „%s“ не �ъще�твува"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 "за�ечени �а множе�тво клони, това е не�ъвме�тимо � опци�та „--set-upstream“"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"�леденото от „HEAD“ не може да �е �мени от „%2$s“ на „%1$s“, защото второто "
+"не �очи към никой клон."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "не може да указвате клон за �ледене на отдалечен етикет"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "не може да указвате клон за �ледене на отдалечен етикет"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "непознат вид клон"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
-"не е открит клон за �ледене.\n"
-"Тр�бва изрично да зададете един клон � опци�та „--set-upstream option“."
+"не е открит клон за �ледене;\n"
+"тр�бва изрично да зададете точно един клон � опци�та „--set-upstream“"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "До�тав�не на „%s“\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
 msgstr "„%s“ не може да �е до�тави"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "„%s“ не може да �е до�тави (изходни�т код е: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
-"�е �те указали отдалечено хранилище.  Задайте или адре�, или име\n"
+"не �те указали отдалечено хранилище; задайте или адре�, или име\n"
 "на отдалечено хранилище, откъдето да �е до�тав�т новите вер�ии."
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Тр�бва да укажете име на етикет."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "тр�бва да укажете име на етикет"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr ""
 "Опци�та „--negotiate-only“ изи�ква една или повече опции „--negotiate-tip=*“"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
 
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "опциите „--deepen“ и „--depth“ �а не�ъвме�тими"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "опциите „--depth“ и „--unshallow“ �а не�ъвме�тими"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "не може да използвате опци�та „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "към „git fetch --all“ не може да добавите аргумент-указател на вер�и�"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "��ма нито отдалечено хранилище, нито група от хранилища на име „%s“"
+msgid "no such remote or remote group: %s"
+msgstr "н�ма нито отдалечено хранилище, нито група от хранилища на име „%s“"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Указването на група и указването на вер�и� �а не�ъвме�тими"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "до�тав�нето на група и указването на вер�и� �а не�ъвме�тими"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "опци�та „--negotiate-only“ изи�ква хранилище"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Протоколът не поддържа опци�та „--negotiate-only“, изход от прогамата."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "протоколът не поддържа опци�та „--negotiate-only“, изход от програмата"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -16098,12 +16040,12 @@ msgstr ""
 "опци�та „--filter“ може да �е ползва �амо � отдалеченото хранилище указано в "
 "на�тройката „extensions.partialclone“"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 "опци�та „--atomic“ поддържа до�тав�не �амо от едно отдалечено хранилище"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "опци�та „--stdin“ поддържа до�тав�не �амо от едно отдалечено хранилище"
 
@@ -16113,25 +16055,29 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m СЪОБЩЕ�ИЕ] [--log[=БРОЙ] | --no-log] [--file Ф�ЙЛ]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 "вмъкване на журнал �ъ�то�щ �е от не повече от БРОЙ запи�а от �ъкратени� "
 "журнал"
 
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "п�евдоним на „--log“ (ОСТ�РЯЛО)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "за начало на �ъобщението да �е ползва ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "използване на това ИМЕ вме�то и�тин�ки� клон-цел"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "файл, от който да �е чете"
 
@@ -16151,47 +16097,47 @@ msgstr "git for-each-ref [--merged [ПОДÐ�Ð’Ð�Ð�Е]] [--no-merged [ПОДÐ�Ð’Ð
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [ПОД�В��Е]] [--no-contains [ПОД�В��Е]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "цитиране подход�що за командни интерпретатори на обвивката"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "цитиране подход�що за perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "цитиране подход�що за python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "цитиране подход�що за tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "извеждане �амо на този БРОЙ напа�нати указатели"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "�пазване на цветовете на форма̀та"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "извеждане �амо на указателите, �очещи към ОБЕКТ�"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "извеждане �амо на �летите указатели"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "извеждане �амо на не�летите указатели"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "извеждане �амо на указателите, които �ъдържат това ПОД�В��Е"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "извеждане �амо на указателите, които не �ъдържат това ПОД�В��Е"
 
@@ -16342,125 +16288,125 @@ msgstr "%s: развален или лип�ващ обект: %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: обектът е непознат вид „%s“: %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "„%s“: не може да �е анализира: „%s“"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "неправилен ред � контролна �ума по SHA1: „%s“"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Проверка на директори� � обекти"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Проверка на директориите � обекти"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Проверка на връзките на „%s“"
 
 #
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "неправилен указател „%s“"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "„%s“ �очи към нещо необичайно (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: не�вързани�т връх „HEAD“ не �очи към нищо"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "предупреждение: „%s“ �очи към в�е още не�ъще�твуващ клон (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Проверка на дървото на кеша"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "в дървото на кеша има нещо, което не е дърво"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "показване на недо�тижимите обекти"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индек�а да �а коренови"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "про�лед�ване и на указателите от журнала � указателите (�тандартно)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да �е провер�ват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "проверка �амо на връзката"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "по-�троги проверки"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директори�та „.git/lost-found“"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "показване на подробни имена на до�тижимите обекти"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "„%s“: лип�ващ обект"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "неправилен параметър: очаква �е SHA1, а бе получено: „%s“"
@@ -16479,17 +16425,12 @@ msgstr "�еу�пешно изпълнение на „fstat“ върху „%
 msgid "failed to parse '%s' value '%s'"
 msgstr "�тойно�тта на „%s“ — „%s“ не може да �е анализира"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "не може да �е получи информаци� чрез „stat“ за директори�та „%s“"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16505,58 +16446,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "ока�тр�не на обектите, към които нищо не �очи"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "изчерпателно тър�ене на боклука (за �метка на повече време работа)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "включване на автоматичното �ъбиране на боклука (auto-gc)"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "изрично �тартиране на �ъбирането на боклука, дори и ако вече работи друго "
 "�ъбиране"
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "препакетиране на в�ичко без най-големи� пакет"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "неразпозната �тойно�т на „gc.logexpiry“ %s"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "неразпозната �тойно�т на периода за ока�тр�не: %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "�втоматично пакетиране на заден фон на хранилището за по-добра "
 "производително�т.\n"
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "�втоматично пакетиране на хранилището за по-добра производително�т.\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 "Погледнете ръковод�твото за повече информаци� как да изпълните „git help "
 "gc“.\n"
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16565,214 +16506,214 @@ msgstr ""
 "проце�а: %<PRIuMAX> (ако �те �игурни, че това не е в�рно, това използвайте\n"
 "опци�та „--force“)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Има прекалено много недо�тижими, непакетирани обекти.\n"
 "Използвайте „git prune“, за да ги ока�трите."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=З�Д�Ч�] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "опци�та „--no-schedule“ не е позволена"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "непознат аргумент към „--schedule“: %s"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "графът � подавани�та не може да бъде запи�ан"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "неу�пешно предварително до�тав�не на отдалечените клони"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "проце�ът за командата „git pack-objects“ не може да бъде �тартиран"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "проце�ът за командата „git pack-objects“ не може да завърши"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "индек�ът за множе�тво пакети не може да бъде запи�ан"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "неу�пешно изпълнение на „git multi-pack-index expire“"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "неу�пешно изпълнение на „git multi-pack-index repack“"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "задачата „incremental-repack“ �е пре�кача, защото на�тройката „core."
 "multiPackIndex“ е изключена"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "заключващи�т файл „%s“ �ъще�твува.  Дей�твието �е пре�кача"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "неу�пешно изпълнение на задачата „%s“"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "„%s“ не е правилна задача"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "задачата „%s“ не може да �е избере повече от веднъж"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "изпълн�ване на задачи �поред �ъ�то�нието на хранилището"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "че�тота"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "изпълн�ване на задачи по график"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "без извеждане на напредъка и друга информаци� на �тандартни� изход"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "задача"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "изпълнение на определена задача"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "опциите „--auto“ и „--schedule=ЧЕСТОТ�“ �а не�ъвме�тими"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "неу�пешно изпълнение на „git config“"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "грешка при заме�тването на път� „%s“"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "неу�пешно �тартиране на „launchctl“."
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "у�лугата „%s“ не може �е на�трои първоначално"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "неу�пешно �ъздаване на временен файл за xml"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "задачите за периодично изпълнение не може да �е �тартират"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "неу�пешно изпълнение на „crontab -l“.  Си�темата ви може да не поддържа "
 "„cron“"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "неу�пешно изпълнение на „crontab“.  Си�темата ви може да не поддържа „cron“"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "�тандартни�т вход на „crontab“ не може да �е отвори"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "проце�ът на „crontab“ умр�"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "неу�пешно �тартиране на „systemctl“"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "неу�пешно изпълнение на „systemctl“"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "непознат аргумент към „--scheduler“: %s"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "лип�ват както таймери на systemd, така и crontab"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "планиращи�т модул „%s“ лип�ва"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "друг проце� задава поддръжката на заден фон"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=ПЛ��ИР�Щ_МОДУЛ]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "ПЛ��ИР�Щ_МОДУЛ"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "ПЛ��ИР�Щи�т_МОДУЛ, който да изпълн�ва задачите"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "неу�пешно добав�не на хранилище към файла � глобални на�тройки"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance ПОДКОМ��Д� [ОПЦИЯ…]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "неправилна подкоманда: „%s“"
@@ -17155,25 +17096,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "непознат формат на помощта „%s“"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "�еу�пешно �тартиране на „emacsclient“."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Вер�и�та на „emacsclient“ не може да �е анализира."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Прекалено �тара вер�и� на „emacsclient“ — %d (< 22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -17182,7 +17123,7 @@ msgstr ""
 "„%s“: път към неподдържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.cmd“."
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -17191,41 +17132,41 @@ msgstr ""
 "„%s“: команда за поддържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.path“."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s“: непозната програма за преглед на ръковод�твото."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "нико� програма за преглед на ръковод�тво не у�п� да обработи за�вката"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr ""
 "нико� програма за преглед на информационните �траници не у�п� да обработи "
 "за�вката"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "„%s“ е п�евдоним на „%s“"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "неправилен низ за на�тройката „alias.%s“: „%s“"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "опци�та не приема аргументи"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "За повече информаци� изпълнете „git help config“"
 
@@ -17495,18 +17436,10 @@ msgstr "неправилна �тойно�т „%s“"
 msgid "unknown hash algorithm '%s'"
 msgstr "непознат алгоритъм за контролни �уми „%s“"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "опци�та „--fix-thin“ изи�ква „--stdin“"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "„--stdin“ изи�ква хранилище на git"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "опци�та „--object-format“ и „--stdin“ �а не�ъвме�тими"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "опци�та „--verify“ изи�ква име на пакетен файл"
@@ -17637,10 +17570,6 @@ msgstr "алгоритъм"
 msgid "specify the hash algorithm to use"
 msgstr "указване на алгоритъм за контролна �ума"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "опциите „--separate-git-dir“ и „--bare“ �а не�ъвме�тими"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17776,85 +17705,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "опци�та „-LДИ�П�ЗО�:Ф�ЙЛ“ не може да �е ползва � път"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "неизве�тен вид: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: неправилно придружаващо пи�мо от режима на опи�ание"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "не е зададена �тойно�т на „format.headers“"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "тр�бва да зададете точно един диапазон"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "не е диапазон"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "придружаващото пи�мо тр�бва да е форматирано като е-пи�мо"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "неу�пешно �ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната ча�т за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИ�П�ЗО�_��_ВЕРСИИТЕ]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "може да укажете мак�имум една директори� за изход"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "непознато подаване: „%s“"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "„%s“ не е указател или не �очи към нищо"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "точната база за �ливане не може да бъде открита"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -17865,307 +17794,289 @@ msgstr ""
 "Може ръчно да зададете базово подаване чрез „--"
 "base=<ИДЕ�ТИФИК�ТОР_��_Б�ЗОВО_ПОД�В��Е>“."
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "точната база при �ливане не може да бъде открита"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовото подаване тр�бва да е предше�твеникът на �пи�ъка � вер�иите"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "базовото подаване не може да е в �пи�ъка � вер�иите"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "идентификаторът на кръпката не може да бъде получен"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "неу�пешно определ�не на началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 "„%s“ �е ползва като началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номераци� „[PATCH n/m]“ дори и при един�твена кръпка"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "номераци� „[PATCH]“ дори и при множе�тво кръпки"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на �тандартни� изход"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "�ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "про�та чи�лова по�ледователно�т за имената на файловете-кръпки"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "З��ЦИ"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези З��ЦИ за �уфик� вме�то „.patch“"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не � 1"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "номер на редакци�"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "отбел�зване, че това е N-тата поредна редакци� на поредицата от кръпки"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "мак�имална дължина на име на в�еки пакетен файл"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "използване на „[RFC PATCH]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "режим-придружаващо-пи�мо-по-опи�ание"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "генериране на ча�тите на придружаващото пи�мо на базата на опи�анието на "
 "клона"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "без добав�не/махане на префик�а „[PATCH]“"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "в заглавната ча�т „From:“ (от) контролната �ума да е �амо от нули"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "без кръпки, които при�ъ�тват в �ледени� клон"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в �тандартни� (кръпка и �тати�тика)"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "добав�не на тази З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "Е-ПОЩ�"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "добав�не на заглавна ча�т „To:“ (до)"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "добав�не на заглавна ча�т „Cc:“ (и до)"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ИДЕ�ТИЧ�ОСТ"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адре�а в заглавната ча�т „From“ (от) да е тази ИДЕ�ТИЧ�ОСТ.  �ко "
 "не е зададена такава, �е взима адре�а на подаващи�"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото �ъобщение да е в отговор на е-пи�мото � този "
 "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "прикреп�не на кръпката"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "включване на кръпката в тек�та на пи�мата"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "използване на нишки за �ъобщени�та.  СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "подпи�"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "добав�не на поле за подпи�"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "Б�ЗОВО_ПОД�В��Е"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "добав�не на необходимото Б�Зово дърво към поредицата от кръпки"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "добав�не на подпи� от файл"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "извеждане на напредъка във фазата на �ъздаване на кръпките"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "показване на промените �пр�мо ВЕРСи�та в придружаващото пи�мо или един�твена "
 "кръпка"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "показване на промените �пр�мо указател� на ВЕРСи�та в придружаващото пи�мо "
 "или един�твена кръпка"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "процент за претегл�не при оценка на �ъздаването"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентично�т: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "опциите „-n“ и „-k“ �а не�ъвме�тими"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "опциите „--subject-prefix“/„--rfc“ и „-k“ �а не�ъвме�тими"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "опци�та „--name-only“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "опци�та „--name-status“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "опци�та „--check“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"опциите „--stdout“, „--output“ и „--output-directory“ �а не�ъвме�тими една � "
-"друга"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 "опци�та „--interdiff“ изи�ква опци� „--cover-letter“ или един�твена кръпка"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Разлика в разликите:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Разлика в разликите �пр�мо v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "опци�та „--creation-factor“ изи�ква опци� „--range-diff“"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 "опци�та „--range-diff“ изи�ква опци� „--cover-letter“ или един�твена кръпка"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Диапазонна разлика:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Диапазонна разлика �пр�мо v%d:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ � подпи� не може да бъде прочетен"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Създаване на кръпки"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "неу�пешно �ъздаване на изходни файлове"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТД�ЛЕЧЕ�_КЛО� [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -18173,120 +18084,125 @@ msgstr ""
 "Следени�т отдалечен клон не бе открит, затова изрично задайте "
 "ОТД�ЛЕЧЕ�_КЛО�.\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [ОПЦИЯ…] [Ф�ЙЛ…]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "извеждане на �ъ�то�нието на файловете � еднобуквени флагове"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "малки букви за файловете, които да �е �четат за непроменени"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "малки букви за файловете за командата „fsmonitor clean“"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "извеждане на кешираните файлове (�тандартно)"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "извеждане на изтритите файлове"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "извеждане на променените файлове"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "извеждане на другите файлове"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "извеждане на името на обекта за �ъдържанието на индек�а"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "извеждане на файловете, които тр�бва да бъдат изтрити"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "извеждане �амо на името на другите (не�ледените) директории"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "извеждане на знаците за край на ред във файловете"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "без извеждане на празните директории"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "извеждане на не�летите файлове"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "извеждане на информаци�та за отм�на на разрешените подавани�"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "пре�качане на файловете напа�ващи Ш�БЛО�а"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "изчитане на шаблоните за игнориране от Ф�ЙЛ"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "изчитане на допълнителните шаблони за игнориране по директори� от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "добав�не на �тандартно игнорираните от Git файлове"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "пътищата да �а отно�ителни �пр�мо о�новната директори� на проекта"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "грешка, ако н�кой от тези Ф�ЙЛове не е в индек�а"
 
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "УК�З�ТЕЛ_КЪМ_ДЪРВО"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "�читане, че пътищата изтрити �лед УК�З�ТЕЛ�_КЪМ_ДЪРВО в�е още �ъще�твуват"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "извеждане на информаци�та за изчи�тване на грешки"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "без повтар�не на запи�ите"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+"указване на ча�тично изтеглените директории при наличието на ча�тичен индек�"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -18486,26 +18402,30 @@ msgid "use a diff3 based merge"
 msgstr "�ливане на базата на „diff3“"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "за�илено �ливане на базата на „diff3“"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "при конфликти да �е ползва локалната вер�и�"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "при конфликти да �е ползва чуждата вер�и�"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "при конфликти да �е ползва обединена вер�и�"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "при конфликти да �е ползва маркер � такъв БРОЙ знаци"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "без предупреждени� при конфликти"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "задаване на етикети за Ф�ЙЛ_1/ОРИГИ��Л/Ф�ЙЛ_2"
 
@@ -18544,184 +18464,188 @@ msgstr "Сливане на „%s“ � „%s“\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [ОПЦИЯ…] [ПОД�В��Е…]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "опци�та „-m“ изи�ква �тойно�т"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "опци�та „%s“ изи�ква �тойно�т"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "��ма такава �тратеги� за �ливане: „%s“.\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "�аличните �тратегии �а:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните �тратегии �а:"
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "без извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(п�евдоним на „--stat“)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "добав�не (на мак�имум такъв БРОЙ) запи�и от �ъкратени� журнал в �ъобщението "
 "за подаване"
 
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "�ъздаване на едно подаване вме�то извършване на �ливане"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при у�пешно �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "редактиране на �ъобщението преди подаване"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "позвол�ване на превъртане (�тандартно дей�твие)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "преу�танов�ване, ако превъртането е невъзможно"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверка, че указаното подаване е � правилен подпи� на GPG"
 
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "СТР�ТЕГИЯ"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "СТР�ТЕГИЯ за �ливане, ко�то да �е ползва"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "ОПЦИЯ=СТОЙ�ОСТ"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "ОПЦИЯ за избраната �тратеги� за �ливане"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "СЪОБЩЕ�ИЕ при подаването �ъ� �ливане (при �ъщин�ки �ливани�)"
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "използване на това ИМЕ вме�то и�тин�ки� клон-цел"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "преу�танов�ване на текущото �ливане"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "преу�танов�ване (--abort) без пром�на на индек�а и работното дърво"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "продължаване на текущото �ливане"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "позвол�ване на �ливане на незави�ими и�тории"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и �ливане и при пром�на на "
 "�ъобщението за подаване (pre-merge-commit и commit-msg)"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "не може да �е извърши �катаване"
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "неу�пешно �катаване"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "неу�пешно прочитане на обект-дърво"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Вече е обновено (н�ма какво да �е вкара)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Вкарано подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "Лип�ва �ъобщение при подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s“ не �очи към подаване"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправилен низ за на�тройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа �е �амо �ливане на точно две и�тории."
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "непозната опци� за �тратеги�: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да �е чете"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Сливането н�ма да бъде подадено.  За завършването му и подаването му "
 "използвайте командата „git commit“.\n"
 
-#: builtin/merge.c:829
+#: builtin/merge.c:831
 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"
@@ -18730,11 +18654,11 @@ msgstr ""
 "В �ъобщението при подаване добавете информаци� за причината за\n"
 "�ливането, о�обено ако �ливате обновен отдалечен клон в тематичен клон.\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Празно �ъобщение предотврат�ва подаването.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18743,76 +18667,76 @@ msgstr ""
 "Редовете, които започват � „%c“, ще бъдат пропу�нати, а празно\n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Празно �ъобщение при подаване."
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първи�т етап на �ливането завърши.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "�еу�пешно автоматично �ливане — коригирайте конфликтите и подайте "
 "резултата.\n"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "��ма текущ клон."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "Текущи�т клон не �леди никой клон."
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�икой клон не �леди клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "�еправилна �тойно�т „%s“ в �редата „%s“"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не може да �е �лее в „%s“: %s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "не може да �е �лее"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "опци�та „--abort“ не приема аргументи"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "�е може да преу�тановите �ливане, защото в момента не �е извършва такова "
 "(лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "опци�та „--quit“ не приема аргументи"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "опци�та „--continue“ не приема аргументи"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "В момента не �е извършва �ливане (лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18820,7 +18744,7 @@ msgstr ""
 "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува).\n"
 "Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18828,90 +18752,82 @@ msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува).  Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува)."
 
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "опциите „--squash“ и „--no-ff“ �а не�ъвме�тими."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "опциите „--squash“ и „--commit“ �а не�ъвме�тими."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "�е е указано подаване и на�тройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Вкарване на подаване във връх без и�тори� в�е още не �е поддържа"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Понеже върхът е без и�тори�, �ливани�, които не �а превъртани�, �а невъзможни"
 
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да �е �лее"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Може да �леете точно едно подаване във връх без и�тори�"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "незави�ими и�тории не може да �е �ле�т"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обнов�ване „%s..%s“\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба �ъ� �ливане в рамките на индек�а…\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "�еу�пешно �ливане.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване �ъ� �тратеги�та за �ливане „%s“…\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�ико� �тратеги� за �ливане не може да извърши �ливането.\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "�еу�пешно �ливане �ъ� �тратеги� „%s“.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr ""
 "Ползва �е �тратеги�та „%s“, ко�то ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18954,7 +18870,7 @@ msgstr "етикетът на Ñ�тандартниÑ� вход не преминÐ
 msgid "tag on stdin did not refer to a valid object"
 msgstr "етикетът на �тандартни� вход не �очи към правилен обект"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "файлът за етикета не може да бъде запазен"
 
@@ -19023,7 +18939,7 @@ msgstr ""
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "�нимка на указателите за избор на подавани� по битова ма�ка"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -19124,54 +19040,54 @@ msgstr "%s, обект: „%s“, цел: „%s“"
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "неу�пешно преименуване на „%s“"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [ОПЦИЯ…] ПОД�В��Е…"
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [ОПЦИЯ…] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [ОПЦИЯ…] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "извеждане �амо на имена на базата на указатели (а не имена на обекти)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "използване �амо на етикетите за именуване на подавани�та"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "използване �амо на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "игнориране на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr ""
 "извеждане на в�ички подавани�, които може да бъдат до�тигнати от в�ички "
 "указатели"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "четене от �тандартни� вход"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "да �е извеждат и недефинираните имена (�тандартна �тойно�т на опци�та)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
 
@@ -19291,25 +19207,25 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Запи�ване/редактиране на бележките за �ледни� обект:"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "дей�твието „show“ не може да �е изпълни за обект „%s“"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "изведената информаци� от дей�твието „show“ не може да �е прочете"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "дей�твието „show“ не може да �е завърши за обект „%s“"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "задайте �ъдържанието на бележката � н�ко� от опциите „-m“ или „-F“"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "обектът-бележка не може да бъде запи�ан"
 
@@ -19318,7 +19234,7 @@ msgstr "обектът-бележка не може да бъде запи�ан
 msgid "the note contents have been left in %s"
 msgstr "�ъдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
@@ -19363,8 +19279,8 @@ msgstr ""
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "прекалено много аргументи"
 
@@ -19411,7 +19327,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Презапи�ване на �ъще�твуващите бележки за обекта „%s“\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Изтриване на бележката за обекта „%s“\n"
@@ -19539,17 +19455,17 @@ msgstr "тр�бва да укажете указател към бележка
 msgid "unknown -s/--strategy: %s"
 msgstr "неизве�тна �тратеги� към опци�та „-s“/„--strategy“: „%s“"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "в момента �е извършва �ливане на бележките в „%s“ при „%s“"
 
-#: builtin/notes.c:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "не може да �е запази връзка към указател� на текущата бележка („%s“)."
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19560,41 +19476,41 @@ msgstr ""
 "резултата � „git notes merge --commit“ или преу�тановете �ливането � "
 "командата „git notes merge --abort“.\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е може да �е открие към какво �очи „%s“."
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "��ма бележки за обекта „%s“\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "опитът за изтриването на не�ъще�твуваща бележка не �е �чита за грешка"
 
-#: builtin/notes.c:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от �тандартни� вход"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "�амо извеждане без дей�твително ока�тр�не"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "докладване на ока�трените обекти"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "да �е използва бележката �очена от този УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "непозната подкоманда: %s"
@@ -20012,10 +19928,6 @@ msgstr ""
 "опци�та „--thin“не може да �е използва за �ъздаване на пакетни файлове � "
 "индек�"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ �а не�ъвме�тими"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "опци�та „--filter“ изи�ква „--stdout“"
@@ -20033,7 +19945,7 @@ msgstr ""
 msgid "Enumerating objects"
 msgstr "Избро�ване на обектите"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -20076,19 +19988,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "информаци� за ока�трените обекти"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "об�в�ване на обектите по-�тари от това ВРЕМЕ за о�тарели"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "хранилище � важни обекти не може да �е ока�тр�"
 
@@ -20123,7 +20035,7 @@ msgstr ""
 "дали куките преди подаване и �ливане и при пром�на на �ъобщението за "
 "подаване (pre-merge-commit и commit-msg) да �е изпълн�т"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "автоматично �катаване/прилагане на �катаното преди и �лед пребазиране"
 
@@ -20200,6 +20112,7 @@ msgid "<remote>"
 msgstr "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "КЛО�"
 
@@ -20232,13 +20145,13 @@ msgstr "недо�тъпно подаване: %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "без „--verify-signatures“ при пребазиране"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -20252,28 +20165,28 @@ msgstr ""
 "това.  За да заглушите това �ъобщение, изпълнете н�ко� от �ледните\n"
 "команди преди �ледващото издърпване:\n"
 "\n"
-"  git config pull.rebase false  # �ливане (�тандартна �тратеги�)\n"
-"  git config pull.rebase true   # пребазиране\n"
-"  git config pull.ff only       # �амо превъртане\n"
+"    git config pull.rebase false  # �ливане\n"
+"    git config pull.rebase true   # пребазиране\n"
+"    git config pull.ff only       # �амо превъртане\n"
 "\n"
 "За да зададете �тандартната на�тройка за в�ички �вои хранилища, добавете и\n"
 "опци�та „--global“.  За да укажете �тратеги� при конкретно издърпване,\n"
 "използвайте опциите „--rebase“, „--no-rebase“, „--ff-only“.  Те �а �\n"
 "приоритет пред на�тройките.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обнов�ване на в�е още не�ъздаден клон � промените от индек�а"
 
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "издърпване � пребазиране"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "тр�бва да подадете или �катаете промените."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20283,7 +20196,7 @@ msgstr ""
 "до�тав�нето обнови върха на текущи� клон.  Работното\n"
 "ви копие бе превърт�но от подаване „%s“."
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20300,24 +20213,24 @@ msgstr ""
 "    git reset --hard\n"
 "за връщане към нормално �ъ�то�ние."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�е може да �ливате множе�тво клони в празен върхов указател."
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "�е може да пребазирате върху повече от един клон."
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "�е може да превъртите към повече от един клон."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr ""
 "Тр�бва да укажете как да �е решават разликите при разминаване на клоните."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "пребазирането е невъзможно заради локално запи�аните промени по подмодулите"
@@ -20507,7 +20420,7 @@ msgstr "Изтла�кване към „%s“\n"
 msgid "failed to push some refs to '%s'"
 msgstr "ча�т от указателите не б�ха изтла�кани към „%s“"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "хранилище"
 
@@ -20583,11 +20496,6 @@ msgstr "подпи�ване на изтла�кването � GPG"
 msgid "request atomic transaction on remote side"
 msgstr "изи�кване на атомарни операции от от�рещната �трана"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-"опци�та „--delete“ е не�ъвме�тима � опциите  „--all“, „--mirror“ и „--tags“"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "опци�та „--delete“ изи�ква поне един указател на вер�и�"
@@ -20619,26 +20527,14 @@ msgstr ""
 "\n"
 "    git push ИМЕ\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "опциите „--all“ и „--tags“ �а не�ъвме�тими"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "опци�та „--all“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "опциите „--mirror“ и „--tags“ �а не�ъвме�тими"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "опци�та „--mirror“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "опциите „--all“ и „--mirror“ �а не�ъвме�тими"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "опциите за изтла�кване не тр�бва да �ъдържат знак за нов ред"
@@ -21066,18 +20962,6 @@ msgstr ""
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "Опци�та „--preserve-merges“ е заменена � „--rebase-merges“."
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "опциите „--keep-base“ и „--onto“ �а не�ъвме�тими"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "опциите „--keep-base“ и „--root“ �а не�ъвме�тими"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "опциите „--root“ и „--fork-point“ �а не�ъвме�тими"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
@@ -21144,8 +21028,8 @@ msgstr ""
 "опци�та „--strategy“ изи�ква н�ко� от опциите „--merge“ или „--interactive“"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "опциите за „apply“ �а не�ъвме�тими � опциите за �ливане"
+msgid "apply options and merge options cannot be used together"
+msgstr "опциите за прилагане и �ливане �а не�ъвме�тими"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -21188,7 +21072,7 @@ msgid "no such branch/commit '%s'"
 msgstr "не �ъще�твува клон/подаване „%s“"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Такъв указател н�ма: %s"
@@ -21258,7 +21142,7 @@ msgstr "Превъртане на „%s“ към „%s“.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ДИРЕКТОРИЯ_��_GIT"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -21291,7 +21175,7 @@ msgstr ""
 "За да заглушите това �ъобщение, като запазите �тандартното поведение,\n"
 "задайте на�тройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -21312,13 +21196,13 @@ msgstr ""
 "За да заглушите това �ъобщение, задайте на�тройката\n"
 "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Тр�бва да укажете директори�."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "тр�бва да укажете директори�"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -21341,41 +21225,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists УК�З�ТЕЛ"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Отбел�зване на до�тижимите обекти…"
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "„%s“ не �очи наникъде!"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "не е указан журнал � подавани� за изтриване"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "„%s“ не е журнал � подавани�"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "лип�ва журнал � подавани�та за „%s“"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "неправилен формат на указател: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -21467,6 +21351,11 @@ msgstr "git remote update [ОПЦИЯ…] [ГРУПÐ� | ОТДÐ�ЛЕЧЕÐ�О_Ð¥Ð
 msgid "Updating %s"
 msgstr "Обнов�ване на „%s“"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "„%s“ не може да �е до�тави"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21927,161 +21816,153 @@ msgstr ""
 "командата „pack-objects“ не може да �е �тартира за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: от „pack-objects“ �е изи�кват редове �амо � пълни ше�тнай�етични "
 "указатели."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да завърши за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "грешка при отвар�не на индек�а за „%s“"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "пакет „%s“ е твърде гол�м, за да е ча�т от геометрична прогре�и�"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "пакет „%s“ е твърде гол�м за �виване"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "временни�т файл „%s“ не може да бъде отворен за запи�"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "временни�т файл �ъ� �нимка на указателите не може да �е затвори"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "пакетиране на в�ичко в пакет"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 "�ъщото като опци�та „-a“.  Допълнително — недо�тижимите обекти да �танат "
 "непакетирани"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 "премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
 "prune-packed“"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "подаване на опци�та „--no-reuse-delta“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 "подаване на опци�та „--no-reuse-object“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "без изпълнение на командата „git-update-server-info“"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "подаване на опци�та „--local“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "�ъздаване и запи�ване на индек�и на база битови ма�ки"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "подаване на опци�та „--delta-islands“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "еври�тична дата"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "при комбинирането � опци�та „-A“ — без разпакетиране на обектите по �тари от "
 "това"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "� „-a“ — препакетиране на недо�тижимите обекти"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "размер на прозореца за делта компре�и�та"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "байтове"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "�ъщото като горната опци�, но ограничението да е по размер на паметта, а не "
 "по бро� на обектите"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "ограничаване на мак�ималната дълбочина на делтата"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "ограничаване на мак�имални� брой нишки"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "мак�имален размер на в�еки пакет"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "препакетиране на обектите в пакети бел�зани � „.keep“"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "без препакетиране на този пакет"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "откриване на геометрична прогре�и� � ча�тно <N>"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "запазване на многопакетен индек� за �ъздадените пакети"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "пакетите в хранилище � важни обекти не може да �е три�т"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "опциите „--keep-unreachable“ и „-A“ �а не�ъвме�тими"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "опциите „--geometric“ и „-A“/„-a“ �а не�ъвме�тими"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "�ищо ново за пакетиране"
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "лип�ва задължителни� файл „%s“"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
@@ -22164,67 +22045,61 @@ msgstr "изпълнението на „cat-file“ завърши Ñ� грешÐ
 msgid "unable to open %s for reading"
 msgstr "„%s“ не може да бъде отворен за четене"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "не може да �е �ъздаде проце� за „mktree“"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "не може да �е прочете от „mktree“"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "„mktree“ завърши � грешка"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "„mktree“ не върна име на обект"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "„fstat“ не може да �е изпълни върху „%s“"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "обектът не може да бъде запи�ан в базата от данни"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "неправилно име на обект: „%s“"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "не може да �е определи видът на обекта „%s“"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "неу�пешно редактиране на файла � обектите"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "нови�т и �тари�т обект �а един и �ъщ: „%s“"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "„%s“ не може да �е анализира като подаване"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "етикетът при �ливане в подаването „%s“ e неправилен"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "етикетът при �ливане в подаването „%s“ e неправилен"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -22233,31 +22108,31 @@ msgstr ""
 "Първоначалното подаване „%s“ �ъдържа етикета при �ливане „%s“, който е "
 "изхвърлен, затова използвайте опци�та „--edit“, а не „--graft“."
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "първоначалното подаване „%s“ е � подпи� на GPG"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "Подпи�ът ще бъде премахнат в замен�щото подаване!"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "замен�щото подаване за „%s“ не може да бъде запи�ано"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "при�адката за „%s“ е излишна"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "новото и �тарото подаване �а едно и �ъщо: „%s“"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22266,71 +22141,71 @@ msgstr ""
 "�ледните при�адки не може да �е преобразуват:\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "извеждане на �пи�ъка � указателите за зам�на"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "изтриване на указателите за зам�на"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "редактиране на �ъще�твуващ обект"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "�м�на на родителите на подаване"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "преобразуване на файла за при�адките"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "зам�на на указател�, ако �ъще�твува"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "без форматирано извеждане на �ъдържанието — за опци�та „--edit“"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "използване на този ФОРМ�Т"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "опци�та „--format“ изи�ква извеждане на �пи�ък"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "опци�та „-f“ изи�ква запазването на заме�тител"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "опци�та „--raw“ изи�ква „--edit“"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "опци�та „-d“ изи�ква поне един аргумент"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "неправилен брой аргументи"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "опци�та „-e“ изи�ква поне един аргумент"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "опци�та „-g“ изи�ква поне един аргумент"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "опци�та „--convert-graft-file“ не приема аргументи"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "опци�та „-l“ приема точно един шаблон"
 
@@ -22351,137 +22226,127 @@ msgstr "командата „git rerere forget“ изи�ква указван
 msgid "unable to generate diff for '%s'"
 msgstr "неу�пешно генериране на разлика за „%s“"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОД�В��Е]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [УК�З�ТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩ�…"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] "
 "[УК�З�ТЕЛ_КЪМ_ДЪРВО]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [УК�З�ТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩ�…]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "�ме�ено (mixed)"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "меко (soft)"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "пълно (hard)"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "�л�то (merge)"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "запазващо (keep)"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Указател�т „HEAD“ е повреден."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Дървото, �очено от указател� „HEAD“, не може да бъде открито."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Дървото, �очено от „%s“, не може да бъде открито."
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "Указател�т „HEAD“ �очи към „%s“"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�е може да �е извърши %s занул�ване по време на �ливане."
 
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "по-малко подробно�ти, да �е извеждат �амо грешките"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "индек�а и указател� „HEAD“, без работното дърво"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "�амо указател� „HEAD“, без индек�а и работното дърво"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "указател� „HEAD“, индек�а и работното дърво"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "занул�ване на указател� „HEAD“, но запазване на локалните промени"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "отбел�зване �амо на факта, че изтритите пътища ще бъдат добавени по-къ�но"
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Стойно�тта „%s“ не е разпозната като �ъще�твуваща вер�и�."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "„%s“ не е разпознат като дърво."
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-"опци�та „--patch“ е не�ъвме�тима � в��ка от опциите „--hard“/„--mixed“/„--"
-"soft“"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "опци�та „--mixed“ не бива да �е използва заедно � пътища.  Вме�то това "
 "изпълнете „git reset -- ПЪТ…“."
 
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�е може да извършите %s занул�ване, когато �те задали ПЪТ."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "В голо хранилище не може да извършите %s занул�ване"
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "опци�та „-N“ изи�ква опци�та „--mixed“"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Промени извън индек�а �лед занул�ването:"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -22494,19 +22359,15 @@ msgstr ""
 "Опци�та „--quiet“ заглушава това �ъобщение еднократно.  За по�то�нно\n"
 "заглушаване задайте на�тройката „reset.quiet“ да е „true“ (и�тина).\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Индек�ът не може да бъде занулен към вер�и� „%s“."
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "�ови�т индек� не може да бъде запи�ан."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и �а не�ъвме�тими"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "филтрирането на обекти изи�ква опци�та „--objects“"
@@ -22516,8 +22377,9 @@ msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "опци�та „--objects“ е не�ъвме�тима � избро�ването"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "опци�та „%s“ е не�ъвме�тима � избро�ването"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22966,13 +22828,6 @@ msgstr "БРОЙ[,Б�З�]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "показване на най-много БРОЙ журнални запи�а � начало �ъответната Б�З�"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"опци�та „--reflog“ е не�ъвме�тима � опциите  „--all“, „--remotes“, „--"
-"independent“ и „--merge-base“"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "не е зададен клон, а указател�т „HEAD“ е неправилен"
@@ -22993,19 +22848,19 @@ msgstr[1] "�амо %d запи�а може да бъде показани на
 msgid "no such ref %s"
 msgstr "такъв указател н�ма: %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "не може да �е обработи повече от %d указател."
 msgstr[1] "не може да �е обработ�т повече от %d указатели."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "„%s“ е неправилен указател."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "подаването „%s“ (%s) лип�ва"
@@ -23074,12 +22929,16 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) ОПЦИЯ…"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "това работно дърво не е ча�тично"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "това не е ча�тично работно дърво (веро�тно лип�ва файл „sparse-checkout“)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -23088,77 +22947,102 @@ msgstr ""
 "директори�та „%s“ �ъдържа не�ледени файлове, но не е в пътищата на "
 "пътеводното напа�ване на ча�тичното изтегл�не"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "директори�та „%s“ не може да бъде изтрита"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "директори�та за ча�тично изтегл�не „%s“ не може да бъде �ъздадена"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 "на�тройката „worktreeConfig“ не може да �е включи, защото форматът на "
 "хранилището не може да �е обнови"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "неу�пешно задаване на на�тройката „extensions.worktreeConfig“"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "на�тройките на ча�тични� индек� не може да �е промен�т"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "инициализиране на ча�тичното изтегл�не в пътеводен режим"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "превключване на ползването на ча�тичен индек�"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "на�тройките на ча�тични� индек� не може да �е промен�т"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "„%s“ не може да �е отвори"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "път�т „%s“  не може да �е нормализира"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | Ш�БЛО�…)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчи�тено"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "шаблоните за ча�тично изтегл�не не може да �е заред�т"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"�ъще�твуващите шаблони за ча�тично изтегл�не не използват пътеводни �егменти"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | Ш�БЛО�…)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "изчитане на шаблоните от �тандартни� вход"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "н�ма ча�тично изтегл�не, към което да �е добав�"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"Ш�БЛО�…)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"шаблоните за ча�тично�т може да бъдат приложени наново �амо в ча�тично "
+"изтеглено хранилище"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "грешка при обнов�ване на работната директори�"
 
@@ -23184,22 +23068,26 @@ msgstr "git stash branch КЛО� [СК�Т��О]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕ�ИЕ]\n"
 "          [--pathspec-from-file=Ф�ЙЛ [--pathspec-file-nul]]\n"
 "          [--] [ПЪТ…]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [СЪОБЩЕ�ИЕ]"
 
 #: builtin/stash.c:55
@@ -23294,140 +23182,158 @@ msgstr "Сливане на „%s“ � „%s“"
 msgid "Index was not unstashed."
 msgstr "Индек�ът не е изваден от �катаното."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "не�ледени файлове не може да �е въз�танов�т от �катаното"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "опит за повторно �ъздаване на индек�а"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Изтрито: „%s“ (%s)"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "Скатаното „%s“ не може да бъде изтрито"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "„%s“ не е указател към нещо �катано"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Скатаното е запазено в �лучай, че ви потр�бва отново."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "�е е указано име на клон"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "дървото не може да бъде анализирано"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "дървото не може да бъде разпакетирано"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "�катаване и на не�ледените файлове"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "извеждане �амо на не�ледените файлове в �катаното"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Указател�т „%s“ не може да бъде обновен да �очи към „%s“"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "�ъобщение при �катаване"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "командата „git stash store“ изи�ква точно един аргумент-ПОД�В��Е"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "��ма промени в индек�а"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "�е �а избрани никакви промени"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "В�е още лип�ва първоначално подаване"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Съ�то�нието на текущи� индек� не може да бъде запазено"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "�е�ледените файлове не може да �е запаз�т"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Съ�то�нието на текущи� индек� не може да бъде запазено"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "опци�та „--patch“ е не�ъвме�тима � „--include-untracked“ и „--all“"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"опци�та „--staged“ е не�ъвме�тима както � „--include-untracked“, така и � „--"
+"all“"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Пробвайте да използвате „git add“"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "��ма никакви локални промени за �катаване"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Скатаването не може да �тартира"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Текущото �ъ�то�ние не може да бъде запазено"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Съ�то�нието на работната директори� и индек�а e запазено: „%s“"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Промените в работното дърво не може да бъдат занулени"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "запазване на индек�а"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "�катаване �амо на промените, вкарани в индек�а"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "�катаване в режим за кръпки"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "без извеждане на информаци�"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "�катаване и на не�ледените файлове"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "�катаване и на игнорираните файлове"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -23451,7 +23357,7 @@ msgstr "пропу�кане на в�ички редове, които запо
 msgid "prepend comment character and space to each line"
 msgstr "добав�не на „# “ в началото на в�еки ред"
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Очаква �е пълно име на указател, а не „%s“"
@@ -23475,7 +23381,7 @@ msgstr ""
 "на�тройката „%s“ лип�ва.  Приема �е, че това хранилище е правилни�т източник "
 "за �ебе �и."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "директори� за определ�нето на отно�ителните пътища"
 
@@ -23571,7 +23477,7 @@ msgstr "указателÑ�Ñ‚ Ñ�очен от „HEAD“ в подмодула â€
 msgid "failed to recurse into submodule '%s'"
 msgstr "неу�пешно рекур�ивно обхождане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "без изход за �ъ�то�нието на подмодула"
 
@@ -23644,10 +23550,6 @@ msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОДÐ�Ð’Ð�Ð�Е] [--] [Ð
 msgid "could not fetch a revision for HEAD"
 msgstr "не може да �е до�тави вер�и� за „HEAD“"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "опциите „--cached“ и „--files“ �а не�ъвме�тими"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -23676,16 +23578,17 @@ msgstr "без извеждане на информациÑ� при Ñ�инхроÐ
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"Работното дърво на подмодул „%s“ �ъдържа директори� „.git“.\n"
-"(ако и�кате да ги изтриете заедно � ц�лата им и�тори�, използвайте „rm -rf“)"
+"Работното дърво на подмодул „%s“ �ъдържа директори� „.git“.  Т� ще �е "
+"заменени\n"
+"� файл „.git“ чрез командата „absorbgitdirs“."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23694,47 +23597,47 @@ msgstr ""
 "Работното дърво на подмодул „%s“ �ъдържа локални промени.  Може да ги "
 "отхвърлите � опци�та „-f“"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Директори�та „%s“ е изчи�тена\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 "Директори�та към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "празната директори� за подмодула „%s“ не може да бъде �ъздадена"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Реги�траци�та на подмодула „%s“ (%s) за път� „%s“ е премахната\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 "изтриване на работните дървета на подмодулите, дори когато те �ъдържат "
 "локални промени"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "премахване на реги�трациите на в�ички подмодули"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Използвайте „--all“, за да премахнете в�ички подмодули"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -23746,70 +23649,70 @@ msgstr ""
 "задайте на�тройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
 "при клониране ползвайте опци�та „--reference-if-able“ вме�то „--reference“."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "към подмодула „%s“ не може да �е добави алтернативен източник: %s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateErrorStrategy“"
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateLocation“"
 
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 "„%s“ не може нито да �е �ъздаде, нито да �е ползва в директори�та на git на "
 "друг подмодул"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "директори�та не е празна: „%s“"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "директори�та на подмодула „%s“ не може да бъде получена"
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "къде да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "име на нови� подмодул"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "адре�, от който да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "предотврат�ване на клониране в непразна и�тори�"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23818,95 +23721,95 @@ msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХР��ИЛИЩЕ] "
 "[--name ИМЕ] [--depth ДЪЛБОЧИ��] [--single-branch] --url �ДРЕС --path ПЪТ"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "�еправилен режим на обнов�ване „%s“ за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "�а�троен е неправилен режим на обнов�ване „%s“ за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Път�т на подмодула „%s“ не е инициализиран"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Веро�тно и�кахте да използвате „update --init“?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пре�качане на не�лети� подмодул „%s“"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пре�качане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�еу�пешен опит за клониране на „%s“.  �а�рочен е втори опит"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Втори неу�пешен опит за клониране на „%s“.  Дей�твието �е преу�танов�ва"
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "�еу�пешно изтегл�не на вер�и� „%s“ в път� към подмодул „%s“'"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "�еу�пешно пребазиране на вер�и� „%s“ в път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "�еу�пешно �ливане на вер�и� „%s“ в път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "�еу�пешно изпълнение на командата „%s %s“ в път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Път към подмодул „%s“: изтеглена е вер�и� „%s“\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Път към подмодул „%s“: пребазиран към „%s“\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Път към подмодул „%s“: �л�т в „%s“\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Път�т на подмодула „%s“: „%s %s“\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 "�еу�пешно до�тав�не в път� към подмодул „%s“, опит за директно до�тав�не на "
 "„%s“"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23915,88 +23818,88 @@ msgstr ""
 "Подмодулът в път� „%s“ е до�тавен, но не �ъдържа обекта �ъ� �ума\n"
 "„%s“.  Директното до�тав�не на това подаване е неу�пешно."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "път към работното дърво"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "път към работното дърво, през границите на вложените подмодули"
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr ""
 "„rebase“ (пребазиране), „merge“ (�ливане), „checkout“ (изтегл�не) или "
 "„none“ (нищо да не �е прави)"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "извършване на плитко клониране, отр�зано до указани� брой вер�ии"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "брой паралелни проце�и"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "дали първоначалното клониране да е плитко, както �е препоръчва"
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "без извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "неправилен параметър към опци�та „--update“"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr ""
 "без извеждане на информаци� при обнов�ване чрез пребазиране или �ливане"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "принудително изтегл�не на обновлени�та"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "без до�тав�не на новите обекти от отдалеченото хранилище"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr ""
 "различен режим на обнов�ване, когато хранилището е чи�то ново изтеглено"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "дълбочина на плиткото до�тав�не"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "�ума по SHA1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "�умата по SHA1, очаквана от обхващащи� модул"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "�умата по SHA1 на подмодула"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "�умата по SHA1 за указател� HEAD на подмодула"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [ОПЦИЯ…] [ПЪТ]"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -24005,95 +23908,91 @@ msgstr ""
 "Клонът на подмодула „%s“ е на�троен да на�лед�ва клона от обхващащи� проект, "
 "но той не е на никой клон"
 
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "не може да �е получи връзка към хранилище за подмодула „%s“"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "проверка дали пи�ането във файла „.gitmodules“ е безопа�но"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "изтриване на на�тройка във файла „.gitmodules“"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config ИМЕ [СТОЙ�ОСТ]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset ИМЕ"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "файлът „.gitmodules“ тр�бва да е в работното дърво"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "без извеждане на информаци� при задаването на адре�а на подмодул"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [�ОВ_ПЪТ]"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "задаване на �тандартни� �лед�щ клон да е „master“"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "задаване на �тандартни� �лед�щ клон"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) ПЪТ"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) КЛО� ПЪТ"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "необходимо е една от опциите „--branch“ и „--default“"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "опциите „--branch“ и „--default“ �а не�ъвме�тими"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "Добав�не на �ъще�твуващото хранилище в „%s“ към индек�а\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "„%s“ �ъще�твува, а не е хранилище на Git"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr ""
 "Открита е локална директори� на Git — „%s“, ко�то �очи към отдалечените "
 "хранилища:\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -24110,87 +24009,87 @@ msgstr ""
 "правилното хранилище или ако не знаете какво означава това, използвайте\n"
 "друго име като аргумент към опци�та „--name“."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "�ктивиране на локалното хранилище за подмодула „%s“ наново.\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Подмодулът „%s“ не може да бъде изтеглен"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "�еу�пешно добав�не на подмодула „%s“"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "�еу�пешно реги�триране на подмодула „%s“"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "„%s“ вече �ъще�твува в индек�а"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "„%s“ вече �ъще�твува в индек�а и не е подмодул"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "клон на хранилище, който да �е добави като подмодул"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "позвол�ване на добав�не и на иначе игнорираните файлове"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "извеждане �амо на �ъобщени�та за грешка"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "заемане на обектите от еталонните хранилища"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr "името на подмодула да е указаното, а не да е �ъщото като път�"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ПЪТ]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Отно�ителен път може да �е ползва �амо от о�новната директори� на работното "
 "дърво"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr ""
 "адре� на хранилище: „%s“ тр�бва или да е аб�олютен, или да започва � „./“ "
 "или „../“"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "„%s“ е неправилно име за подмодул"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "„%s“ не поддържа опци�та „--super-prefix“"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -24288,11 +24187,11 @@ msgstr ""
 "Редовете, които започват � „%c“, �ъщо ще бъдат включени — може да ги "
 "изтриете вие.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "етикетът не може да бъде подпи�ан"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24306,15 +24205,15 @@ msgstr ""
 "\n"
 "    git tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "неправилен вид обект."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "лип�ва �ъобщение за етикета"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Съобщението за етикета е запазено във файла „%s“\n"
@@ -24395,45 +24294,22 @@ msgstr "извеждане �амо на не�летите етикети"
 msgid "print only tags of the object"
 msgstr "извеждане �амо на етикетите на ОБЕКТ�"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "опциите „--column“ и „-n“ �а не�ъвме�тими"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "опци�та „-n“ изи�ква режим на �пи�ък."
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "опци�та „--contains“ изи�ква режим на �пи�ък."
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "опци�та „--no-contains“ изи�ква  режим на �пи�ък."
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "опци�та „--points-at“ изи�ква режим на �пи�ък."
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "опциите „--merged“ и „--no-merged“ изи�кват режим на �пи�ък."
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "опциите „-F“ и „-m“ �а не�ъвме�тими."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "опци�та „%s“ изи�ква режим на �пи�ък"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече �ъще�твува"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -24885,136 +24761,124 @@ msgstr "директори�та „%s“ не може да бъде �ъзда
 msgid "initializing"
 msgstr "инициализаци�"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Приготв�не на работното дърво (нов клон „%s“)"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Приготв�не на работното дърво (занул�ване на клона „%s“, който �очеше към "
 "„%s“)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Приготв�не на работното дърво (изтегл�не на „%s“)"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Подготв�не на работно дърво (указател�т „HEAD“ не �вързан: %s)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "Изтегл�не КЛО�а, дори и да е изтеглен в друго работно дърво"
 
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "�ъздаване на нов клон"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "�ъздаване или занул�ване на клони"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "подготв�не на новото работно дърво"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "новото работно дърво да о�тане заключено"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "причина за заключване"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "задаване на режима на �ледене (виж git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "опит за напа�ване на името на нови� клон � това на �лед�щ клон"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "опци�та „--reason“ изи�ква „--lock“"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "добавена � „--lock“"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "„--[no-]track“ може да �е използва �амо при �ъздаването на нов клон"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "извеждане на подробни анотации и об��нени�, ако такива �а налични"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "добав�не на анотаци� за ока�тр�не на работните копи� по-�тари от това ВРЕМЕ"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "опциите „--verbose“ и „--porcelain“ �а не�ъвме�тими"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "„%s“ не е работно дърво"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "О�новното дърво не може да �е отключи или заключи"
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s“ вече е заключено, защото „%s“"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s“ вече е заключено"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s“ не е заключено"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "не може да ме�тите или изтривате работни дървета, в които има подмодули"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "принудително преме�тване, дори работното дърво да не е чи�то или да е "
 "заключено"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "„%s“ е о�новно работно дърво"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "името на целта не може да �е определи от „%s“"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -25023,7 +24887,7 @@ msgstr ""
 "не може да преме�тите заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го преме�тете принудително � „move -f -f“"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -25031,41 +24895,41 @@ msgstr ""
 "не може да преме�тите заключено работно дърво:\n"
 "или го отключете, или го преме�тете принудително � „move -f -f“"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 "проверките �а неу�пешни, работното дърво не може да бъде преме�тено: %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "„%s“ не може да �е преме�ти в „%s“"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "неу�пешно изпълнение на „git status“ върху „%s“"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "„%s“ �ъдържа променени или нови файлове, за принудително изтриване е "
 "необходима опци�та „--force“"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 "командата „git status“ не може да �е изпълни за „%s“, код за грешка: %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "принудително изтриване, дори работното дърво да не е чи�то или да е заключено"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -25074,7 +24938,7 @@ msgstr ""
 "не може да изтриете заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го изтрийте принудително � „remove -f -f“"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -25082,17 +24946,17 @@ msgstr ""
 "не може да изтриете заключено работно дърво:\n"
 "или го отключете, или го изтрийте принудително � „remove -f -f“"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "проверките �а неу�пешни, работното дърво не може да бъде изтрито: %s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "поправ�не: %s: „%s“"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "грешка: %s: „%s“"
@@ -25145,21 +25009,16 @@ msgstr ""
 "н�кое определено ПО�ЯТИЕ използвайте „git help ПО�ЯТИЕ“.  За преглед на\n"
 "�и�темата за помощ използвайте „git help git“."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "опци�та „--git-dir“ изи�ква директори�\n"
+msgid "no directory given for '%s' option\n"
+msgstr "опци�та „%s“ изи�ква директори�\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "опци�та „--namespace“ изи�ква име\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "опци�та „--work-tree“ изи�ква директори�\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -25175,11 +25034,6 @@ msgstr "опци�та „-c“ изи�ква низ за на�тройка\n"
 msgid "no config key given for --config-env\n"
 msgstr "опци�та „--config-env“ изи�ква ключ\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "опци�та „-C“ изи�ква директори�\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -25209,29 +25063,29 @@ msgstr "празен п�евдоним за „%s“"
 msgid "recursive alias: %s"
 msgstr "зациклен п�евдоним: „%s“"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "грешка при запи� на �тандартни� изход"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "неизве�тна грешка при запи� на �тандартни� изход"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "грешка при затвар�не на �тандартни� изход"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "зацикл�не в п�евдонимите: заме�твани�та на „%s“ не приключват:%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "„%s“ не може да �е обработи като вградена команда"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -25240,35 +25094,27 @@ msgstr ""
 "употреба: %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "неу�пешно заме�тване на п�евдонима „%s“ — резултатът „%s“ не е команда на "
 "git\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "командата „%s“ не може да �е изпълни: %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "опци�та „--packfile“ изи�ква валидна контролна �ума (а не „%s“)"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "не е хранилище на Git"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "опци�та „--packfile“ изи�ква опци� „--index-pack-args“"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "опци�та „--index-pack-args“ изи�ква опци� „--packfile“"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "неподдържани опции"
@@ -25560,6 +25406,177 @@ msgstr "remote-curl: опит за до�тав�не без локално хр
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: непозната команда „%s“ от git"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "необходима е работна директори�"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "началната зачи�лена директори� не може да бъде открита"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "не може да �е премине към „%s“"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "на�тройката „%s=%s“ не може да �е зададе"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "„log.excludeDecoration“ не може да �е на�трои"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Зачи�л�ването на директории чрез „scalar“ изи�ква работно дърво"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "отдалечени�т указател „HEAD“ не �очи към клон: „%.*s“"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"името на �тандартни� клон на отдалеченото хранилище не може да �е получи, "
+"затова ще �е ползва локално на�троеното име на �тандартни� клон"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "неу�пешно получаване на името на �тандартни� клон"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "хранилището не може да бъде отчи�лено"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "зачи�лената директори� не може да бъде изтрита"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "към кой клон да �е премине �лед клониране"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "при клониране да �е �ъздава пълна работна директори�"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "да �е �вал�т метаданните �амо за изтегл�ни� клон"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "името на работното дърво не може да �е извлече от „%s“"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "директори�та „%s“ вече �ъще�твува"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "о�новни�т клон на „%s“ не може да бъде получен"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "отдалеченото хранилище в „%s“ не може да �е на�трои"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "„%s“ не може да �е на�трои"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "неу�пешно �ъздаване на непълно хранилище, ще �е опита пълно хранилище"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "не може да �е на�трои пълно клониране"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "„scalar list“ не приема аргументи"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [З�ЧИСЛЕ��_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "прена�тройване на в�ички зачи�лени директории"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | З�ЧИСЛЕ��_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "опци�та „--all“ и указването на зачи�лена директори� не �а �ъвме�тими"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "вече н�ма хранилище на git в „%s“"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run З�Д�Ч� [З�ЧИСЛЕ��_ДИРЕКТОРИЯ]\n"
+"Задачи:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "н�ма задача � име „%s“"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [З�ЧИСЛЕ��_ДИРЕКТОРИЯ]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete З�ЧИСЛЕ��_ДИРЕКТОРИЯ"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "текущата работна директори� н�ма да бъде изтрита"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "включване и на вер�и�та на git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "включване и на опциите за компилиране на git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar КОМ��Д� [ОПЦИЯ…]<\n"
+"\n"
+"Команди:\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "лип�ва информаци� за компилатора\n"
@@ -25584,38 +25601,38 @@ msgstr "период на валидно�т/запазване"
 msgid "no-op (backward compatibility)"
 msgstr "нулева операци� (за �ъвме�тимо�т � предишни вер�ии)"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "повече подробно�ти"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "по-малко подробно�ти"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "да �е показват такъв БРОЙ цифри от имената на обектите"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "кои празни знаци и #коментари да �е махат от �ъобщени�та"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "изчитане на пътищата от Ф�ЙЛ"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 "при ползването на „--pathspec-from-file“, пътищата �а разделени � нулеви� "
 "знак „NUL“"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "КЛЮЧ"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "име на полето, по което да е подредбата"
 
@@ -25689,18 +25706,18 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "Извеждане на каноничните име и адре� на е-поща на контактите"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Проверка дали името на указател� е по правилата"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr ""
 "Преминаване към друг клон или въз�танов�ване на файловете в работното дърво"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Копиране на файлове от индек�а към работното дърво"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Проверка дали името на указател� е по правилата"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr ""
@@ -25906,413 +25923,413 @@ msgstr ""
 "Добав�не или обработка на �труктурирана информаци� в �ъобщени�та при подаване"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Разглеждане на хранилище на Git"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Извеждане на журнала � подавани�та"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "Извеждане на информаци� за файловете в индек�а и работното дърво"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Извеждане на указателите в отдалечено хранилище"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Извеждане на �ъдържанието на обект-дърво"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Изваждане на кръпка и автор�твото от е-пи�мо"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Про�та програма за раздел�не на файлове във формат UNIX mbox"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "Сливане на две или повече поредици/и�тории от промени"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Откриване на най-подход�щите общи предше�твеници за �ливане"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Изпълнение на тройно �ливане"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Сливане на файловете, които �е нужда�т от това"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Стандартната помощна програма за „git-merge-index“"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Извеждане на тройно �ливане без пром�на на индек�а"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Изпълнение на програмите за коригиране на конфликтите при �ливане"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Извеждане на тройно �ливане без пром�на на индек�а"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Запи� и проверка на индек�ите за множе�тво пакети"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "Създаване на обект-етикет � допълнителни проверки"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Създаване на обект-дърво от тек�т във формат „ls-tree“"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Запи� и проверка на индек�ите за множе�тво пакети"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Преме�тване или преименуване на файл, директори� или �имволна връзка"
 
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Откриване на имената дадени на вер�и�"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Добав�не или преглед на бележки към обект"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Вна��не и подаване към хранилища на Perforce"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Създаване на пакетиран архив от обекти"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "�амиране на повтар�щи �е пакетни файлове"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Пакетиране на върховете и етикетите за бърз до�тъп до хранилище"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Генериране на уникален идентификатор на кръпка"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ока�тр�не на в�ички недо�тижими обекти в базата от данни за обектите"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Изтриване на допълнителните обекти, които вече �а в пакетни файлове"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "До�тав�не и вна��не на промените от друго хранилище или клон"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "Обнов�ване на отдалечените указатели и �вързаните � т�х обекти"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Прилагане на поредица от кръпки от quilt към текущи� клон"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Сравн�ване на два диапазона от подавани� (напр. две вер�ии на клон)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Изчитане на информаци� за обект-дърво в индек�а"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Прилагане на подавани�та върху друг връх"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Получаване на изтла�каното в хранилището"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Управление на информаци�та в журнала на указателите"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Управление на набор от �ледени хранилища"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "Пакетиране на непакетираните обекти в хранилище"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Създаване, извеждане, изтриване на указатели за зам�на на обекти"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "Обобщение на пред�то�щите промени"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Преизползване на вече запазено коригиране на конфликт при �ливане"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "Привеждане на указател� „HEAD“ към зададеното �ъ�то�ние"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Въз�танов�ване на файловете в работното дърво"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Отмен�не на �ъще�твуващи подавани�"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Извеждане на подавани�та в обратна хронологиче�ка подредба"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Избор и пром�на на параметри"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Отмен�не на �ъще�твуващи подавани�"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Изтриване на файлове от работното дърво и индек�а"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Изпращане на поредица от кръпки по е-поща"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Изтла�кване на обекти по протокола на Git към друго хранилище"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "�а�тройки на Git за интернационализаци� на �криптовете на обвивката"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "�а�тройки на Git за �криптовете на обвивката"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Ограничена входна обвивка за до�тъп през SSH �амо до Git"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Обобщен изход от „git log“"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Извеждане на различните видове обекти в Git"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Извеждане на клоните и подавани�та в т�х"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Извеждане на индек�а на пакетирани� архив"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Извеждане на указателите в локално хранилище"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "�а�тройки на Git за интернационализаци� на �криптовете на обвивката"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "�а�тройки на Git за �криптовете на обвивката"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Инициализиране и пром�на на ча�тичното изтегл�не"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Добав�не на �ъдържанието на файла към индек�а"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Скатаване на неподадените промени в работното дърво"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Добав�не на �ъдържанието на файла към индек�а"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Извеждане на �ъ�то�нието на работното дърво"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Премахване на излишните знаци за интервали"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Инициализиране, обнов�ване или разглеждане на подмодули"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Двупо�очна работа между хранилища под Subversion и Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Преминаване към друг клон"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "Извеждане, пром�на и изтриване на �имволни указатели"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Извеждане, �ъздаване, изтриване, проверка на етикети подпи�ани � GPG"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Създаване на временен файл �ъ� �ъщото �ъдържание като обектът-BLOB"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Разпакетиране на обекти от пакетиран архив"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Реги�триране на �ъдържанието на файловете от работното дърво в индек�а"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "Безопа�но обнов�ване на името на обект в указател"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Обнов�ване на файла � допълнителна информаци� в помощ на опро�тените �ървъри"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Изпращане на архива обратно към „git-archive“"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Извеждане на логиче�ка променлива на Git"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "Проверка на подпи�ите GPG върху подавани�та"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Проверка на пакетираните архивни файлове на Git"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Проверка на подпи�ите GPG върху етикетите"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Уеб интерфей� на Git"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Извеждане на журнал � разликите, въведени � в��ко подаване"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Управление на множе�тво работни дървета"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Създаване на обект-дърво от текущи� индек�"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Указване на атрибути към път"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Команден ред и конвенции на Git"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Въвеждащ урок в Git за разработчици"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Въвеждане на имена и пароли към Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git за потребители на CVS"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "�а�тройване на изгледа на разликите"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Полезен минимален набор от команди за ежедневната работа � Git"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Че�то задавани въпро�и за употребата на Git"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Речник � термините на Git"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Куки на Git"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указване на не�ледени файлове, които да бъдат нарочно пренебрегвани"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Разглеждане на хранилище на Git"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Съответ�тви� на имена на автор/подаващ и/или адре�и на е-поща"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Дефиниране на �вой�твата на подмодулите"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Про�тран�тва от имена на Git"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Помощни програми за работа � отдалечените хранилища"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "У�трой�тво на хранилището на Git"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указване на вер�ии и диапазони в Git"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Монтиране на едно хранилище в друго"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Въвеждащ урок за Git"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Въвеждащ урок за Git: втора ча�т"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Въвеждащ урок за Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Уеб интерфей� на Git"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -26386,45 +26403,45 @@ msgstr ""
 msgid "usage: $dashless $USAGE"
 msgstr "Употреба: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "�е може да �е премине към „$cdup“ — о�новната директори� на работното дърво."
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 "Ф�Т�Л�� ГРЕШК�: „$program_name“ не може да �е ползва без работно дърво."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "�е може да презапишете клоните, защото има промени, които не �а в индек�а."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 "�е може да изпълните „$action“, защото има промени, които не �а в индек�а."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 "�е може да изпълните „$action“, защото в индек�а има неподадени промени."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "О�вен това в индек�а има неподадени промени."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Тази команда тр�бва да �е изпълни от о�новната директори� на работното дърво"
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "�б�олютни�т път на работното дърво не може да �е определи"
 
@@ -26513,7 +26530,7 @@ msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 "файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26527,7 +26544,7 @@ msgstr ""
 "a — добав�не на това и в�ички �ледващи парчета от файла в индек�а\n"
 "d — без добав�не на това и в�ички �ледващи парчета от файла в индек�а"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26541,7 +26558,7 @@ msgstr ""
 "a — �катаване на това и в�ички �ледващи парчета от файла\n"
 "d — без �катаване на това и в�ички �ледващи парчета от файла"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26555,7 +26572,7 @@ msgstr ""
 "a — изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
 "d — без изваждане на това и в�ички �ледващи парчета от файла от индек�а"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26569,7 +26586,7 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла към индек�а"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26586,7 +26603,7 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от работното "
 "дърво"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26603,7 +26620,7 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26620,7 +26637,7 @@ msgstr ""
 "d — без прилагане на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26634,7 +26651,7 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26656,92 +26673,92 @@ msgstr ""
 "e — ръчно редактиране на текущото парче\n"
 "? — извеждане не помощта\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Избраните парчета не може да �е добав�т в индек�а!\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "пренебрегване на не�л�тото: „%s“\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Прилагане на пром�ната в правата за до�тъп към работното дърво [y,n,q,a,d"
 "%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на добав�нето към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "��ма други парчета\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "�еправилен номер: „%s“\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Има �амо %d парче.\n"
 msgstr[1] "Има �амо %d парчета.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "��ма други парчета за тър�ене\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Сгрешен регул�рен израз „%s“: %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "�икое парче не напа�ва на регул�рни� израз\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "��ма друго парче преди това\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "��ма друго парче �лед това\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Това парче не може да бъде разделено\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Раздел�не на %d парче.\n"
 msgstr[1] "Раздел�не на %d парчета.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Това парче не може да бъде редактирано\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26762,59 +26779,59 @@ msgstr ""
 "                и индек�а\n"
 "add untracked — добав�не на не�ледените файлове към промените в индек�а\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "„--“ лип�ва"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизве�тна �тратеги� за прилагане на кръпка към „--patch“: „%s“"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "указан е неправилен аргумент „%s“, а �е очаква „--“."
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "разликата между ме�тни� ча�ови по�� и GMT �ъдържа дробна ча�т от минута\n"
 "\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "разликата между ме�тни� ча�ови� по�� и GMT е 24 ча�а или повече\n"
 
-#: git-send-email.perl:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ не завърши у�пешно, а � код %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 "тек�тови�т редактор приключи работата � грешка, в�ичко �е преу�танов�ва"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "„%s“ �ъдържа временна вер�и� на подготв�ното е-пи�мо.\n"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final“ �ъдържа подготвеното е-пи�мо.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "опци�та „--dump-aliases“ е не�ъвме�тима � другите опции\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26825,11 +26842,11 @@ msgstr ""
 "забележете знака „e“.  За да изключите тази проверка, задайте\n"
 "на�тройката „sendemail.forbidSendmailVariables“ да е „false“ (лъжа̀).\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Командата „git format-patch“ не може да �е изпълни извън хранилище\n"
 
-#: git-send-email.perl:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26837,40 +26854,40 @@ msgstr ""
 "„batch-size“ и „relogin“ тр�бва да �е указват заедно (или чрез командни� "
 "ред, или чрез на�тройките)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�епознато поле за опци�та „--suppress-cc“: „%s“\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�епозната �тойно�т за „--confirm“: %s\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: п�евдоними за sendmail �ъдържащи кавички („\"“) не �е "
 "поддържат: %s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: „:include:“ не �е поддържа: %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: прена�очвани� „/file“ или „|pipe“ не �е поддържат: %s\n"
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: редът за „sendmail“ не е разпознат: %s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26885,12 +26902,12 @@ msgstr ""
 "    � укажете „./%s“ за файл;\n"
 "    � използвате опци�та „--format-patch“ за диапазон.\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Директори�та „%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26900,17 +26917,17 @@ msgstr ""
 "�е �а указани кръпки!\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "В „%s“ лип�ва тема"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "„%s“ не може да �е отвори за запи�: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26925,27 +26942,27 @@ msgstr ""
 "\n"
 "Изтрийте в�ичко, ако не и�кате да изпратите обобщаващо пи�мо.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "„%s.final“ не може да �е отвори: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Обобщаващото пи�мо е празно и �е пре�кача\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Сигурни ли �те, че и�кате да ползвате „%s“ [y/N]? "
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26953,11 +26970,11 @@ msgstr ""
 "Следните файлове �а 8 битови, но не �а � об�вена заглавна ча�т „Content-"
 "Transfer-Encoding“.\n"
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Кое 8 битово кодиране �е ползва [�тандартно: UTF-8]? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26970,22 +26987,22 @@ msgstr ""
 "в�е още е � шаблонното заглавие „*** SUBJECT HERE ***“.  Ползвайте опци�та\n"
 "„--force“, ако �те �игурни, че точно това и�кате да изпратите.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "�а кой да �е прат�т е-пи�мата (незадължително поле)"
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ е п�евдоним на �ебе �и\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ГРЕШК�: не може да �е извлече адре� от „%s“\n"
@@ -26993,18 +27010,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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Какво да �е направи � този адре�? „q“ (�пиране), „d“ (изтриване), "
 "„e“ (редактиране): "
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Път�т към �ертификат „%s“ не �ъще�твува."
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -27032,116 +27049,116 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Изпращане на е-пи�мото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
 "„a“ (в�ичко): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Изи�кване на отговор към това е-пи�мо"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Сървърът за SMTP не е на�троен правилно."
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сървърът не поддържа „STARTTLS“! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "�еу�пешно изпълнение на STARTTLS! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Под�и�темата за SMTP не може да �е инициализира.  Проверете на�тройките и "
 "използвайте опци�та: „--smtp-debug“."
 
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "„%s“ не може да бъде изпратен\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Проба за изпращане на „%s“\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Изпращане на „%s“\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "У�пех при пробата.  От журнала:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "У�пех.  От журнала:\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Резултат: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Резултат: у�пех\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „до: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(не-mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(т�ло) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е може да бъде �е изпълни „%s“"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добав�не на „%s: %s“ от: „%s“\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) програмни�т канал не може да �е затвори за изпълнението на „%s“"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "�ъобщението не може да �е изпрати чрез 7 битови знаци"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "неправилно кодиране за прено�"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -27152,12 +27169,12 @@ msgstr ""
 "%s\n"
 "ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "„%s“ не може да �е отвори: %s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -27166,13 +27183,13 @@ msgstr ""
 "Ф�Т�Л�� ГРЕШК�: %s: %d е повече от 998 знака\n"
 "ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, 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:2094
+#: git-send-email.perl:2130
 #, 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 556b028cd8..afcffad474 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
 # Catalan translations for Git.
 # This file is distributed under the same license as the Git package.
 # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016.
-# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2021
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2022
 #
 # Terminologia i criteris utilitzats
 #
@@ -9,14 +9,16 @@
 #   -----------------+---------------------------------
 #   ahead            |  davant per
 #   amend            |  esmenar
-#   bundle           |  farcell
 #   broken           |  malmès
+#   bundle           |  farcell
 #   chunk            |  fragment
+#   cover letter     |  carta de presentació
 #   delta            |  diferència
 #   deprecated       |  en desús
 #   detached         |  separat
 #   dry-run          |  fer una prova
 #   fatal            |  fatal
+#   fetch            |  obtenir
 #   flush            |  buidar / buidatge
 #   hint             |  consell
 #   hook             |  lligam
@@ -27,8 +29,9 @@
 #   setting          |  paràmetre
 #   shallow          |  superficial
 #   skip             |  ometre
+#   sparse           |  dispers
 #   squelch          |  silenciar
-#   sparse-index     |  índex dispers
+#   supported        |  admetre
 #   token            |  testimoni
 #   unset            |  desassignar
 #   upstream         |  font
@@ -44,7 +47,7 @@
 #   Anglès           |  Català
 #   -----------------+---------------------------------
 #   blame            |  «blame»
-#   HEAD             |  HEAD (f, la branca) - (no s'apostrofa)
+#   HEAD             |  HEAD (f, la branca actual) - (no s'apostrofa)
 #   cherry pick      |  «cherry pick»
 #   promisor         |  «promisor»
 #   rebase           |  «rebase»
@@ -57,8 +60,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-10-30 09:36+0800\n"
-"PO-Revision-Date: 2021-05-14 10:22-0600\n"
+"POT-Creation-Date: 2022-01-17 08:31+0800\n"
+"PO-Revision-Date: 2022-01-23 19:00-0600\n"
 "Last-Translator: Jordi Mas i Hernàndez <jmas@softcatala.org>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -73,8 +76,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "Perdó (%s)?"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510
-#: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "no s'ha pogut llegir l'índex"
@@ -103,7 +106,7 @@ msgstr "Actualitza"
 msgid "could not stage '%s'"
 msgstr "no s'ha pogut fer «stage» «%s»"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "no s'ha pogut escriure l'índex"
 
@@ -119,8 +122,8 @@ msgstr[1] "actualitzats %d camins\n"
 msgid "note: %s is untracked now.\n"
 msgstr "nota: %s està ara sense seguiment.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry ha fallat per al camí «%s»"
@@ -161,21 +164,21 @@ msgstr[1] "afegits %d camins\n"
 msgid "ignoring unmerged: %s"
 msgstr "s'està ignorant allò no fusionat: %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Només s'han canviat els fitxers binaris.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Sense canvis.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Actualització del pedaç"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Reviseu les diferències"
 
@@ -243,11 +246,11 @@ msgstr "seleccioneu un ítem numerat"
 msgid "(empty) select nothing"
 msgstr "(buit) no seleccionis res"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Ordres ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "I ara què"
 
@@ -259,13 +262,13 @@ msgstr "staged"
 msgid "unstaged"
 msgstr "unstaged"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "camí"
@@ -274,27 +277,27 @@ msgstr "camí"
 msgid "could not refresh index"
 msgstr "no s'ha pogut actualitzar l'índex"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Adeu.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? "
@@ -321,22 +324,22 @@ msgstr ""
 "a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n"
 "d - no facis «stage» d'aquest tros ni de cap altre restant del fitxer\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? "
@@ -363,22 +366,22 @@ msgstr ""
 "a - fes «stash» d'aquest tros i de tota la resta de trossos del fitxer\n"
 "d - no facis «stash» d'aquest tros ni de cap altre restant del fitxer\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? "
@@ -405,22 +408,22 @@ msgstr ""
 "a - fes «unstage» d'aquest tros i de tota la resta de trossos del fitxer\n"
 "d - no facis «unstage» d'aquest tros ni de cap altre restant del fitxer\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica la supressió a l'índex [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'addició a l'índex [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? "
@@ -430,7 +433,7 @@ msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be marked for"
 " applying."
 msgstr ""
-"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per "
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
 "aplicar-lo."
 
 #: add-patch.c:111
@@ -447,26 +450,26 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Descarta aquest tros de l'arbre de treball [y,n,q,a,d%s,?]? "
@@ -493,26 +496,26 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta el canvi de mode de l'índex i de l'arbre de treball "
 "[y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Descarta l'addició de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -532,24 +535,24 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplica el canvi de mode a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'addició a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
@@ -664,7 +667,7 @@ msgid ""
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
 "aborted and the hunk is left unchanged.\n"
 msgstr ""
-"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
+"Si no s'aplica correctament, tindreu una oportunitat per a editar-lo\n"
 "de nou. Si s'eliminen totes les línies del tros, llavors l'edició s'avorta\n"
 "i el tros es deixa sense cap canvi.\n"
 
@@ -687,7 +690,7 @@ msgstr "«git apply --cached» ha fallat"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
 " "
@@ -699,11 +702,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Els trossos seleccionats no s'apliquen a l'índex!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "No s'ha aplicat res.\n"
 
@@ -741,11 +744,11 @@ msgstr "No hi ha tros següent"
 msgid "No other hunks to goto"
 msgstr "No hi ha altres trossos on anar-hi"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "ves a quin tros (<ret> per a veure'n més)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "ves a quin tros? "
 
@@ -765,7 +768,7 @@ msgstr[1] "Només %d trossos disponibles."
 msgid "No other hunks to search"
 msgstr "No hi ha cap altre tros a cercar"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "cerca per expressió regular? "
 
@@ -847,7 +850,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
 
@@ -864,26 +867,25 @@ msgid "Not possible to fast-forward, aborting."
 msgstr "No és possible avançar ràpidament, s'està avortant."
 
 #: advice.c:227
-#, c-format, fuzzy
+#, c-format
 msgid ""
 "The following paths and/or pathspecs matched paths that exist\n"
 "outside of your sparse-checkout definition, so will not be\n"
 "updated in the index:\n"
 msgstr ""
-"Els camins següents i/o les especificacions de camí coincideixen amb els camins que existeixen\n"
-"fora de la vostra definició de restricció de proves, no serà\n"
-"actualitzat en l'índex:"
+"Els camins següents i/o les especificacions de camins coincideixen\n"
+"amb camins que existeixen fora de la vostra definició de\n"
+"«sparse-checkout», així que no serà actualitzaran en l'índex:\n"
 
 #: advice.c:234
-#, fuzzy
 msgid ""
 "If you intend to update such entries, try one of the following:\n"
 "* Use the --sparse option.\n"
 "* Disable or modify the sparsity rules."
 msgstr ""
-"Si té intenció d'actualitzar aquestes entrades, intenti una de les següents:\n"
+"Si voleu actualitzar aquestes entrades, proveu les següents solucions:\n"
 "* Utilitzeu l'opció --sparse.\n"
-"* Inhabilita o modifica les regles d'escassetat."
+"* Inhabiliteu o modifiqueu les regles de dispersió."
 
 #: advice.c:242
 #, c-format
@@ -942,21 +944,33 @@ msgstr "opció d'espai en blanc «%s» no reconeguda"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject i --3way no es poden usar junts."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way fora d'un repositori"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index fora d'un repositori"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached fora d'un repositori"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "les opcions «%s» i «%s» no es poden usar juntes"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "«%s» fora d'un repositori"
 
 #: apply.c:800
 #, c-format
@@ -1175,8 +1189,8 @@ msgstr "el pedaç ha fallat: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "s'ha produït un error en llegir %s"
@@ -1186,247 +1200,247 @@ msgstr "s'ha produït un error en llegir %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'índex"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 "al repositori li manca el blob necessari per a fer a una fusió de 3 vies."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "S'està fent una fusió de 3 vies...\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no es poden llegir els continguts actuals de «%s»"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "S'ha produït un error en fer una fusió de tres vies...\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "S'està usant alternativament l'aplicació directa...\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camí no vàlid: «%s»"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3998
+#: apply.c:4000
 #, 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:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, 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:4141
+#: apply.c:4143
 #, 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 la HEAD actual"
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'índex temporal"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'índex temporal a %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "no s'ha pogut crear un magatzem de suport per al fitxer novament creat %s"
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, 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:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242
-#: builtin/gc.c:2277
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "no s'ha pogut escriure a «%s»"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'està tancant el fitxer «%s»"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omès el pedaç «%s»."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "entrada no reconeguda"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "No hi ha pedaços vàlids a l'entrada (permeteu-los amb «--allow-empty»)"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaç «%s»: %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, 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:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, 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:4973
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1435,142 +1449,140 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "No s'ha pogut escriure un fitxer d'índex nou"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camí donat"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
-msgstr "número"
+msgstr "nombre"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "elimina <nombre> barres obliqües inicials dels camins de diferència "
 "tradicionals"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:5028
+#: apply.c:5032
 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:5032
+#: apply.c:5036
 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:5034
+#: apply.c:5038
 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:5036
+#: apply.c:5040
 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:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca els fitxers nous amb «git add --intent-to-add»"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construeix un índex temporal basat en la informació d'índex incrustada"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el caràcter NUL"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> línies de context coincideixin"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "acció"
 
-#: apply.c:5058
+#: apply.c:5062
 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:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
-msgstr "permet trossos encavalcants"
+msgstr "permet trossos superposats"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "sigues detallat"
-
-#: apply.c:5076
+#: apply.c:5080
 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:5079
+#: apply.c:5083
 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:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "no retornis l'error per als pedaços buits"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1581,16 +1593,16 @@ msgstr "no es pot transmetre el blob %s"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "no s'ha pogut iniciar el filtre «%s»"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "no s'ha pogut redirigir el descriptor"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "«%s» error reportat pel filtre"
@@ -1635,19 +1647,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repositori> [--exec <ordre>] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
+msgid "cannot read '%s'"
 msgstr "no es pot llegir «%s»"
 
-#: archive.c:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112
-#: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir «%s»"
-
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
@@ -1689,7 +1695,7 @@ msgstr "format"
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "prefix"
 
@@ -1699,9 +1705,9 @@ msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "fitxer"
@@ -1731,7 +1737,7 @@ msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "repositori"
 
@@ -1739,7 +1745,7 @@ msgstr "repositori"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "recupera l'arxiu del repositori remot <repositori>"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "ordre"
@@ -1752,18 +1758,20 @@ msgstr "camí a l'ordre git-upload-archive remota"
 msgid "Unexpected option --remote"
 msgstr "Opció inesperada --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "L'opció --exec només es pot usar juntament amb --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "l'opció «%s» requereix «%s»"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opció inesperada --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Les opcions --add-file i --remote no es poden usar juntes"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1871,7 +1879,7 @@ msgstr "es necessita una revisió %s"
 msgid "could not create file '%s'"
 msgstr "no s'ha pogut crear el fitxer «%s»"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer «%s»"
@@ -1924,21 +1932,21 @@ msgstr ""
 "--reverse i --first-parent junts requereixen una última comissió "
 "especificada"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
-msgstr "la configuració del passeig per revisions ha fallat"
+msgstr "la configuració del recorregut de revisions ha fallat"
 
 #: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
-"--reverse --first-parent junts requereixen un rang de la cadena de mares "
-"primeres"
+"--reverse --first-parent junts requereixen un rang de la cadena de pares "
+"primers"
 
 #: blame.c:2849
 #, c-format
@@ -1950,112 +1958,99 @@ msgstr "no hi ha tal camí %s en %s"
 msgid "cannot read blob %s for path %s"
 msgstr "no es pot llegir el blob %s per al camí %s"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"Després de corregir la causa de l'error, podeu\n"
-"intentar corregir la informació de seguiment remot\n"
-"invocant «git branch --set-upstream-to=%s%s%s»."
+"no es pot heretar la configuració del seguiment de la font de múltiples "
+"referències quan es demana fer «rebase»"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "No s'està establint la branca %s com a la seva pròpia font."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "no s'està establert la branca «%s» com a la seva pròpia font"
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "branch '%s' set up to track '%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 «%s» fent "
+"«rebase»."
 
-#: branch.c:94
+#: branch.c:145
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgid "branch '%s' set up to track '%s'."
 msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
+"la branca «%s» està configurada per a seguir «%s»."
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca local «%s» fent "
-"«rebase»."
+msgid "branch '%s' set up to track:"
+msgstr "la branca «%s» està configurada per a seguir:"
 
-#: 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»."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "no es pot escriure la configuració de la branca font"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
-"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
-"«rebase»."
+"\n"
+"Després de corregir la causa de l'error, podeu intentar\n"
+"corregir la informació de seguiment remot executant:"
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
-"La branca «%s» està configurada per a seguir la referència remota «%s»."
+"s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap"
+" remot"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
-"La branca «%s» està configurada per a seguir la referència local «%s» fent "
-"«rebase»."
+"s'ha demanat que hereti el seguiment de «%s», però no s'ha establert cap"
+" configuració de fusionat"
 
-#: branch.c:110
+#: branch.c:252
 #, 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»."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "No es pot escriure la configuració de la branca font"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "no s'està seguint: informació ambigua per a la referència %s"
 
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "No seguint: informació ambigua per a la referència %s"
+msgid "'%s' is not a valid branch name"
+msgstr "«%s» no és un nom de branca vàlid"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "«%s» no és un nom de branca vàlid."
+msgid "a branch named '%s' already exists"
+msgstr "ja existeix una branca amb nom «%s»"
 
-#: branch.c:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Una branca amb nom «%s» ja existeix."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "no es pot forçar l'actualització de la branca «%s», agafada a «%s»"
 
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "No es pot actualitzar la branca actual a la força."
-
-#: branch.c:233
+#: branch.c:336
 #, c-format
 msgid ""
-"Cannot setup tracking information; starting point '%s' is not a branch."
+"cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
-"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
-"una branca."
+"no es pot configurar la informació de seguiment; el punt inicial «%s» no és "
+"una branca"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la branca font demanada «%s» no existeix"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2076,27 +2071,28 @@ msgstr ""
 "«git push -u» per a establir la configuració font\n"
 "mentre pugeu."
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "No és un nom d'objecte vàlid: «%s»."
+msgid "not a valid object name: '%s'"
+msgstr "no és un nom d'objecte vàlid: «%s»"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objecte ambigu: «%s»."
+msgid "ambiguous object name: '%s'"
+msgstr "nom d'objecte ambigu: «%s»"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "No és un punt de ramificació vàlid: «%s»."
+msgid "not a valid branch point: '%s'"
+msgstr "no és un punt de ramificació vàlid: «%s»"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» ja s'ha agafat a «%s»"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD de l'arbre de treball %s no està actualitzat"
@@ -2104,7 +2100,7 @@ msgstr "HEAD de l'arbre de treball %s no està actualitzat"
 #: bundle.c:44
 #, c-format
 msgid "unrecognized bundle hash algorithm: %s"
-msgstr "Algoritme de hash del farcell desconegut: %s"
+msgstr "algoritme de hash del farcell desconegut: %s"
 
 #: bundle.c:48
 #, c-format
@@ -2121,7 +2117,7 @@ msgstr "«%s» no sembla un fitxer de farcell v2 o v3"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2133,7 +2129,7 @@ msgstr "Al repositori li manquen aquestes comissions prerequerides:"
 
 #: bundle.c:201
 msgid "need a repository to verify a bundle"
-msgstr "cal un repositori per verificar un farcell"
+msgstr "cal un repositori per a verificar un farcell"
 
 #: bundle.c:257
 #, c-format
@@ -2159,11 +2155,11 @@ msgstr "no s'ha pogut duplicar el descriptor del farcell"
 
 #: bundle.c:340
 msgid "Could not spawn pack-objects"
-msgstr "No s'ha pogut generar el pack-objects"
+msgstr "No s'ha pogut engendrar el pack-objects"
 
 #: bundle.c:351
 msgid "pack-objects died"
-msgstr "El pack-objects s'ha mort"
+msgstr "el pack-objects s'ha mort"
 
 #: bundle.c:400
 #, c-format
@@ -2180,7 +2176,7 @@ msgstr "versió del farcell no compatible %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "no es pot escriure la versió %d amb l'algorisme %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument no reconegut: %s"
@@ -2196,7 +2192,7 @@ msgstr "no es pot crear «%s»"
 
 #: bundle.c:588
 msgid "index-pack died"
-msgstr "L'index-pack s'ha mort"
+msgstr "l'index-pack s'ha mort"
 
 #: chunk-format.c:117
 msgid "terminating chunk id appears earlier than expected"
@@ -2206,19 +2202,19 @@ msgstr ""
 #: chunk-format.c:126
 #, c-format
 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
-msgstr "desplaçament incorrecte del fragment %<PRIx64> and %<PRIx64>"
+msgstr "desplaçament incorrecte del fragment %<PRIx64> i %<PRIx64>"
 
 #: chunk-format.c:133
 #, c-format
 msgid "duplicate chunk ID %<PRIx32> found"
-msgstr "S'ha trobat un ID del fragment %<PRIx32> duplicat"
+msgstr "s'ha trobat un ID del fragment %<PRIx32> duplicat"
 
 #: chunk-format.c:147
 #, c-format
 msgid "final chunk has non-zero id %<PRIx32>"
-msgstr "El fragment final té un id %<PRIx32> que no és zero"
+msgstr "el fragment final té un id %<PRIx32> que no és zero"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valor de color no vàlid: %.*s"
@@ -2252,7 +2248,7 @@ msgstr ""
 #, c-format
 msgid "commit-graph file is too small to hold %u chunks"
 msgstr ""
-"el fitxer del graf de comissions és massa petit per guardar %u fragments"
+"el fitxer del graf de comissions és massa petit per a guardar %u fragments"
 
 #: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
@@ -2272,64 +2268,63 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr "no es poden trobar tots els fitxers del graf de comissions"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "posició de la comissió no vàlida. Probablement el graf de comissions està "
 "malmès"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "no s'ha pogut trobar la comissió %s"
 
-#: commit-graph.c:800
-#, fuzzy
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 "el graf de comissions requereix dades de generació de desbordaments però no "
-"en té"
+"en té cap"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "S'estan carregant comissions conegudes al graf de comissions"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "S'estan expandint les comissions abastables al graf de comissions"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "S'estan esborrant les marques de comissions al graf de comissions"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "S'estan calculant els nivells topològics del graf de comissions"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "S'estan calculant els nombres de generació del graf de comissions"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 "S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "S'estan recollint els objectes referenciats"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
@@ -2337,176 +2332,176 @@ msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
 msgstr[1] ""
 "S'estan cercant les comissions pel graf de comissions en %d paquets"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "error en afegir paquet %s"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "s'ha produït un error en obrir l'índex per «%s»"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "S'estan cercant les comissions pel graf de comissions entre els objectes "
 "empaquetats"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "S'estan cercant les vores addicionals al graf de comissions"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 "s'ha produït un error en escriure el nombre correcte d'ids base del graf"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no s'han pogut crear els directoris inicials de «%s»"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "no s'ha pogut crear una capa de graf temporal"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "no s'han pogut ajustar els permisos compartits per a «%s»"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "S'està escrivint el graf de comissions en %d pas"
 msgstr[1] "S'està escrivint el graf de comissions en %d passos"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "S'estan escanejant les comissions fusionades"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "S'està fusionant el graf de comissions"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "s'està intentant escriure un graf de comissions, però «core.commitGraph» "
 "està desactivat"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
-msgstr "massa comissions per escriure un graf"
+msgstr "massa comissions per a escriure un graf"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "el fitxer commit-graph (graf de comissions) té una suma de verificació "
 "incorrecta i probablement és corrupte"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "el gràfic de comissions té una ordre OID incorrecta; %s llavors %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u !="
 " %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
 "s'ha produït un error en analitzar la comissió %s del graf de comissions"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "S'estan verificant les comissions al graf de comissions"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "no s'han pogut analitzar la comissió %s de la base de dades d'objectes per "
 "al graf de comissions"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != "
 "%s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 "la llista de pares del graf de comissions per a la comissió %s és massa "
 "llarga"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "el pare pel graf de comissions %s és %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "la llista pare del graf de comissions per %s acaba aviat"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero "
 "elsewhere"
 msgstr ""
-"El graf de comissions té nombre de generació zero per a la comissió %s, però"
+"el graf de comissions té nombre de generació zero per a la comissió %s, però"
 " té no zero en altres llocs"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero "
 "elsewhere"
 msgstr ""
-"El graf de comissions té un nombre de generació diferent de zero per a "
+"el graf de comissions té un nombre de generació diferent de zero per a "
 "comissió %s però té zero en altres llocs"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 "generació del graf de comissions per a la comissió %s és %<PRIuMAX> < "
 "%<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
-"La data d'enviament per a la comissió %s en el graf de comissions és "
+"la data d'enviament per a la comissió %s en el graf de comissions és "
 "%<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "no s'ha pogut analitzar %s"
@@ -2530,31 +2525,33 @@ msgstr ""
 "La compatibilitat amb <GIT_DIR>/info/grafts és obsoleta\n"
 "i s'eliminarà en una futura versió del Git.\n"
 "\n"
-"Si us plau useu «git replace --convert-graft-file»\n"
-"per convertir els grafs en substitució de referències. Desactiveu aquest missatge executant\n"
+"Useu «git replace --convert-graft-file»\n"
+"per a convertir els grafs en referències de reemplaçament.\n"
+"\n"
+"Desactiveu aquest missatge executant\n"
 "«git config advice.graftFileDeprecated false»"
 
-#: commit.c:1239
+#: commit.c:1241
 #, 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."
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La comissió %s no té signatura GPG."
 
-#: commit.c:1249
+#: commit.c:1251
 #, 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"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2623,7 +2620,7 @@ msgstr "la clau no conté una secció: «%s»"
 msgid "key does not contain variable name: %s"
 msgstr "la clau no conté un nom de variable: «%s»"
 
-#: config.c:470 sequencer.c:2802
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vàlida: %s"
@@ -2781,148 +2778,148 @@ msgstr "core.commentChar només hauria de ser un caràcter"
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creació d'objecte no vàlid: %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "valor no vàlid per a %s"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "ha de ser un dels elements següents: nothing, matching, simple, upstream o "
 "current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivell de compressió de paquet %d erroni"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "la referència «%s» no assenyala a un blob"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "s'ha produït un error en analitzar %s"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "un error desconegut ha ocorregut en llegir els fitxers de configuració"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s no vàlid: «%s»"
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de secció no vàlid «%s»"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s té múltiples valors"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "no es pot escriure un nou fitxer de configuració %s"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no s'ha pogut blocar el fitxer de configuració %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "s'està obrint %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patró no vàlid: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "fitxer de configuració no vàlid %s"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat «fstat» a %s"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "no s'ha pogut fer «mmap» «%s»%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "ha fallat chmod a %s"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no s'ha pogut establir «%s» a «%s»"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860
 #: builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no s'ha pogut desassignar «%s»"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de secció no vàlida: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "falta el valor per «%s»"
@@ -3105,7 +3102,7 @@ msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
 msgid "unable to fork"
 msgstr "no s'ha pogut bifurcar"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "S'està comprovant la connectivitat"
 
@@ -3411,19 +3408,19 @@ msgstr ""
 "No és un repositori Git. Useu --no-index per a comparar dos camins fora del "
 "directori de treball"
 
-#: diff.c:157
+#: diff.c:158
 #, 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"
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paràmetre de dirstat desconegut «%s»\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3431,7 +3428,7 @@ msgstr ""
 "el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
 "«zebra», «dimmed-zebra» o «plain»"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change',"
@@ -3441,7 +3438,7 @@ msgstr ""
 "«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-"
 "indentation-change»"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3449,13 +3446,13 @@ msgstr ""
 "color-moved-ws: allow-indentation-change no es pot combinar amb altres modes"
 " d'espai en blanc"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valor desconegut de la variable de configuració de «diff.submodule»: «%s»"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3464,49 +3461,49 @@ msgstr ""
 "S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "el diff external s'ha mort, s'està aturant a %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "les opcions «%s», «%s», «%s», i «%s» no es poden usar juntes"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S and --find-object són mútuament excloents"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982
+#: builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les opcions «%s», «%s», i «%s» no es poden usar juntes"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"-G i --pickaxe-regex són mútuament excloents, useu --pickaxe-regex amb -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s»"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"--pickaxe-all i --find-object són mútuament excloents, useu --pickaxe-all "
-"amb -G i -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s» i «%s»"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificació de camí"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat no vàlid: %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s espera un valor numèric"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3515,199 +3512,199 @@ msgstr ""
 "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valor desconegut després de ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no s'ha pogut resoldre «%s»"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s espera una forma <n>/<m>"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperava un caràcter, s'ha rebut «%s»"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argument --color-moved incorrecte: %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode «%s» no vàlid en --color-moved-ws"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
 msgstr ""
 "l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument no vàlid a %s"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "expressió regular donada a -I: no vàlida: «%s»"
 
-#: diff.c:5295
+#: diff.c:5246
 #, 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»"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "argument --word-diff incorrecte: %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Opcions del format de sortida del diff"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
-msgstr "generant pedaç"
+msgstr "genera el pedaç"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "omet la sortida de diferències"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "genera diffs amb <n> línies de context"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "genera el diff en format cru"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "sinònim de «-p --raw»"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "sinònim de «-p --stat»"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "llegible per màquina --stat"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "mostra només l'última línia de --stat"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "genera la distribució de la quantitat relativa de canvis per a cada "
 "subdirectori"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinònim de --dirstat=cumulative"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinònim de --dirstat=files,param1,param2..."
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "avisa si els canvis introdueixen marcadors en conflicte o errors d'espai en "
 "blanc"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "resum condensat com ara creacions, canvis de nom i mode"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "mostra només els noms de fitxers canviats"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "mostra només els noms i l'estat dels fitxers canviats"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "genera diffstat"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<amplada>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "genera diffstat amb una amplada donada"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "genera diffstat amb un nom d'amplada donat"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "genera diffstat amb una amplada de graf donada"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<comptador>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "genera diffstat amb línies limitades"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "genera un resum compacte a diffstat"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "diff amb sortida binària que pot ser aplicada"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "mostra els noms complets dels objectes pre i post-imatge a les línies "
 "«index»"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "mostra un diff amb colors"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<kind>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3715,7 +3712,7 @@ msgstr ""
 "ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
 "al diff"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3723,255 +3720,255 @@ msgstr ""
 "no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
 "sortida en --raw o --numstat"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "mostra el prefix d'origen donat en lloc de «a/»"
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "afegir un prefix addicional per a cada línia de sortida"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "no mostris cap prefix d'origen o destí"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "mostra el context entre trossos de diferència fins al nombre especificat de "
 "línies"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 "especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 "especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Opcions de canvi de nom del diff"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "divideix els canvis de reescriptura completa en parells de suprimir i crear"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "detecta els canvis de noms"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "omet les preimatges per les supressions"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "detecta còpies"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
-msgstr "usa els fitxers no modificats com a font per trobar còpies"
+msgstr "usa els fitxers no modificats com a font per a trobar còpies"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "inhabilita la detecció de canvis de nom"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "usa els blobs buits com a font de canvi de nom"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "continua llistant l'històric d'un fitxer més enllà dels canvis de nom"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
-"Evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de"
+"evita la detecció de canvi de nom/còpia si el nombre d'objectius de canvi de"
 " nom/còpia supera el límit indicat"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Opcions de l'algorisme Diff"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "produeix el diff més petit possible"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "ignora els espais en blanc en comparar línies"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "ignora els canvis en la quantitat d'espai en blanc"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignora els canvis d'espai en blanc al final de la línia"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora els retorns de línia al final de la línia"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora els canvis en línies que estan en blanc"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "heurística per a desplaçar els límits del tros de diferència per a una "
 "lectura fàcil"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera diff usant l'algorisme «patience diff»"
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera diff usant l'algorisme «histogram diff»"
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algorisme>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "trieu un algorisme per al diff"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera diff usant l'algorisme «anchored diff»"
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
-"mostra el diff de paraules usant <mode> per delimitar les paraules "
+"mostra el diff de paraules usant <mode> per a delimitar les paraules "
 "modificades"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "utilitza <regex> per a decidir què és una paraula"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "com s'ignoren els espais en blanc a --color-moved"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Altres opcions diff"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els"
 " camins relatius"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "tracta tots els fitxers com a text"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "intercanvia les dues entrades, inverteix el diff"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "inhabilita totes les sortides del programa"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "permet executar un ajudant de diff extern"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "executa els filtres externs de conversió de text en comparar fitxers binaris"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<quan>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignora els canvis als submòduls en la generació del diff"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "especifiqueu com es mostren els canvis als submòduls"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "amaga les entrades «git add -N» de l'índex"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "tracta les entrades «git add -N» com a reals a l'índex"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<cadena>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3979,7 +3976,7 @@ msgstr ""
 "cerca les diferències que canvien el nombre d'ocurrències de la cadena "
 "especificada"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3987,35 +3984,35 @@ msgstr ""
 "cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
 "regular especificada"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<camí>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "mostra el canvi primer al camí especificat"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "omet la sortida al camí especificat"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<id de l'objecte>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -4023,33 +4020,33 @@ msgstr ""
 "cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
 "especificat"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "seleccioneu els fitxers per tipus de diff"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<fitxer>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Sortida a un fitxer específic"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 "s'ha omès la detecció de canvi de nom exhaustiva perquè hi ha massa fitxers."
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "només s'han trobat còpies des de camins modificats perquè de massa fitxers."
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4094,30 +4091,30 @@ msgstr ""
 "el vostre fitxer «sparse-checkout» pot tenir problemes el patró «%s» es "
 "repeteix"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "inhabilita la coincidència de patrons «cone»"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "no es pot usar %s com a fitxer d'exclusió"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no s'ha pogut obrir el directori «%s»"
 
-#: dir.c:2766
+#: dir.c:2720
 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:2890
+#: dir.c:2844
 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:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4125,36 +4122,36 @@ msgstr ""
 "No s'ha pogut endevinar cap nom de directori.\n"
 "Especifiqueu un directori en la línia d'ordres"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "el fitxer d'índex al repositori %s és malmès"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no s'han pogut crear directoris per %s"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "S'està filtrant el contingut"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "camí d'espai de noms git incorrecte «%s»"
@@ -4164,277 +4161,273 @@ msgstr "camí d'espai de noms git incorrecte «%s»"
 msgid "too many args to run %s"
 msgstr "hi ha massa arguments per a executar %s"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: llista shallow esperada"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 "git fetch-pack: s'esperava un paquet de buidatge després d'una llista "
 "shallow"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "no s'ha pogut escriure al remot"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc requereix multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línia de shallow no vàlida: %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línia d'unshallow no vàlida: %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "no s'ha trobat cap shallow: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "s'ha rebut %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissió no vàlida %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "s'abandona"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'està marcant %s com a complet"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es té %s (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 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:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capçalera de paquet errònia"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no es pot bifurcar de %s"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: sortida d'index-pack no vàlida"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versió del servidor és %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "El servidor accepta %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr ""
 "El servidor no és compatible amb el format d'objecte d'aquest repositori"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "cap comissió en comú"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "el repositori font és superficial, es rebutja clonar-ho."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenció ha fallat."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "algoritmes no coincidents: client %s; servidor %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "el servidor no és compatible amb l'algorisme «%s»"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "El servidor no permet sol·licituds superficials"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "El servidor accepta filtratge"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "no s'ha pogut escriure la sol·licitud al remot"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "error en llegir la capçalera de la secció «%s»"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "s'esperava «%s», s'ha rebut «%s»"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "línia de confirmació inesperada: «%s»"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "s'ha produït un error en processar els acks: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "s'esperava l'enviament del fitxer de paquet després de «ready»"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "s'esperava que no s'enviés cap altra secció després de no «ready»"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "s'ha produït un error en processar la informació superficial: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperat: «%s»"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "s'ha produït un error en processar les referències desitjades: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "el remot no ha enviat tots els objectes necessaris"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "«ready» no esperat des del remot"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referència remota %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
 
-#: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900
-#: gpg-interface.c:916
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "no s'ha pogut crear el fitxer temporal"
 
-#: gpg-interface.c:332 gpg-interface.c:452
+#: gpg-interface.c:332 gpg-interface.c:460
 #, 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 clau de signatura separada a «%s»"
 
-#: gpg-interface.c:443
-#, fuzzy
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4442,8 +4435,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile s'ha de configurar i existeix per a la "
 "verificació de la signatura ssh"
 
-#: gpg-interface.c:467
-#, fuzzy
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4451,73 +4443,68 @@ msgstr ""
 "ssh-keygen -Y find-principals/verify és necessari per a la verificació de la"
 " signatura ssh (disponible a opensh versió 8.2p1+)"
 
-#: gpg-interface.c:521
-#, c-format, fuzzy
+#: gpg-interface.c:536
+#, c-format
 msgid "ssh signing revocation file configured but not found: %s"
-msgstr ""
-"ssh signatura fitxer de revocació configurat però no trobat: percentatges"
+msgstr "fitxer de revocació de la signatura ssh configurat però no trobat: %s"
 
-#: gpg-interface.c:574
-#, fuzzy, c-format
+#: gpg-interface.c:624
+#, c-format
 msgid "bad/incompatible signature '%s'"
-msgstr "%s és incompatible amb %s"
+msgstr "la signatura «%s» és incompatible o està malmesa"
 
-#: gpg-interface.c:733 gpg-interface.c:738
-#, fuzzy, c-format
+#: gpg-interface.c:801 gpg-interface.c:806
+#, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
-msgstr ""
-"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»"
+msgstr "no s'ha pogut obtenir l'empremta ssh de la clau  «%s»"
 
-#: gpg-interface.c:760
-#, fuzzy
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
-msgstr "usuari.signingkey o gpg.ssh.defaultKeyCommand ha de ser configurat"
+msgstr ""
+"o bé user.signingkey o gpg.ssh.defaultKeyCommand han de ser configurats"
 
-#: gpg-interface.c:778
-#, c-format, fuzzy
-msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
+#: gpg-interface.c:851
+#, c-format
+msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
-"gpg.ssh.defaultKeycommand ha tingut èxit però no ha retornat cap clau: "
-"percentatge"
+"gpg.ssh.defaultKeyCommand ha tingut èxit però no ha retornat cap clau: %s %s"
 
-#: gpg-interface.c:784
-#, c-format, fuzzy
+#: gpg-interface.c:857
+#, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
-msgstr "gpg.ssh.defaultKeyCommand ha fallat: percentatge"
+msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s"
 
-#: gpg-interface.c:872
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg ha fallat en signar les dades"
 
-#: gpg-interface.c:893
-#, fuzzy
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
-msgstr "usuari.signingkey s'ha d'establir per signar ssh"
+msgstr "user.signingkey s'ha d'establir per a signar amb ssh"
 
-#: gpg-interface.c:904
-#, fuzzy, c-format
+#: gpg-interface.c:978
+#, c-format
 msgid "failed writing ssh signing key 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 clau de signatura ssh a «%s»"
 
-#: gpg-interface.c:922
-#, fuzzy, c-format
+#: gpg-interface.c:996
+#, c-format
 msgid "failed writing ssh signing key buffer 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 clau de signatura ssh a «%s»"
 
-#: gpg-interface.c:940
-#, fuzzy
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
 msgstr ""
-"ssh-keygen el signe -Y és necessari per signar ssh (disponible a opensh "
-"versió 8.2p1+)"
+"ssh-keygen -Y sign és necessari per a signar amb ssh (disponible a openssh versió "
+"8.2p1+)"
 
-#: gpg-interface.c:952
-#, fuzzy, c-format
+#: gpg-interface.c:1026
+#, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
-msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
+msgstr "s'ha produït un error en llegir la signatura ssh des de «%s»"
 
 #: graph.c:98
 #, c-format
@@ -4532,18 +4519,18 @@ msgstr ""
 "el patró indicat conté byte NULL (via -f <fitxer>). Això només és compatible"
 " amb -P sota PCRE v2"
 
-#: grep.c:1907
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: no s'ha pogut llegir %s"
 
-#: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "s'ha produït un error en fer stat a «%s»"
 
-#: grep.c:1935
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: lectura curta"
@@ -4624,7 +4611,7 @@ msgstr "Les guies de Git de conceptes són:"
 
 #: help.c:442
 msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vegeu «git help <ordre>» per llegir sobre una subordre específica"
+msgstr "Vegeu «git help <ordre>» per a llegir sobre una subordre específica"
 
 #: help.c:447
 msgid "External commands"
@@ -4664,9 +4651,9 @@ msgid "Continuing under the assumption that you meant '%s'."
 msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
 
 #: help.c:646
-#, c-format, fuzzy
-msgid "Run '%s' instead? (y/N)"
-msgstr "Voleu executar «%s»? (s/N)"
+#, c-format
+msgid "Run '%s' instead [y/N]? "
+msgstr "Voleu executar «%s» en el seu lloc? [y/N]? "
 
 #: help.c:654
 #, c-format
@@ -4884,9 +4871,9 @@ msgid "invalid value '%s' for lsrefs.unborn"
 msgstr "valor «%s» no vàlid per a «lsrefs.unborn»"
 
 #: ls-refs.c:174
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected line: '%s'"
-msgstr "wanted-ref inesperat: «%s»"
+msgstr "línia inesperada: «%s»"
 
 #: ls-refs.c:178
 msgid "expected flush after ls-refs arguments"
@@ -4896,7 +4883,7 @@ msgstr "s'esperava una neteja després dels arguments ls-refs"
 msgid "quoted CRLF detected"
 msgstr "CRLF citat detectat"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "acció «%s» incorrecta per a «%s»"
@@ -4927,7 +4914,7 @@ msgstr "Nota: avançament ràpid del submòdul %s a %s"
 #: merge-ort.c:1642
 #, c-format
 msgid "Failed to merge submodule %s"
-msgstr "s'ha produït un error en fusionar recursivament el submòdul «%s»"
+msgstr "S'ha produït un error en fusionar el submòdul «%s»"
 
 #: merge-ort.c:1649
 #, c-format
@@ -5134,7 +5121,7 @@ msgstr "submòdul"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5143,8 +5130,8 @@ msgstr ""
 "CONFLICTE: (modificació/supressió): %s suprimit a %s i modificat a %s. La "
 "versió %s de %s s'ha deixat en l'arbre."
 
-#: merge-ort.c:4152
-#, fuzzy, c-format
+#: merge-ort.c:4165
+#, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
 "copy renamed to %s"
@@ -5154,7 +5141,7 @@ msgstr ""
 
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
@@ -5169,7 +5156,7 @@ msgstr ""
 "Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Ja està al dia."
 
@@ -5462,7 +5449,7 @@ msgstr "la fusió no ha retornat cap comissió"
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte «%s»"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "No s'ha pogut escriure l'índex."
@@ -5471,8 +5458,8 @@ msgstr "No s'ha pogut escriure l'índex."
 msgid "failed to read the cache"
 msgstr "s'ha produït un error en llegir la memòria cau"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex nou"
@@ -5481,227 +5468,224 @@ msgstr "no s'ha pogut escriure un fitxer d'índex nou"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "l'OID de l'índex multipaquet és d'una mida incorrecta"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "el fitxer de l'índex multipaquet %s és massa petit"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 "la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura "
 "0x%08x"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "no es reconeix la versió %d de l'índex multipaquet"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 "la versió del hash índex multipaquet %u no coincideix amb la versió %u"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "falta un fragment de nom de paquet necessari al multi-index"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de "
 "«%s»"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és "
 "massa petit"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "no s'ha pogut obrir l'índex del paquet «%s»"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "no s'ha pogut localitzar l'objecte %d en el fitxer de paquet"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "no es pot emmagatzemar el fitxer d'índex invers"
 
-#: midx.c:990
-#, fuzzy, c-format
+#: midx.c:993
+#, c-format
 msgid "could not parse line: %s"
-msgstr "no s'ha pogut analitzar %s"
+msgstr "no s'ha pogut analitzar la línia: %s"
 
-#: midx.c:992
-#, fuzzy, c-format
+#: midx.c:995
+#, c-format
 msgid "malformed line: %s"
-msgstr "línia d'entrada mal formada: «%s»."
+msgstr "línia mal formada: %s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr ""
 "s'està ignorant l'índex multipaquet existent; la suma de verificació no "
 "coincideix"
 
-#: midx.c:1184
-#, fuzzy
+#: midx.c:1187
 msgid "could not load pack"
-msgstr "no s'ha pogut finalitzar «%s»"
+msgstr "no s'ha pogut carregar el paquet"
 
-#: midx.c:1190
-#, fuzzy, c-format
+#: midx.c:1193
+#, c-format
 msgid "could not open index for %s"
 msgstr "s'ha produït un error en obrir l'índex per «%s»"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "paquet preferit desconegut: «%s»"
 
-#: midx.c:1289
-#, fuzzy, c-format
+#: midx.c:1292
+#, c-format
 msgid "cannot select preferred pack %s with no objects"
-msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
+msgstr "no es pot selecionar un paquet preferit %s sense objectes"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "no s'ha vist caure el fitxer empaquetat %s"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "el paquet preferit «%s» ha caducat"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "no hi ha fitxers empaquetats a indexar."
 
-#: midx.c:1417
-#, fuzzy
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
-msgstr "no s'ha pogut escriure la plantilla de comissió"
+msgstr "no s'han pogut escriure els mapes de bits dels multipaquets"
 
-#: midx.c:1427
-#, fuzzy
+#: midx.c:1430
 msgid "could not write multi-pack-index"
-msgstr "no s'han pogut netejar els percentatges multi-paquet"
+msgstr "no s'ha pogut escriure l'índex multipaquet"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "s'ha produït un error en eliminar %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr ""
 "el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "suma de verificació incorrecta"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "S'estan cercant fitxers empaquetats referenciats"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "oid fanout desordenat: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "el midx no conté cap oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "S'estan ordenant els objectes per fitxer empaquetats"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "S'estan verificant els desplaçaments dels objectes"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer empaquetat %s"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 "desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != "
 "%<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "S'estan comptant els objectes referenciats"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "no s'ha pogut iniciar el pack-objects"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "no s'ha pogut finalitzar el pack-objects"
 
@@ -5756,265 +5740,265 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Valor erroni de %s: «%s»"
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "no existeix el directori d'objecte %s; comproveu "
 ".git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació "
 "massa profunda"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "no es pot llegir el fitxer «alternates»"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "el camí «%s» no existeix"
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "el repositori de referència «%s» no és un repositori local."
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "el repositori de referència «%s» és superficial"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "el repositori de referència «%s» és empeltat"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 "línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "s'està intentant fer mmap %<PRIuMAX> per sobre del límit %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap ha fallat%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "el tipus d'objecte %s és buit"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objecte solt corrupte «%s»"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "brossa al final de l'objecte solt «%s»"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "no s'ha pogut analitzar la capçalera %s"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "tipus d'objecte és incorrecte"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "no s'ha pogut desempaquetar la capçalera %s"
 
-#: object-file.c:1434
-#, c-format, fuzzy
+#: object-file.c:1474
+#, c-format
 msgid "header for %s too long, exceeds %d bytes"
-msgstr "la capçalera per a percentatges és massa llarga, supera els bytes"
+msgstr "la capçalera per a %s és massa llarga, supera els %d bytes"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "s'ha produït un error en llegir l'objecte %s"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "no s'ha trobat el reemplaçament %s per a %s"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "no s'ha pogut escriure al fitxer %s"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "no s'ha pogut establir el permís a «%s»"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "s'ha produït un error en escriure al fitxer"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "error en tancar el fitxer d'objecte solt"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permisos insuficients per a afegir un objecte a la base de dades del "
 "repositori %s"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "no s'ha pogut crear un fitxer temporal"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "no s'ha pogut desinflar l'object nou %s (%d)"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "confós per la font de dades inestable de l'objecte per a %s"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "ha fallat utime() a %s"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "no es pot llegir l'objecte per a %s"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "comissió corrupta"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "etiqueta corrupta"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "error de lectura mentre s'indexava %s"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lectura curta mentre s'indexa %s"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: no s'han pogut inserir a la base de dades"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipus de fitxer no suportat"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s no és un objecte vàlid"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s no és un objecte de «%s» vàlid"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "no s'ha pogut obrir %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "no coincideix la suma per a %s (s'esperava %s)"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "no s'ha pogut fer «mmap» %s"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "no s'ha pogut desempaquetar la capçalera de %s"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "no s'ha pogut analitzar la capçalera de %s"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "no s'han pogut desempaquetar els continguts de %s"
@@ -6144,27 +6128,25 @@ msgstr "no s'ha pogut analitzar l'objecte: %s"
 msgid "hash mismatch %s"
 msgstr "el resum no coincideix %s"
 
-#: pack-bitmap.c:348
-#, fuzzy
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
-msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
+msgstr "falta l'índex invers necessari al mapa de bits multipaquet"
 
-#: pack-bitmap.c:424
-#, fuzzy
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
-msgstr "Loadreverseindex: no s'ha pogut obrir el paquet"
+msgstr "load_reverse_index: no s'ha pogut obrir el paquet"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "no s'ha pogut obtenir la mida de %s"
 
-#: pack-bitmap.c:1916
-#, fuzzy, c-format
+#: pack-bitmap.c:1935
+#, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
-msgstr "no s'ha pogut finalitzar «%s»"
+msgstr "no s'ha pogut trobar %s al paquet %s al desplaçament %<PRIuMAX>"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "no s'ha pogut obtenir l'ús del disc de %s"
@@ -6213,47 +6195,52 @@ msgstr "s'ha produït un error en fer %s llegible"
 msgid "could not write '%s' promisor file"
 msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "el fitxer de paquet %s no es pot mapar%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, 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:1927
+#: packfile.c:1928
 #, 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-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "l'opció «%s» espera un valor numèric"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "data de venciment «%s» mal formada"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "l'opció «%s» espera «always», «auto» o «never»"
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "nom d'objecte «%s» mal format"
 
+#: parse-options-cb.c:307
+#,  c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'opció «%s» espera «%s» o «%s»"
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6289,43 +6276,43 @@ msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g"
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "voleu dir «--%s» (amb dos guionets)?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "àlies de --%s"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opció desconeguda «%s»"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
-msgstr "«switch» «%c» desconegut"
+msgstr "opció «%c» desconeguda"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opció no ascii desconeguda en la cadena: «%s»"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "ús: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
@@ -6348,17 +6335,17 @@ msgstr "   o: %s"
 #. function. The "%s" is a line in the (hopefully already
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
-#: parse-options.c:969
-#, c-format, fuzzy
+#: parse-options.c:970
+#, c-format
 msgid "%*s%s"
-msgstr "%*s%"
+msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -6493,17 +6480,17 @@ msgstr "error de lectura"
 msgid "the remote end hung up unexpectedly"
 msgstr "el remot ha penjat inesperadament"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "error de protocol: longitud de línia errònia %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "error remot: %s"
@@ -6517,21 +6504,21 @@ msgstr "S'està actualitzant l'índex"
 msgid "unable to create threaded lstat: %s"
 msgstr "no s'han pogut crear lstat amb fils %s"
 
-#: pretty.c:988
+#: pretty.c:1051
 msgid "unable to parse --pretty format"
 msgstr "no s'ha pogut analitzar el format --pretty"
 
 #: promisor-remote.c:31
 msgid "promisor-remote: unable to fork off fetch subprocess"
-msgstr "promisor-remote no es pot bifurcar obtenint el subprocés"
+msgstr "promisor-remote: no es pot bifurcar obtenint el subprocés"
 
 #: promisor-remote.c:38 promisor-remote.c:40
 msgid "promisor-remote: could not write to fetch subprocess"
-msgstr "promisor-remote no s'ha pogut escriure per obtenir el subprocés"
+msgstr "promisor-remote: no s'ha pogut escriure per a obtenir el subprocés"
 
 #: promisor-remote.c:44
 msgid "promisor-remote: could not close stdin to fetch subprocess"
-msgstr "promisor-remote no s'ha pogut tancar stdin per obtenir el subprocés"
+msgstr "promisor-remote: no s'ha pogut tancar stdin per a obtenir el subprocés"
 
 #: promisor-remote.c:54
 #, c-format
@@ -6554,7 +6541,7 @@ msgstr "no s'ha pogut iniciar «log»"
 msgid "could not read `log` output"
 msgstr "no s'ha pogut llegir la sortida de «log»"
 
-#: range-diff.c:97 sequencer.c:5603
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no s'ha pogut analitzar la comissió «%s»"
@@ -6577,60 +6564,56 @@ msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»"
 msgid "failed to generate diff"
 msgstr "s'ha produït un error en generar el diff"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only i --right-only són mútuament excloents"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "no es pot crear un blob buit a la base de dades d'objectes"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "«%s» no té una comissió comprovada"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "no es pot llegir indexar el fitxer «%s»"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "no s'ha pogut afegir «%s» a l'índex"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "no s'ha pogut fer «stat» a «%s»"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "«%s» apareix com a fitxer i com a directori"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Actualitza l'índex"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6639,7 +6622,7 @@ msgstr ""
 "index.version està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6648,143 +6631,143 @@ msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signatura malmesa 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "versió d'índex incorrecta %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "signatura sha1 malmesa al fitxer d'índex"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "l'índex usa l'extensió %.4s, que no es pot entendre"
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "s'està ignorant l'extensió %.4s"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "format d'entrada d'índex desconeguda «0x%08x»"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "camp del nom mal formatat l'índex, camí a prop «%s»"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "entrades «stage» no ordenades en l'índex"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entrades «stage» no ordenades per a «%s»"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "fitxer d'índex malmès"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no s'ha pogut crear fil «load_cache_entries»: %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "no s'ha pogut unir al fil «load_cache_entries»: %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: ha fallat l'obertura del fitxer d'índex"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: no es pot fer «stat» a l'índex obert"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: fitxer d'índex més petit que s'esperava"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s: no es pot mapar el fitxer d'índex%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no s'ha pogut crear un fil «load_index_extensions»: %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no s'ha pogut unir un fil «load_index_extensions»: %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "no s'ha pogut tancar «%s»"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "s'ha produït un error en convertir a un índex dispers"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no s'ha pogut fer stat a «%s»"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no s'ha pogut obrir el directori git: %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaçar: %s"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "no s'han pogut corregir els bits de permisos en «%s»"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: no es pot baixar fins al «stage» #0"
@@ -6898,8 +6881,8 @@ msgstr ""
 "No obstant, si elimineu tot, s'avortarà el «rebase».\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3886
-#: sequencer.c:3912 sequencer.c:5709 builtin/fsck.c:328 builtin/gc.c:1790
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6934,11 +6917,11 @@ msgstr ""
 "Els comportaments possibles són: ignore, warn, error.\n"
 
 #: rebase.c:29
-#, c-format, fuzzy
+#, c-format
 msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "percentatges: \"preservei\" substituït per \"merges\""
+msgstr "%s: «conserva» substituït per «fusiona»"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "no hi és"
 
@@ -6977,7 +6960,8 @@ msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argument %%(%s) desconegut: %s"
@@ -6987,11 +6971,6 @@ msgstr "argument %%(%s) desconegut: %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no accepta arguments"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) no reconegut: %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -7002,11 +6981,6 @@ msgstr "%%(deltabase) no accepta arguments"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no accepta arguments"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) no reconegut: %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -7022,26 +6996,11 @@ msgstr "argument %%(trailers) desconegut: %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat conté:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) no reconegut: %s"
-
-#: ref-filter.c:443
-#, fuzzy, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "argument %%(%s) desconegut: %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "valor positiu esperat «%s» a %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument no reconegut «%s» a %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -7062,25 +7021,15 @@ msgstr "posició no reconeguda:%s"
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) no reconegut: %s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "amplada positiva esperada amb l'àtom %%(align)"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) no reconegut: %s"
-
 #: ref-filter.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "%%(rest) does not take arguments"
-msgstr "%%(body) no accepta arguments"
+msgstr "%%(rest) no accepta arguments"
 
 #: ref-filter.c:680
 #, c-format
@@ -7097,18 +7046,13 @@ msgstr "nom de camp desconegut: %.*s"
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
-"no és un repositori, git però el camp «%.*s» requereix accés a les dades de "
+"no és un repositori git, però el camp «%.*s» requereix accés a les dades de "
 "l'objecte"
 
-#: ref-filter.c:844
-#, 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:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: l'àtom %%(%s) usat sense un àtom %%(%s)"
 
 #: ref-filter.c:912
 #, c-format
@@ -7120,16 +7064,6 @@ msgstr "format: s'ha usat l'àtom %%(then) més d'un cop"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
 
-#: ref-filter.c:946
-#, 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:948
-#, 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:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7146,14 +7080,14 @@ msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
 #: ref-filter.c:1033
-#, c-format, fuzzy
+#, c-format
 msgid "this command reject atom %%(%.*s)"
-msgstr "aquesta ordre rebutja l'àtom%(%.*s)"
+msgstr "aquesta ordre rebutja l'àtom %%(%.*s)"
 
 #: ref-filter.c:1040
-#, fuzzy, c-format
-msgid "--format=%.*s cannot be used with--python, --shell, --tcl"
-msgstr "--object-format no es pot usar sense --stdin"
+#, c-format
+msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
+msgstr "no es pot usar --format=%.*s amb --python, --shell, --tcl"
 
 #: ref-filter.c:1706
 #, c-format
@@ -7204,22 +7138,22 @@ msgstr "objecte mal format a «%s»"
 msgid "ignoring ref with broken name %s"
 msgstr "s'està ignorant la referència amb nom malmès %s"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "s'està ignorant la referència trencada %s"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: manca l'àtom %%(end)"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'opció «%s» ha d'apuntar a una comissió"
@@ -7230,7 +7164,7 @@ msgid "%s does not point to a valid object!"
 msgstr "%s no apunta a un objecte vàlid"
 
 #: refs.c:563
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Using '%s' as the name for the initial branch. This default branch name\n"
 "is subject to change. To configure the initial branch name to use in all\n"
@@ -7243,16 +7177,16 @@ msgid ""
 "\n"
 "\tgit branch -m <name>\n"
 msgstr ""
-"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca per defecte\n"
-"està subjecte a canvis. Per a configurar el nom inicial de la branca que s'utilitzarà en tots\n"
-"els repositoris nous, i que suprimirà aquest avís, useu:\n"
+"S'està utilitzant «%s» com a nom de la branca inicial. Aquest nom de branca\n"
+"per defecte es pot canviar. Per a configurar el nom inicial de la branca que\n"
+"s'utilitzarà en tots els repositoris nous, i que suprimirà aquest avís, useu:\n"
 "\n"
 "\tgit config --global init.defaultBranch <nom>\n"
 "\n"
-"Els noms escollits habitualment en lloc de «master» són «main», «trunk» i «development»\n"
-"La branca acabada de crear es pot canviar de nom amb aquesta ordre:\n"
+"Els noms més usats habitualment en lloc de «master» són «main», «trunk» i\n"
+"«development». La branca acabada de crear es pot canviar de nom amb l'ordre:\n"
 "\n"
-"\tgit branch -m <nom>"
+"\tgit branch -m <nom>\n"
 
 #: refs.c:585
 #, c-format
@@ -7264,71 +7198,71 @@ msgstr "no s'ha pogut recuperar «%s»"
 msgid "invalid branch name: %s = %s"
 msgstr "nom de branca no vàlida: %s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "s'està ignorant symref penjant %s"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "registre per a ref %s té un buit després de %s"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "registre per als ref %s ha acabat inesperadament a %s"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "el registre per a %s és buit"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "s'està refusant la referència amb nom malmès «%s»"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "ha fallat update_ref per a la ref «%s»: %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "no es permeten múltiples actualitzacions per a la referència «%s»"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "no està permès actualitzar les referències en un entorn de quarantena"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "les actualitzacions de referències s'han avortat per un lligam"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "«%s» existeix; no es pot crear «%s»"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "no es poden processar «%s» i «%s» a la vegada"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "no s'ha pogut eliminar la referència %s"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "no s'ha pogut suprimir la referència %s: %s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "no s'han pogut suprimir les referències: %s"
@@ -7338,51 +7272,51 @@ msgstr "no s'han pogut suprimir les referències: %s"
 msgid "invalid refspec '%s'"
 msgstr "refspec no vàlida: «%s»"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "l'abreviatura del fitxer de configuració remot no pot començar amb «/»: %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "més d'un paquet de recepció donat, usant el primer"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "més d'un paquet de càrrega donat, usant el primer"
 
-#: remote.c:590
+#: remote.c:699
 #, 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:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s generalment segueix %s, no %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segueix ambdós %s i %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "la clau «%s» del patró no té «*»"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "el valor «%s» del patró no té «*»"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "l'especificació de referència src %s no coincideix amb cap referència"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -7391,8 +7325,8 @@ msgstr ""
 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
-#: remote.c:1103
-#, fuzzy, c-format
+#: remote.c:1212
+#, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
 "starting with \"refs/\"). We tried to guess what you meant by:\n"
@@ -7404,13 +7338,17 @@ msgid ""
 "\n"
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
-"La destinació que heu proporcionat no és un nom de referència complet (és a "
-"dir començant per \"refs/\"). Hem intentat endevinar el que voleu dir amb - "
-"Buscant una referència que coincideixi amb '%s' al costat remot. - Comprovar"
-" si el <src> ser empès ('%s') és una referència a \"refs/{headtags}/\". Si "
-"és així afegirem un refs/{headstags que no ha funcionat completament."
+"La destinació que heu proporcionat no és un nom de referència complet\n"
+"(p. ex., que comenci amb «refs/»). Hem intentat deduir el que voleu dir:\n"
+"\n"
+"- Buscant una referència que coincideixi amb «%s» al costat remot.\n"
+"- Comprovant si el <src> que s'ha pujat («%s»)\n"
+"  és una referència «refs/{heads,tags}/». Si és així, afegim el prefix\n"
+"  refs/{heads,tags}/ corresponent al costat remot.\n"
+"\n"
+"Res d'això ha funcionat. Cal que proporcioneu una referència completa."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7421,7 +7359,7 @@ msgstr ""
 "Voleu crear una branca nova empenyent a\n"
 "«%s:refs/heads/%s»?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7431,7 +7369,7 @@ msgstr ""
 "La part <src> de l'especificació de la referència és un objecte d'etiqueta.\n"
 "Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7441,7 +7379,7 @@ msgstr ""
 "La part <src> de l'especificació de la referència és un objecte d'arbre.\n"
 "Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7452,118 +7390,118 @@ msgstr ""
 "Voleu posar una etiqueta al blob nou mitjançant la pujada a\n"
 "?«%s:refs/tags/%s»?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "«%s» no es pot resoldre a una branca"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 "l'especificació de la referència dst %s coincideixen amb més d'una "
 "referència"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "l'especificació de la referència dst %s rep més d'una referència src"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no assenyala cap branca"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existeix la branca: «%s»"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "cap font configurada per a la branca «%s»"
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
 
-#: remote.c:1757
+#: remote.c:1867
 #, 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"
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branca «%s» no té cap remot al qual pujar"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les especificacions de referència de «%s» no inclouen «%s»"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "push no té destí (push.default és «nothing»)"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no es pot resoldre una pujada «simple» a un sol destí"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "no s'ha pogut trobar la referència remota %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* S'estan ignorant les referències «%s» localment"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (useu «git branch --unset-upstream» per a arreglar-ho)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "La vostra branca està al dia amb «%s».\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (useu «%s» per a detalls)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, 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à %2$d comissió per davant de «%1$s».\n"
 msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (useu «git push» per a publicar les vostres comissions locals)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7575,11 +7513,11 @@ msgstr[1] ""
 "La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
 "se ràpidament.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (useu «git pull» per a actualitzar la vostra branca local)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7594,11 +7532,11 @@ msgstr[1] ""
 "La vostra branca i «%s» han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (useu «git pull» per a fusionar la branca remota amb la vostra)\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
@@ -7631,7 +7569,7 @@ msgstr "no s'ha pogut escriure el registre «rerere»"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "s'han produït errors en escriure «%s» (%s)"
 
-#: rerere.c:482 builtin/gc.c:2247 builtin/gc.c:2282
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "no s'ha pogut buidar «%s»"
@@ -7676,8 +7614,8 @@ msgstr "no es pot desenllaçar «%s» (extraviat)"
 msgid "Recorded preimage for '%s'"
 msgstr "Imatge prèvia registrada per a «%s»"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no s'ha pogut crear el directori «%s»"
@@ -7715,39 +7653,29 @@ msgstr "no s'ha pogut obrir el directori rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "no s'ha pogut determinar la revisió de HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3703
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "s'ha produït un error en cercar l'arbre de %s"
 
-#: revision.c:2259
-#, fuzzy
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--dir-diff és incompatible amb --no-index"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<packfile> ja no s'admet"
 
-#: revision.c:2655 revision.c:2659
-#, fuzzy
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--dir-diff és incompatible amb --no-index"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "la branca actual «%s» encara no té cap comissió"
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "no s'ha pogut crear fil «async»: %s"
@@ -7777,7 +7705,6 @@ msgid "send-pack: unable to fork off fetch subprocess"
 msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
 
 #: send-pack.c:457
-#, fuzzy
 msgid "push negotiation failed; proceeding anyway with push"
 msgstr ""
 "ha fallat la negociació de l'empenta; s'està procedint igualment amb "
@@ -7817,8 +7744,8 @@ msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
 msgid "could not delete '%s'"
 msgstr "no s'ha pogut suprimir «%s»"
 
-#: sequencer.c:345 sequencer.c:4752 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "no s'ha pogut eliminar «%s»"
@@ -7849,7 +7776,6 @@ msgstr ""
 "corregits amb «git add <camins>» o «git rm <camins>»"
 
 #: sequencer.c:423
-#, fuzzy
 msgid ""
 "After resolving the conflicts, mark them with\n"
 "\"git add/rm <pathspec>\", then run\n"
@@ -7858,13 +7784,14 @@ msgid ""
 "To abort and get back to the state before \"git cherry-pick\",\n"
 "run \"git cherry-pick --abort\"."
 msgstr ""
-"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --continue».\n"
-"Alternativament podeu 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»."
+"Després de resoldre els conflictes, marqueu-los amb\n"
+"«git add/rm <pathspec>», llavors executeu\n"
+"«git cherry-pick --continue».\n"
+"Podeu també ometre aquesta comissió amb «git cherry-pick --skip».\n"
+"Per a interrompre i tornar a l'estat anterior abans de «git cherry-pick»,\n"
+"executeu «git cherry-pick --abort»."
 
 #: sequencer.c:430
-#, fuzzy
 msgid ""
 "After resolving the conflicts, mark them with\n"
 "\"git add/rm <pathspec>\", then run\n"
@@ -7873,18 +7800,20 @@ msgid ""
 "To abort and get back to the state before \"git revert\",\n"
 "run \"git revert --abort\"."
 msgstr ""
-"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --continue».\n"
-"Alternativament podeu 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»."
+"Després de resoldre els conflictes, marqueu-los amb\n"
+"«git add/rm <pathspec>», llavors executeu\n"
+"«git revert --continue».\n"
+"Podeu també ometre aquesta comissió amb «git revert --skip».\n"
+"Per a interrompre i tornar a l'estat anterior abans de «git revert»,\n"
+"executeu «git revert --abort»."
 
-#: sequencer.c:448 sequencer.c:3288
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no s'ha pogut bloquejar «%s»"
 
-#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306
-#: sequencer.c:3564 sequencer.c:5619 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "no s'ha pogut escriure a «%s»"
@@ -7894,12 +7823,18 @@ msgstr "no s'ha pogut escriure a «%s»"
 msgid "could not write eol to '%s'"
 msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
 
-#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3572
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "s'ha produït un error en finalitzar «%s»"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "no s'ha pogut llegir «%s»"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7914,7 +7849,7 @@ msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
 msgid "%s: fast-forward"
 msgstr "%s: avanç ràpid"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vàlid %s"
@@ -7944,8 +7879,8 @@ msgstr "no hi ha una clau a «%.*s»"
 msgid "unable to dequote value of '%s'"
 msgstr "no s'han pogut treure les cometes del valor de «%s»"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no s'ha pogut obrir «%s» per a lectura"
@@ -7996,7 +7931,7 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 "teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n"
+"Si aquests canvis estan pensats per a fer «squash» a la comissió prèvia, executeu:\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
@@ -8008,11 +7943,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1227
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "el lligam «prepare-commit-msg» ha fallat"
 
-#: sequencer.c:1233
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8030,7 +7965,7 @@ msgstr ""
 "automàticament basant-se en el vostre nom d'usuari i nom de màquina. \n"
 "Comproveu que siguin correctes. Podeu suprimir aquest\n"
 "missatge establint-los explícitament. Executeu l'ordre següent i\n"
-"seguiu les instruccions en el vostre editor per editar el vostre\n"
+"seguiu les instruccions en l'editor per a editar el vostre\n"
 "fitxer de configuració:\n"
 "\n"
 "    git config --global --edit\n"
@@ -8039,7 +7974,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1246
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8073,340 +8008,341 @@ msgstr "no s'ha pogut trobar la comissió novament creada"
 msgid "could not parse newly created commit"
 msgstr "no s'ha pogut analitzar la comissió novament creada"
 
-#: sequencer.c:1336
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
 
-#: sequencer.c:1338
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "HEAD separat"
 
-#: sequencer.c:1342
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (comissió arrel)"
 
-#: sequencer.c:1363
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "no s'ha pogut analitzar HEAD"
 
-#: sequencer.c:1365
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s no és una comissió!"
 
-#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "no s'ha pogut analitzar la comissió HEAD"
 
-#: sequencer.c:1425 sequencer.c:2310
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "no s'ha pogut analitzar l'autor de la comissió"
 
-#: sequencer.c:1436 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree ha fallat en escriure un arbre"
 
-#: sequencer.c:1469 sequencer.c:1589
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
 
-#: sequencer.c:1500 sequencer.c:1532
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "identitat d'autor no vàlida: «%s»"
 
-#: sequencer.c:1506
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "autor malmès: falta la informació de la data"
 
-#: sequencer.c:1545 builtin/am.c:1643 builtin/commit.c:1821
-#: builtin/merge.c:913 builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822
+#: builtin/merge.c:915 builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "s'ha produït un error en escriure l'objecte de comissió"
 
-#: sequencer.c:1572 sequencer.c:4524 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: sequencer.c:1621
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: sequencer.c:1626
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no s'ha pogut analitzar la comissió pare %s"
 
-#: sequencer.c:1709 sequencer.c:1990
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:1751
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Aquest és el 1r missatge de comissió:"
 
-#: sequencer.c:1752
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Aquest és el missatge de comissió #%d:"
 
-#: sequencer.c:1753
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "El primer missatge de comissió s'ometrà:"
 
-#: sequencer.c:1754
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "El missatge de comissió núm. #%d s'ometrà:"
 
-#: sequencer.c:1755
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Això és una combinació de %d comissions."
 
-#: sequencer.c:1902 sequencer.c:1959
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "no es pot escriure «%s»"
 
-#: sequencer.c:1949
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
-msgstr "cal un HEAD per reparar-ho"
+msgstr "cal un HEAD per a reparar-ho"
 
-#: sequencer.c:1951 sequencer.c:3599
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:1953
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
 
-#: sequencer.c:1977
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: sequencer.c:2087
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'índex està sense fusionar."
 
-#: sequencer.c:2094
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "no es pot arreglar la comissió arrel"
 
-#: sequencer.c:2113
+#: sequencer.c:2117
 #, 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:2121 sequencer.c:2129
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "la comissió %s no té pare %d"
 
-#: sequencer.c:2135
+#: sequencer.c:2139
 #, 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:2154
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissió pare %s"
 
-#: sequencer.c:2220
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
 
-#: sequencer.c:2280
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:2281
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:2302
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "descartant %s %s -- el contingut del pedaç ja està a la font\n"
 
-#: sequencer.c:2360
+#: sequencer.c:2364
 #, 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:2368
+#: sequencer.c:2372
 #, 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:2448
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s no accepta arguments: «%s»"
 
-#: sequencer.c:2457
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "falten els arguments per a %s"
 
-#: sequencer.c:2500
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "no s'ha pogut analitzar «%s»"
 
-#: sequencer.c:2561
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línia no vàlida %d: %.*s"
 
-#: sequencer.c:2572
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "no es pot «%s» sense una comissió prèvia"
 
-#: sequencer.c:2620 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "no s'ha pogut llegir «%s»."
 
-#: sequencer.c:2658
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "s'està cancel·lant un «cherry pick» en curs"
 
-#: sequencer.c:2667
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "s'està cancel·lant la reversió en curs"
 
-#: sequencer.c:2707
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corregiu-ho usant «git rebase --edit-todo»."
 
-#: sequencer.c:2709
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "full d'instruccions inusable: «%s»"
 
-#: sequencer.c:2714
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissió."
 
-#: sequencer.c:2725
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer «cherry pick» durant una reversió."
 
-#: sequencer.c:2727
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un «cherry pick»."
 
-#: sequencer.c:2805
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: sequencer.c:2914
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "«squash-onto» no usable"
 
-#: sequencer.c:2934
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "full d'opcions mal format: «%s»"
 
-#: sequencer.c:3029 sequencer.c:4903
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:3046
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "una reversió ja està en curs"
 
-#: sequencer.c:3048
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
 
-#: sequencer.c:3051
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "un «cherry pick» ja està en curs"
 
-#: sequencer.c:3053
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»"
 
-#: sequencer.c:3067
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
 
-#: sequencer.c:3082
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:3142 sequencer.c:4613
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
 
-#: sequencer.c:3144 sequencer.c:3155
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:3146 sequencer.c:3190
+#: sequencer.c:3150 sequencer.c:3194
 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:3176 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no es pot obrir «%s»"
 
-#: sequencer.c:3178
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no es pot llegir «%s»: %s"
 
-#: sequencer.c:3179
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:3185
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
 
-#: sequencer.c:3196
+#: sequencer.c:3200
 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:3237
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "no hi ha cap reversió en curs"
 
-#: sequencer.c:3246
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "ni hi ha cap «cherry pick» en curs"
 
-#: sequencer.c:3256
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "s'ha produït un error en ometre la comissió"
 
-#: sequencer.c:3263
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "no hi ha res a ometre"
 
-#: sequencer.c:3266
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8415,16 +8351,16 @@ msgstr ""
 "heu fet ja una comissió?\n"
 "proveu «git %s --continue»"
 
-#: sequencer.c:3428 sequencer.c:4504
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "no es pot llegir HEAD"
 
-#: sequencer.c:3445
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:3453
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8443,27 +8379,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3463
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No s'ha pogut aplicar %s... %.*s"
 
-#: sequencer.c:3470
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No s'ha pogut fusionar %.*s"
 
-#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:3500
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "S'està executant: %s\n"
 
-#: sequencer.c:3515
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8478,11 +8414,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3521
+#: sequencer.c:3520
 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:3527
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8498,92 +8434,91 @@ msgstr ""
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:3589
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom d'etiqueta no permès: «%.*s»"
 
-#: sequencer.c:3662
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "s'està escrivint una comissió arrel falsa"
 
-#: sequencer.c:3667
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "s'està escrivint «squash-onto»"
 
-#: sequencer.c:3746
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no s'ha pogut resoldre «%s»"
 
-#: sequencer.c:3778
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "no es pot fusionar sense una revisió actual"
 
-#: sequencer.c:3800
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no s'ha pogut analitzar «%.*s»"
 
-#: sequencer.c:3809
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
-msgstr "no hi ha res per fusionar «%.*s»"
+msgstr "no hi ha res per a fusionar «%.*s»"
 
-#: sequencer.c:3821
-#, fuzzy
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
-"no es pot executar la fusió del pop a la part superior d'una [arrel nova]"
+"no es pot executar la fusió «octopus» a la part superior d'una [arrel nova]"
 
-#: sequencer.c:3876
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
 
-#: sequencer.c:4022
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no s'ha pogut fusionar «%.*s»"
 
-#: sequencer.c:4038
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
 
-#: sequencer.c:4119
+#: sequencer.c:4116
 msgid "Cannot autostash"
-msgstr "no es pot fer un «stash» automàticament"
+msgstr "No es pot fer un «stash» automàticament"
 
-#: sequencer.c:4122
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Resposta de «stash» inesperada: «%s»"
 
-#: sequencer.c:4128
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "No s'ha pogut crear el directori per a «%s»"
 
-#: sequencer.c:4131
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "S'ha creat un «stash» automàticament: %s\n"
 
-#: sequencer.c:4135
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "no s'ha pogut fer reset --hard"
 
-#: sequencer.c:4160
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "S'ha aplicat el «stash» automàticament.\n"
 
-#: sequencer.c:4172
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:4175
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8594,30 +8529,30 @@ msgstr ""
 "Els vostres canvis estan segurs en el «stash».\n"
 "Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
 
-#: sequencer.c:4180
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
 
-#: sequencer.c:4181
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 "El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
 
-#: sequencer.c:4253
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "no s'ha pogut separar HEAD"
 
-#: sequencer.c:4268
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Aturat a HEAD\n"
 
-#: sequencer.c:4270
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Aturat a %s\n"
 
-#: sequencer.c:4302
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8632,64 +8567,64 @@ msgstr ""
 "No s'ha pogut executar l'ordre «todo»\n"
 "\n"
 "    %.*s\n"
-"S'ha reprogramat; per editar l'ordre abans de continuar, editeu primer\n"
+"S'ha reprogramat; per a editar l'ordre abans de continuar, editeu primer\n"
 "la llista de tasques pendents:\n"
 "\n"
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4348
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "S'està fent «rebase» (%d/%d)%s"
 
-#: sequencer.c:4394
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:4464
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:4512
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "no s'ha pogut llegir orig-head"
 
-#: sequencer.c:4517
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "no s'ha pogut llegir «onto»"
 
-#: sequencer.c:4531
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:4591
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
 
-#: sequencer.c:4643
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
-msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
+msgstr "no es pot fer «rebase»: teniu canvis «unstaged»."
 
-#: sequencer.c:4652
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissió no existent"
 
-#: sequencer.c:4654
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fitxer no vàlid: «%s»"
 
-#: sequencer.c:4656
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contingut no vàlid: «%s»"
 
-#: sequencer.c:4659
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8699,69 +8634,68 @@ msgstr ""
 "Teniu canvis no comesos en el vostre arbre de treball. \n"
 "Cometeu-los primer i després executeu «git rebase --continue» de nou."
 
-#: sequencer.c:4695 sequencer.c:4734
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no s'ha pogut escriure el fitxer: «%s»"
 
-#: sequencer.c:4750
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
+msgstr "no s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:4760
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "no s'han pogut cometre els canvis «staged»."
 
-#: sequencer.c:4880
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no es pot fer «cherry pick» a %s"
 
-#: sequencer.c:4884
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisió incorrecta"
 
-#: sequencer.c:4919
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissió inicial"
 
-#: sequencer.c:5190 sequencer.c:5419
-#, fuzzy, c-format
+#: sequencer.c:5189 sequencer.c:5418
+#, c-format
 msgid "skipped previously applied commit %s"
-msgstr "esmena la comissió anterior"
+msgstr "omet les comissions aplicades anteriorment %s"
 
-#: sequencer.c:5260 sequencer.c:5435
-#, fuzzy
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr "useu --reapply-cherry-picks per incloure les comissions omeses"
+msgstr "useu --reapply-cherry-picks per a incloure les comissions omeses"
 
-#: sequencer.c:5406
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: opcions no gestionades"
 
-#: sequencer.c:5409
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: s'ha produït un error en preparar les revisions"
 
-#: sequencer.c:5667 sequencer.c:5684
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "res a fer"
 
-#: sequencer.c:5703
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
 
-#: sequencer.c:5803
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "l'script ja estava endreçat."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "«%s» està fora del repositori a «%s»"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8770,7 +8704,7 @@ msgstr ""
 "%s: no hi ha tal camí en l'arbre de treball.\n"
 "Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin localment."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8781,12 +8715,12 @@ msgstr ""
 "Useu «--» per a separar els camins de les revisions:\n"
 "«git <ordre> [<revisió>...] -- [<fitxer>...]»"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "l'opció «%s» ha d'aparèixer abans que els arguments opcionals"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8797,103 +8731,103 @@ msgstr ""
 "Useu «--» per a separar els camins de les revisions:\n"
 "«git <ordre> [<revisió>...] -- [<fitxer>...]»"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "no s'ha pogut configurar un arbre de treball utilitzant una configuració no "
 "vàlida"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "aquesta operació s'ha d'executar en un arbre de treball"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "S'esperava una versió de repositori de git <= %d, s'ha trobat %d"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "s'ha trobat una extensió de repositori desconeguda:"
 msgstr[1] "s'han trobat extensions de repositori desconegudes:"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] ""
 "el repositori és versió 0, però només s'han trobat una extensió v1:"
 msgstr[1] "el repositori és versió 0, però només s'han trobat extensions v1:"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "s'ha produït un error en obrir «%s»"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "massa gran per a ser un fitxer .git: «%s»"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "error en llegir %s"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format gitfile no vàlid: %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "sense camí al gitfile: %s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "no és un repositori de git: %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "«$%s» massa gran"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no és un repositori de git: «%s»"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "no es pot canviar de directori a «%s»"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "no es pot tornar al directori de treball actual"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "s'ha produït un error en fer stat a «%*s%s%s»"
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no es pot canviar a «%s»"
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "no és un repositori de git (ni cap dels directoris pares): %s"
 
-#: setup.c:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8902,7 +8836,7 @@ msgstr ""
 "no és un repositori de git (ni cap pare fins al punt de muntatge %s)\n"
 "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)."
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8911,16 +8845,16 @@ msgstr ""
 "hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
 "El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "el «fork» ha fallat"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "«setsid» ha fallat"
 
-#: sparse-index.c:273
-#, fuzzy, c-format
+#: sparse-index.c:289
+#, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "l'entrada d'índex és un directori, però no dispers (%08x)"
 
@@ -8976,13 +8910,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u bytes/s"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "no s'ha pogut obrir «%s» per a escriptura"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "no s'ha pogut editar «%s»"
@@ -9076,7 +9010,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "ha fallat el procés per al submòdul «%s»"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 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."
 
@@ -9211,7 +9145,7 @@ msgstr "s'ha produït un error en fer lstat a «%s»"
 #: trailer.c:244
 #, 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 «trailer» «%s» ha fallat"
 
 #: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566
 #: trailer.c:570
@@ -9228,7 +9162,7 @@ msgstr "més d'un %s"
 #: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
-msgstr "testimoni de remolc buit en el remolc «%.*s»"
+msgstr "testimoni de «trailer» buit en el «trailer» «%.*s»"
 
 #: trailer.c:763
 #, c-format
@@ -9325,7 +9259,7 @@ msgstr "el protocol no permet establir el camí del servei remot"
 msgid "invalid remote service path"
 msgstr "el camí del servei remot no és vàlid"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "opció no admesa pel protocol"
 
@@ -9335,7 +9269,6 @@ msgid "can't connect to subservice %s"
 msgstr "no es pot connectar al subservei %s"
 
 #: transport-helper.c:693 transport.c:404
-#, fuzzy
 msgid "--negotiate-only requires protocol v2"
 msgstr "--negotiate-only requereix el protocol v2"
 
@@ -9344,55 +9277,54 @@ msgid "'option' without a matching 'ok/error' directive"
 msgstr "«option» sense una directiva «ok/error» coincident"
 
 #: transport-helper.c:798
-#, fuzzy, c-format
+#, c-format
 msgid "expected ok/error, helper said '%s'"
-msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\""
+msgstr "s'esperava error/OK, l'ajudant ha dit «%s»"
 
 #: transport-helper.c:859
-#, fuzzy, c-format
+#, c-format
 msgid "helper reported unexpected status of %s"
-msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges"
+msgstr "l'ajudant ha informat d'un estat inesperat de %s"
 
 #: transport-helper.c:942
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support dry-run"
-msgstr "els ajudants no donen suport a l'execució seca"
+msgstr "l'ajudant %s no admet dry-run"
 
 #: transport-helper.c:945
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support --signed"
-msgstr "els ajudants per cents no són compatibles --signed"
+msgstr "l'ajudant %s no admet --signed"
 
 #: transport-helper.c:948
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support --signed=if-asked"
-msgstr "l'ajudant per cents no admet --signed=if-asked"
+msgstr "l'ajudant %s no admet --signed=if-asked"
 
 #: transport-helper.c:953
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support --atomic"
-msgstr "els ajudants no admeten --atomic"
+msgstr "l'ajudant %s no admet --atomic"
 
 #: transport-helper.c:957
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support --%s"
-msgstr "els ajudants per cents no són compatibles --signed"
+msgstr "l'ajudant %s no admet --%s"
 
 #: transport-helper.c:964
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support 'push-option'"
-msgstr "els ajudants no donen suport a «push-option»"
+msgstr "l'ajudant %s no admet «push-option»"
 
 #: transport-helper.c:1064
-#, fuzzy
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
-"remot-helper no permet prémer; es necessiten especificacions de referència"
+"remot-helper no permet pujar; es necessiten especificacions de referència"
 
 #: transport-helper.c:1069
-#, fuzzy, c-format
+#, c-format
 msgid "helper %s does not support 'force'"
-msgstr "els ajudants no donen suport a «force»"
+msgstr "l'ajudant %s no admet «force»"
 
 #: transport-helper.c:1116
 msgid "couldn't run fast-export"
@@ -9403,33 +9335,33 @@ msgid "error while running fast-export"
 msgstr "error en executar l'exportació ràpida"
 
 #: transport-helper.c:1146
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
 "Perhaps you should specify a branch.\n"
 msgstr ""
-"No hi ha referències en comú i no n'hi ha cap especificat. Potser hauríeu "
-"d'especificar una branca com ara «master»."
+"No hi ha referències en comú i no n'hi ha cap d'especificada.\n"
+"No es farà res. Potser hauríeu d'especificar una branca.\n"
 
 #: transport-helper.c:1228
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported object format '%s'"
-msgstr "objecte mal format a «%s»"
+msgstr "format d'objecte no suportat «%s»"
 
 #: transport-helper.c:1237
-#, fuzzy, c-format
+#, c-format
 msgid "malformed response in ref list: %s"
-msgstr "resposta mal formada en la llista de referències"
+msgstr "resposta mal formada al llistat de referències: %s"
 
 #: transport-helper.c:1389
-#, fuzzy, c-format
+#, c-format
 msgid "read(%s) failed"
-msgstr "ha fallat read(%)"
+msgstr "ha fallat la lectura(%s)"
 
 #: transport-helper.c:1416
-#, fuzzy, c-format
+#, c-format
 msgid "write(%s) failed"
-msgstr "ha fallat l(%)"
+msgstr "ha fallat l'escriptura(%s)"
 
 #: transport-helper.c:1465
 #, c-format
@@ -9437,14 +9369,14 @@ msgid "%s thread failed"
 msgstr "%s ha fallat el fil"
 
 #: transport-helper.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "%s thread failed to join: %s"
-msgstr "el fil per cents no s'ha pogut unir als percentatges"
+msgstr "el fil %s no s'ha pogut unir: %s"
 
 #: transport-helper.c:1488 transport-helper.c:1492
 #, c-format
 msgid "can't start thread for copying data: %s"
-msgstr "no es pot iniciar el fil per copiar les dades: %s"
+msgstr "no es pot iniciar el fil per a copiar les dades: %s"
 
 #: transport-helper.c:1529
 #, c-format
@@ -9458,7 +9390,7 @@ msgstr "el procés %s ha fallat"
 
 #: transport-helper.c:1551 transport-helper.c:1560
 msgid "can't start thread for copying data"
-msgstr "no es pot iniciar el fil per copiar dades"
+msgstr "no es pot iniciar el fil per a copiar dades"
 
 #: transport.c:116
 #, c-format
@@ -9549,10 +9481,9 @@ msgstr ""
 msgid "Aborting."
 msgstr "S'està avortant."
 
-#: transport.c:1344
-#, fuzzy
+#: transport.c:1343
 msgid "failed to push all needed submodules"
-msgstr "no s'ha pogut prémer tots els submòduls necessaris"
+msgstr "no s'han pogut pujar tots els submòduls necessaris"
 
 #: tree-walk.c:33
 msgid "too-short tree object"
@@ -9570,43 +9501,43 @@ msgstr "nom de fitxer buit en una entrada d'arbre"
 msgid "too-short tree file"
 msgstr "fitxer d'arbre massa curt"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a agafar:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
+"Els canvis locals als fitxers següents se sobreescriurien per a fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9615,7 +9546,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de %s."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9624,7 +9555,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9633,16 +9564,24 @@ msgstr ""
 "En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr "S'ha rebutjat suprimir el directori de treball actual:\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per a agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9651,7 +9590,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien en agafar:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9660,7 +9599,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien en fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9669,7 +9608,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien en fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9678,7 +9617,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9687,43 +9626,43 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, 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 ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a agafar:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per a fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9732,7 +9671,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9741,12 +9680,12 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrada «%s» encavalca amb «%s».  No es pot vincular."
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9755,76 +9694,75 @@ msgstr ""
 "No es pot actualitzar el submòdul:\n"
 "%s"
 
-#: unpack-trees.c:180
-#, fuzzy, c-format
+#: unpack-trees.c:186
+#, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Els camins següents no estan actualitzats i es van deixar a pesar que s'han "
-"dispersat els percentatges"
+"Els camins següents no estan actualitzats, i es van deixar, malgrat els patrons dispersos:\n"
+"%s"
 
-#: unpack-trees.c:182
-#, fuzzy, c-format
+#: unpack-trees.c:188
+#, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
-msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+msgstr ""
+"Els camins següents no es fusionen, i es van deixar, malgrat els patrons dispersos:\n"
+"%s"
 
-#: unpack-trees.c:184
-#, fuzzy, c-format
+#: unpack-trees.c:190
+#, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Els camins següents ja estaven presents i, per tant, no s'han actualitzat "
-"malgrat els patrons escassos."
+"Els camins següents ja estaven presents i, per tant, no s'han actualitzat malgrat els patrons dispersos.:\n"
+"%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "S'està avortant\n"
 
-#: unpack-trees.c:291
-#, fuzzy, c-format
+#: unpack-trees.c:297
+#, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr ""
 "Després de corregir els camins anteriors és possible que vulgueu executar "
-"`git sparse-checkout reapply`."
+"`git sparse-checkout reapply`.\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "S'estan actualitzant els fitxers"
 
-#: unpack-trees.c:384
-#, fuzzy
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 "colliding group is in the working tree:\n"
 msgstr ""
-"els camins següents han xocat (p. ex. camins sensibles a majúscules i "
-"minúscules en un sistema de fitxers que no distingeix entre majúscules i "
-"minúscules) i només un del mateix grup de col·lisió es troba a l'arbre de "
-"treball"
+"els camins següents han col·lisionat (p. ex. camins sensibles a majúscules\n"
+"i minúscules en un sistema de fitxers que no distingeix entre majúscules i\n"
+"minúscules). Només un camí del mateix grup de col·lisió es troba a l'arbre\n"
+"de treball:\n"
 
-#: unpack-trees.c:1620
-#, fuzzy
+#: unpack-trees.c:1636
 msgid "Updating index flags"
-msgstr "Actualitzant els indicadors d’índex"
+msgstr "Actualitzant els indicadors d'índex"
 
-#: unpack-trees.c:2772
-#, fuzzy, c-format
+#: unpack-trees.c:2803
+#, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "l'arbre de treball i la comissió no seguida tenen entrades duplicades: %s"
 
-#: upload-pack.c:1561
-#, fuzzy
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
-msgstr "s'esperava una neteja després de les capacitats"
+msgstr "s'esperava una neteja després dels arguments del «fetch»"
 
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
@@ -9859,109 +9797,109 @@ msgstr "segment de camí «..» no vàlid"
 msgid "Fetching objects"
 msgstr "S'estan obtenint objectes"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "s'ha produït un error en llegir «%s»"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "«%s» a l'arbre de treball principal no és al directori del repositori"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "El fitxer «%s» no conté el camí absolut a la ubicació de l'arbre de treball"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "«%s» no existeix"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "«%s» no és un fitxer .git, codi d'error %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "«%s» no assenyala de tornada a «%s»"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "no és en un directori"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git no és un fitxer"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "fitxer .git malmès"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "fitxer .git malmès"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "no és un camí vàlid"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
 "no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un "
 "repositori"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir illegible"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir incorrecte"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "no és en un directori vàlid"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "el fitxer gitdir no existeix"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "fitxer gitdir no vàlid"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "el fitxer gitdir indica una ubicació no existent"
 
 #: wrapper.c:151
-#, fuzzy, c-format
+#, c-format
 msgid "could not setenv '%s'"
-msgstr "no s'ha pogut establir «%s»"
+msgstr "no s'ha pogut fer setenv «%s»"
 
 #: wrapper.c:203
 #, c-format
@@ -10014,11 +9952,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (useu «git rm <fitxer>...» per a senyalar resolució)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Canvis a cometre:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Canvis no «staged» per a cometre:"
 
@@ -10033,8 +9971,8 @@ msgstr "  (useu «git add/rm <fitxer>...» per a actualitzar què es cometrà)"
 #: wt-status.c:241
 msgid "  (use \"git restore <file>...\" to discard changes in working directory)"
 msgstr ""
-"  (useu «git restore <file>...» per a descartar canvis en el directori "
-"de treball)"
+"  (useu «git restore <file>...» per a descartar canvis en el directori de "
+"treball)"
 
 #: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
@@ -10118,22 +10056,22 @@ msgstr "contingut modificat, "
 msgid "untracked content, "
 msgstr "contingut no seguit, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "L'«stash» té actualment %d entrada"
 msgstr[1] "L'«stash» té actualment %d entrades"
 
-#: wt-status.c:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Submòduls canviats però no actualitzats:"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Canvis de submòdul a cometre:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10141,7 +10079,7 @@ msgstr ""
 "No modifiqueu ni elimineu la línia de dalt.\n"
 "Tot el que hi ha a sota s'ignorarà."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10152,109 +10090,113 @@ msgstr ""
 "S'ha trigat un %.2f segons a calcular els valors de la branca d'endavant i darrere.\n"
 "Podeu utilitzar «--no-ahead-behind» per a evitar-ho.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Teniu camins sense fusionar."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (arregleu els conflictes i executeu «git commit»)"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (useu «git merge --abort» per a avortar la fusió)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
 
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (useu «git commit» per a concloure la fusió)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Esteu enmig d'una sessió am."
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "El pedaç actual està buit."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (arregleu els conflictes i després executeu «git am --continue»)"
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (useu «git am --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid "  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr "  (useu «git am --allow-empty» per a enregistrar aquest pedaç com una comissió buida)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (useu «git am --abort» per a restaurar la branca original)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "Manca git-rebase-todo."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "No s'ha fet cap ordre."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Última ordre feta (%d ordre feta):"
 msgstr[1] "Últimes ordres fetes (%d ordres fetes):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (vegeu més en el fitxer %s)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "No manca cap ordre."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Ordre següent a fer (manca %d ordre):"
 msgstr[1] "Ordres següents a fer (manquen %d ordres):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (useu «git rebase --edit-todo» per a veure i editar)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Actualment esteu fent «rebase»."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 "  (arregleu els conflictes i després executeu «git rebase --continue»)"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (useu «git rebase --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (useu «git rebase --abort» per a agafar la branca original)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 "  (tots els conflictes estan arreglats: executeu «git rebase --continue»)"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10262,165 +10204,164 @@ msgstr ""
 "Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
 "«%s» en «%s»."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Actualment esteu dividint una comissió durant un «rebase»."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Una vegada que el vostre directori de treball sigui net, executeu «git "
 "rebase --continue»)"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Actualment esteu editant una comissió mentre es fa «rebase» de la branca "
 "«%s» en «%s»."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "Actualment esteu editant una comissió durant un «rebase»."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (useu «git commit --amend» per a esmenar la comissió actual)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (useu «git rebase --continue» una vegada que estigueu satisfet amb els "
 "vostres canvis)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Hi ha «cherry pick» actualment en curs."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (arregleu els conflictes i executeu «git cherry-pick --continue»)"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (executeu «git cherry-pick --continue» per a continuar)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (tots els conflictes estan arreglats: executeu «git cherry-pick "
 "--continue»)"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (useu «git cherry-pick --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (useu «git cherry-pick --abort» per a cancel·lar l'operació de «cherry "
 "pick»)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Una reversió està actualment en curs."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Actualment esteu revertint la comissió %s."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (arregleu els conflictes i executeu «git revert --continue»)"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (executeu «git revert --continue» per a continuar)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (tots els conflictes estan arreglats: executeu «git revert --continue»)"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (useu «git revert --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (useu «git revert --abort» per a cancel·lar l'operació de reversió)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Actualment esteu bisecant."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (useu «git bisect reset» per a tornar a la branca original)"
 
-#: wt-status.c:1547
-#, fuzzy
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
-msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
+msgstr "Esteu en un «sparse-checkout»."
 
-#: wt-status.c:1550
-#, fuzzy, c-format
+#: wt-status.c:1562
+#, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
-"Esteu en una baixada del pagament amb un 1% d'arxius seguits presents."
+"Esteu en un «sparse-checkout» amb un %d%% de fitxers seguits presents."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "En la branca "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "«rebase» interactiu en curs; sobre "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "«rebase» en curs; sobre "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD separat a "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD separat des de "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Actualment no s'és en cap branca."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Comissió inicial"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "No s'ha fet cap comissió encara"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Fitxers no seguits"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Fitxers ignorats"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10432,30 +10373,30 @@ msgstr ""
 "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
 "«git help status»)."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Els fitxers no seguits no estan llistats%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Sense canvis"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "no hi ha canvis afegits a cometre (useu «git add» o «git commit -a»)\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no hi ha canvis afegits a cometre\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10464,85 +10405,85 @@ msgstr ""
 "no hi ha res afegit a cometre però hi ha fitxers no seguits (useu «git add» "
 "per a seguir-los)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "no hi ha res a cometre (creeu/copieu fitxers i useu «git add» per a seguir-"
 "los)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "no hi ha res a cometre\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "No s'ha fet cap comissió encara a "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (sense branca)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "diferent"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "darrere "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "davant per "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no es pot %s: Teniu canvis «unstaged»."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "addicionalment, el vostre índex conté canvis sense cometre."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "no s'ha pogut enviar l'ordre IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "no s'ha pogut llegir la resposta IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "no s'ha pogut començar un fil «accept_thread» «%s»"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
-#, fuzzy, c-format
+#: compat/simple-ipc/ipc-unix-socket.c:904
+#, c-format
 msgid "could not start worker[0] for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
+msgstr "no s'ha pogut iniciar el fil[0] per a «%s»"
 
 #: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
@@ -10576,110 +10517,115 @@ msgstr "elimina «%s»\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'índex"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a «%s»"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar «%s»"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 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:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
-#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:550
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
-msgstr "fer una prova"
+msgstr "fes una prova"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "sigues detallat"
+
+#: builtin/add.c:371
 msgid "interactive picking"
-msgstr "recull interactiu"
+msgstr "selecció interactiva"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "registra només el fet que el camí s'afegirà més tard"
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 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:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 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:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
-"comproveu si els fitxers, fins i tot els absents, s'ignoren en fer una prova"
+"comprova si els fitxers, fins i tot els absents, s'ignoren en fer una prova"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
-#, fuzzy
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
-msgstr "inicialitza el «sparse-checkout» en mode con"
+msgstr "permet actualitzar entrada fora del con del «sparse-checkout»"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
-msgstr "passa per alt el bit executable dels fitxers llistats"
+msgstr "sobreescriu el bit executable dels fitxers llistats"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "avisa'm quan s'afegeixi un repositori incrustat"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "rerefons per a «git stash -p»"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10710,12 +10656,12 @@ msgstr ""
 "\n"
 "Vegeu «git help submodule» per a més informació."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "s'està afegint un repositori incrustat: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10725,51 +10671,27 @@ msgstr ""
 "Desactiveu aquest missatge executant\n"
 "«git config advice.addIgnoredFile false»"
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run és incompatible amb --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file és incompatible amb --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file és incompatible amb --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A i -u són mútuament incompatibles"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file és incompatible amb els arguments de «pathspec»"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul requereix --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "«%s» i l'especificació de camí no es poden usar juntes"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10779,111 +10701,119 @@ msgstr ""
 "Desactiveu aquest missatge executant\n"
 "«git config advice.addEmptyPathspec false»"
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Valor no vàlid per a --empty: %s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línia d'entrada mal formada: «%s»."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, 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»"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no s'ha pogut analitzar el pedaç «%s»"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 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:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "marca de temps no vàlida"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "línia Date no vàlida"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "desplaçament del fus horari no vàlid"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "s'ha produït un error en crear el directori «%s»"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, 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:1128
+#: builtin/am.c:1154
 #, 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:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Per a enregistrar un pedaç buit com a comissió buida, executeu «%s --allow-empty»."
+
+#: builtin/am.c:1161
 #, 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:1224
+#: builtin/am.c:1256
 msgid ""
 "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
-"Pedaç enviat amb format=flowed; es pot perdre l'espai al final de les línies."
-
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "El pedaç està buit."
+"Pedaç enviat amb format=flowed; es pot perdre l'espai al final de les "
+"línies."
 
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "manca la línia d'autor en la comissió %s"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "línia d'identitat no vàlida: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Al repositori li manquen els blobs necessaris per a retrocedir a una fusió "
 "de 3 vies."
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 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:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10891,75 +10821,94 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 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:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "S'ha produït un error en fusionar els canvis."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "El cos de la comissió és:"
 
 #. 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:1708
+#: builtin/am.c:1735
 #, c-format
 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:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "no s'ha pogut escriure el fitxer d'índex"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndex brut: no es poden aplicar pedaços (bruts: %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "S'està ometent: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "S'està creant una comissió buida: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "El pedaç està buit."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'està aplicant: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Useu «git am --show-current-patch=diff» per veure el pedaç que ha fallat"
+msgstr ""
+"Useu «git am --show-current-patch=diff» per a veure el pedaç que ha fallat"
+
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "No hi ha canvis - enregistrat com una comissió buida."
 
-#: builtin/am.c:1868
+#: builtin/am.c:1922
 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 ""
 "Cap canvi - heu oblidat d'usar «git add»?\n"
-"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
+"Si no hi ha res per a fer «stage», probablement alguna altra cosa ja ha\n"
 "introduït els mateixos canvis; potser voleu ometre aquest pedaç."
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 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"
@@ -10969,17 +10918,17 @@ msgstr ""
 "Heu de fer «git add» a cada fitxer amb conflictes resolts per a marcar-los com a tal.\n"
 "Podeu executar «git rm» en un fitxer per a acceptar «suprimit per ells» pel fitxer."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No s'ha pogut analitzar l'objecte «%s»."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "s'ha produït un error en netejar l'índex"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10987,179 +10936,187 @@ 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:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor no vàlid per a --patch-format: %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Valor no vàlid per --show-current-patch: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s és incompatible amb --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "les opcions «%s=%s» i «%s=%s» no es poden usar juntes"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "silenciós"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
-msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
+msgstr "afegeix un «trailer» tipus «Signed-off-by» al missatge de comissió"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa l'indicador -k a git-mailinfo"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa l'indicador -b a git-mailinfo"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa l'indicador -m a git-mailinfo"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
-"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
+"no passis l'indicador --keep-cr a git-mailsplit independentment d'am.keepcr"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "passa-ho a través del git-mailinfo"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "passa-ho a través de git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
-#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
+#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:316
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
-msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
+msgstr "sobreescriu el missatge d'error si falla l'aplicació del pedaç"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaços després de resoldre un conflicte"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "restaura la branca original i interromp l'operació d'apedaçament"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "interromp l'operació d'apedaçament però manté HEAD on és"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "mostra el pedaç que s'està aplicant"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "registra el pedaç buit com una comissió buida"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
-msgstr "usa el marc de temps actual per la data d'autor"
+msgstr "usa la marca de temps actual per a la data d'autor"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:175 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "com gestionar les comissions buides"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(ús intern per a git-rebase)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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 ""
-"Fa molt que l'opció -b/--binary no ha fet res, i\n"
+"Fa molt que l'opció -b/--binary no fa res, i\n"
 "s'eliminarà. No l'useu més."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
-msgstr "S'ha produït un error en llegir l'índex"
+msgstr "s'ha produït un error en llegir l'índex"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, 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:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11168,11 +11125,11 @@ msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
 "Useu «git am --abort» per a eliminar-lo."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operació de resolució no està en curs; no reprenem."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "el mode interactiu requereix pedaços a la línia d'ordres"
 
@@ -11290,9 +11247,9 @@ msgid "please use two different terms"
 msgstr "useu dos termes diferents"
 
 #: builtin/bisect--helper.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "We are not bisecting.\n"
-msgstr "No estem bisecant."
+msgstr "No estem bisecant.\n"
 
 #: builtin/bisect--helper.c:218
 #, c-format
@@ -11300,17 +11257,17 @@ msgid "'%s' is not a valid commit"
 msgstr "«%s» no és una comissió vàlida"
 
 #: builtin/bisect--helper.c:227
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
-"no s'ha pogut comprovar l'original HEAD «%s». Proveu «git bisect reset "
+"no s'ha pogut agafar la HEAD original «%s». Proveu «git bisect reset "
 "<commit>»."
 
 #: builtin/bisect--helper.c:271
-#, fuzzy, c-format
+#, c-format
 msgid "Bad bisect_write argument: %s"
-msgstr "Arguments de bisectriu incorrectes"
+msgstr "Argument «bisect_write» incorrecte: %s"
 
 #: builtin/bisect--helper.c:276
 #, c-format
@@ -11323,28 +11280,29 @@ msgid "couldn't open the file '%s'"
 msgstr "no s'ha pogut obrir el fitxer «%s»"
 
 #: builtin/bisect--helper.c:314
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr "Ordre no vàlida esteu actualment en un percentatge/%s bisect"
+msgstr "Ordre no vàlida: esteu actualment en una bisecció %s/%s"
 
 #: builtin/bisect--helper.c:341
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
-"Heu de donar-me com a mínim un per cents i un per cents de revisió. Podeu "
-"utilitzar «git bisectrius» i «git bisectris» per a això."
+"Heu de donar com a mínim un %s i una revisió %s.\n"
+"Podeu usar «git bisect %s» i «git bisect %s» per a això."
 
 #: builtin/bisect--helper.c:345
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
 "You then need to give me at least one %s and %s revision.\n"
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
-"Heu de començar per «git bisect start». \n"
-"Després heu de donar-me com a mínim un per cents i per cents revisió. Podeu utilitzar «git bisect %s» i «git bisect %s» per a això."
+"Heu de començar amb «git bisect start».\n"
+"Heu de donar com a mínim un %s i una revisió %s.\n"
+"Podeu usar «git bisect %s» i «git bisect %s» per a això."
 
 #: builtin/bisect--helper.c:365
 #, c-format
@@ -11363,13 +11321,13 @@ msgid "no terms defined"
 msgstr "cap terme definit"
 
 #: builtin/bisect--helper.c:437
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
 "and %s for the new state.\n"
 msgstr ""
-"Els seus actuals termes són percentatges per al vell Estat i percentatges "
-"per al nou Estat."
+"Els termes actuals són %s per a l'estat antic\n"
+"i %s per al nou estat.\n"
 
 #: builtin/bisect--helper.c:447
 #, c-format
@@ -11381,9 +11339,8 @@ msgstr ""
 "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
 
 #: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038
-#, fuzzy
 msgid "revision walk setup failed\n"
-msgstr "la configuració del passeig per revisions ha fallat"
+msgstr "la configuració del recorregut de revisions ha fallat\n"
 
 #: builtin/bisect--helper.c:536
 #, c-format
@@ -11406,7 +11363,7 @@ msgstr "«%s» no sembla ser una revisió vàlida"
 
 #: builtin/bisect--helper.c:713
 msgid "bad HEAD - I need a HEAD"
-msgstr "HEAD incorrecte - Cal un HEAD"
+msgstr "HEAD incorrecte - cal un HEAD"
 
 #: builtin/bisect--helper.c:728
 #, c-format
@@ -11453,9 +11410,9 @@ msgid "Bad rev input: %s"
 msgstr "Entrada amb revisió errònia: %s"
 
 #: builtin/bisect--helper.c:904
-#, fuzzy, c-format
+#, c-format
 msgid "Bad rev input (not a commit): %s"
-msgstr "Introducció de revisió errònia: $arg"
+msgstr "Entrada de revisió errònia (no és una comissió): %s"
 
 #: builtin/bisect--helper.c:936
 msgid "We are not bisecting."
@@ -11481,11 +11438,11 @@ msgid "running %s\n"
 msgstr "s'està executant %s\n"
 
 #: builtin/bisect--helper.c:1120
-#, fuzzy, c-format
+#, c-format
 msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
 msgstr ""
-"el pas de bisecció ha fallat:\n"
-"el codi de sortida $res de «$command» és < 0 o bé >= 128"
+"l'execució de la de bisecció ha fallat: codi de sortida %d de «%s» és < 0 o "
+">= 128"
 
 #: builtin/bisect--helper.c:1136
 #, c-format
@@ -11494,90 +11451,78 @@ msgstr "no es pot obrir «%s» per a escriptura"
 
 #: builtin/bisect--helper.c:1152
 msgid "bisect run cannot continue any more"
-msgstr "el pas de bisecció no pot continuar més"
+msgstr "l'execució de la bisecció no pot continuar més"
 
 #: builtin/bisect--helper.c:1154
 #, c-format
 msgid "bisect run success"
-msgstr "pas de bisecció reeixit"
+msgstr "execució de bisecció amb èxit"
 
 #: builtin/bisect--helper.c:1157
-#, fuzzy, c-format
+#, c-format
 msgid "bisect found first bad commit"
-msgstr "bisecant amb només una comissió %s"
+msgstr "la bisecció ha trobat una primera comissió errònia"
 
 #: builtin/bisect--helper.c:1160
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
 "code %d"
 msgstr ""
-"el pas de bisecció ha fallat:\n"
-"«bisect_state $state» ha sortit amb el codi d'error $res"
+"l'execució de la bisecció ha fallat: «git bisect--helper --bisect-state %s» "
+"ha sortit amb el codi d'error %d"
 
 #: builtin/bisect--helper.c:1192
-#, fuzzy
 msgid "reset the bisection state"
 msgstr "restableix l'estat de la bisecció"
 
 #: builtin/bisect--helper.c:1194
-#, fuzzy
 msgid "check whether bad or good terms exist"
-msgstr "comprova si existeixen termes incorrectes o bons"
+msgstr "comprova si existeixen termes correctes o incorrectes"
 
 #: builtin/bisect--helper.c:1196
-#, fuzzy
 msgid "print out the bisect terms"
-msgstr "imprimeix els termes de la bisectriu"
+msgstr "imprimeix els termes de la bisecció"
 
 #: builtin/bisect--helper.c:1198
-#, fuzzy
 msgid "start the bisect session"
-msgstr "inicia la sessió bisect"
+msgstr "inicia la sessió bisecció"
 
 #: builtin/bisect--helper.c:1200
-#, fuzzy
 msgid "find the next bisection commit"
-msgstr "no es pot esmenar una comissió no existent"
+msgstr "troba la comissió de bisecció següent"
 
 #: builtin/bisect--helper.c:1202
-#, fuzzy
 msgid "mark the state of ref (or refs)"
-msgstr "marca l'estat de ref (o refs)"
+msgstr "marca l'estat de la referència o referències"
 
 #: builtin/bisect--helper.c:1204
-#, fuzzy
 msgid "list the bisection steps so far"
-msgstr "restableix l'estat de la bisecció"
+msgstr "mostra les passes de la bisecció fins ara"
 
 #: builtin/bisect--helper.c:1206
-#, fuzzy
 msgid "replay the bisection process from the given file"
 msgstr "torna a reproduir el procés de bisecció des del fitxer donat"
 
 #: builtin/bisect--helper.c:1208
-#, fuzzy
 msgid "skip some commits for checkout"
-msgstr "la branca o entrega a agafar"
+msgstr "omet algunes comissions en agafar"
 
 #: builtin/bisect--helper.c:1210
-#, fuzzy
 msgid "visualize the bisection"
-msgstr "inicia la sessió bisect"
+msgstr "visualitza la bisecció"
 
 #: builtin/bisect--helper.c:1212
-#, fuzzy
 msgid "use <cmd>... to automatically bisect."
-msgstr "no cometis automàticament"
+msgstr "useu <cmd>... per a fer una bisecció automàticament."
 
 #: builtin/bisect--helper.c:1214
 msgid "no log for BISECT_WRITE"
 msgstr "no hi ha registre per a BISECT_WRITE"
 
 #: builtin/bisect--helper.c:1229
-#, fuzzy
 msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset no requereix cap argument ni una comissió"
+msgstr "--bisect-reset no requereix cap argument ni comissió"
 
 #: builtin/bisect--helper.c:1234
 msgid "--bisect-terms requires 0 or 1 argument"
@@ -11588,14 +11533,12 @@ msgid "--bisect-next requires 0 arguments"
 msgstr "--bisect-next no requereix cap argument"
 
 #: builtin/bisect--helper.c:1254
-#, fuzzy
 msgid "--bisect-log requires 0 arguments"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--bisect-log no requereix cap argument"
 
 #: builtin/bisect--helper.c:1259
-#, fuzzy
 msgid "no logfile given"
-msgstr "Cap fitxer de registre donat"
+msgstr "no s'ha donat cap fitxer de registre"
 
 #: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
@@ -11626,114 +11569,99 @@ msgstr "valor no vàlid per a «blame.coloring»"
 #: builtin/blame.c:841
 #, c-format
 msgid "cannot find revision %s to ignore"
-msgstr "no s'ha pogut trobar la revisió %s per ignorar"
+msgstr "no s'ha pogut trobar la revisió %s a ignorar"
 
 #: builtin/blame.c:863
-#, fuzzy
 msgid "show blame entries as we find them, incrementally"
-msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
+msgstr "mostra les entrades «blame» mentre les trobem, incrementalment"
 
 #: builtin/blame.c:864
-#, fuzzy
 msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
-"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
+"no mostris els noms d'objectes de les comissions de frontera (per defecte: "
 "desactivat)"
 
 #: builtin/blame.c:865
-#, fuzzy
 msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
-"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
+"no tractis les comissions arrel com de frontera (per defecte: desactivat)"
 
 #: builtin/blame.c:866
 msgid "show work cost statistics"
 msgstr "mostra les estadístiques de preu de treball"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:119 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "força l'informe de progrés"
 
 #: builtin/blame.c:868
-#, fuzzy
 msgid "show output score for blame entries"
-msgstr "Mostra la puntuació de sortida de les entrades «blame»"
+msgstr "mostra la puntuació de sortida de les entrades «blame»"
 
 #: builtin/blame.c:869
-#, fuzzy
 msgid "show original filename (Default: auto)"
-msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
+msgstr "mostra el nom de fitxer original (per defecte: automàtic)"
 
 #: builtin/blame.c:870
-#, fuzzy
 msgid "show original linenumber (Default: off)"
-msgstr "Mostra el número de línia original (Per defecte: desactivat)"
+msgstr "mostra el número de línia original (per defecte: desactivat)"
 
 #: builtin/blame.c:871
-#, fuzzy
 msgid "show in a format designed for machine consumption"
-msgstr "Presenta en un format dissenyat per consumpció per màquina"
+msgstr "presenta en un format dissenyat per a ser consumit per una màquina"
 
 #: builtin/blame.c:872
-#, fuzzy
 msgid "show porcelain format with per-line commit information"
-msgstr "Mostra el format de porcellana amb informació de comissió per línia"
+msgstr "mostra en format de porcellana amb informació de comissió per línia"
 
 #: builtin/blame.c:873
-#, fuzzy
 msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
-"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
+"usa el mateix mode de sortida que git-annotate (per defecte: desactivat)"
 
 #: builtin/blame.c:874
-#, fuzzy
 msgid "show raw timestamp (Default: off)"
-msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
+msgstr "mostra la marca de temps en cru (per defecte: desactivat)"
 
 #: builtin/blame.c:875
-#, fuzzy
 msgid "show long commit SHA1 (Default: off)"
-msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
+msgstr "mostra l'SHA1 de comissió llarg (per defecte: desactivat)"
 
 #: builtin/blame.c:876
-#, fuzzy
 msgid "suppress author name and timestamp (Default: off)"
-msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
+msgstr "omet el nom d'autor i la marca de temps (per defecte: desactivat)"
 
 #: builtin/blame.c:877
-#, fuzzy
 msgid "show author email instead of name (Default: off)"
 msgstr ""
-"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
+"mostra el correu electrònic de l'autor en comptes del nom (per defecte: "
 "desactivat)"
 
 #: builtin/blame.c:878
 msgid "ignore whitespace differences"
-msgstr "Ignora les diferències d'espai en blanc"
+msgstr "ignora les diferències d'espai en blanc"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "rev"
 
 #: builtin/blame.c:879
-#, fuzzy
 msgid "ignore <rev> when blaming"
-msgstr "Ignora <rev> en culpar"
+msgstr "ignora <rev> en fer «blame»"
 
 #: builtin/blame.c:880
 msgid "ignore revisions from <file>"
-msgstr "Ignora les revisions de <fitxer>"
+msgstr "ignora les revisions de <fitxer>"
 
 #: builtin/blame.c:881
-#, fuzzy
 msgid "color redundant metadata from previous line differently"
 msgstr ""
-"color les metadades redundants de la línia anterior de manera diferent"
+"acoloreix les metadades redundants de la línia anterior de manera diferent"
 
 #: builtin/blame.c:882
 msgid "color lines by age"
@@ -11757,7 +11685,7 @@ msgstr "puntuació"
 
 #: builtin/blame.c:886
 msgid "find line copies within and across files"
-msgstr "troba còpies delínia dins i a través dels fitxers"
+msgstr "troba còpies de línia dins i a través dels fitxers"
 
 #: builtin/blame.c:887
 msgid "find line movements within and across files"
@@ -11768,11 +11696,10 @@ msgid "range"
 msgstr "rang"
 
 #: builtin/blame.c:889
-#, fuzzy
 msgid "process only line range <start>,<end> or function :<funcname>"
-msgstr "Processa només el rang de línies n,m, comptant des d'1"
+msgstr "processa només el rang <start>,<end> o la funció :<funcname>"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -11784,18 +11711,18 @@ msgstr ""
 #. among various forms of relative timestamps, but
 #. your language may need more or fewer display
 #. columns.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "el fitxer %s té només %lu línia"
 msgstr[1] "el fitxer %s té només %lu línies"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "S'està fent un «blame»"
 
@@ -11827,7 +11754,7 @@ msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opcions>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11837,7 +11764,7 @@ msgstr ""
 "         fusionat a «%s», però encara no\n"
 "         s'ha fusionat a HEAD."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11847,12 +11774,12 @@ msgstr ""
 "         s'ha fusionat a «%s», encara que està\n"
 "         fusionada a HEAD."
 
-#: builtin/branch.c:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11861,7 +11788,7 @@ msgstr ""
 "La branca «%s» no està totalment fusionada.\n"
 "Si esteu segur que la voleu suprimir, executeu «git branch -D %s»."
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "L'actualització del fitxer de configuració ha fallat"
 
@@ -11873,103 +11800,103 @@ msgstr "no es pot usar -a amb -d"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "no s'ha trobat la branca «%s»."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, 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:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca %s (era %s).\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "no s'ha pogut analitzar la cadena de format"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "no s'ha pogut resoldre HEAD"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) apunta fora de refs/heads/"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "S'està fent «rebase» en la branca %s a %s"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branca %s s'està bisecant a %s"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 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:516
+#: builtin/branch.c:520
 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:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branca no vàlid: «%s»"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "La còpia de la branca ha fallat"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, 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:580
+#: builtin/branch.c:584
 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:582
+#: builtin/branch.c:586
 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:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11980,180 +11907,176 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb «%c».\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostra el hash i l'assumpte, doneu dues vegades per a la branca font"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "configura el mode de seguiment (vegeu git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "estableix la configuració del seguiment de la branca"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "treu la informació de la font"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "usa sortida amb colors"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "imprimeix només les branques que continguin la comissió"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "imprimeix només les branques que no continguin la comissió"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "llista les branques amb seguiment remot i les locals"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 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:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "copia una branca i el seu registre de referència"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "copia una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "mostra el nom de la branca actual"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "objecte"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format a usar en la sortida"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column i --verbose són incompatibles"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "cal el nom de branca"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 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:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Encara no hi ha cap comissió en la branca «%s»."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hi ha cap branca amb nom «%s»."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "hi ha massa branques per a una operació de còpia"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "hi ha massa arguments per a una operació de canvi de nom"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "hi ha massa arguments per a establir una nova font"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12161,45 +12084,44 @@ msgstr ""
 "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap "
 "branca."
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no existeix la branca «%s»"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branca «%s» no existeix"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "hi ha massa arguments per a desassignar la font"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca."
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branca «%s» no té informació de font"
 
-#: builtin/branch.c:856
-#, fuzzy
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
 msgstr ""
-"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar "
-"-a|-r --list <pattern>?"
+"Les opcions -a i -r a «git branch» no prenen un nom de branca.\n"
+"Volíeu usar -a|-r --list <pattern>?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
-"L'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
+"l'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
 "upstream-to»."
 
 #: builtin/bugreport.c:16
@@ -12217,19 +12139,18 @@ msgstr "informació del compilador: "
 
 #: builtin/bugreport.c:35
 msgid "libc info: "
-msgstr "Informació de la libc: "
+msgstr "informació de la libc: "
 
 #: builtin/bugreport.c:49
-#, fuzzy
 msgid "not run from a git repository - no hooks to show\n"
-msgstr "no és un repositori de git: %s"
+msgstr ""
+"no s'està executant en un repositori de git - no hi ha lligams a mostrar\n"
 
 #: builtin/bugreport.c:62
 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
 
 #: builtin/bugreport.c:69
-#, fuzzy
 msgid ""
 "Thank you for filling out a Git bug report!\n"
 "Please answer the following questions to help us understand your issue.\n"
@@ -12247,36 +12168,42 @@ msgid ""
 "Please review the rest of the bug report below.\n"
 "You can delete any lines you don't wish to share.\n"
 msgstr ""
-"Gràcies per emplenar un informe d'error del Git! Responeu les següents "
-"preguntes per ajudar-nos a entendre el vostre problema. Què heu fet abans "
-"que passés l'error? (Pas per reproduir el vostre problema) Què espereu que "
-"passi? (Comportament explotat) Què ha passat? (Comportament real) Què és "
-"diferent entre el que s'esperava i què ha passat? Qualsevol altra cosa que "
-"vulgueu afegir Reviseu la resta de l'informe d'error de sota. Podeu eliminar"
-" qualsevol línia que vulgueu."
+"Gràcies per informar d'un error del Git!\n"
+"Responeu les preguntes en anglès per a ajudar-nos a entendre el problema.\n"
+"\n"
+"What did you do before the bug happened? (Steps to reproduce your issue)\n"
+"\n"
+"What did you expect to happen? (Expected behavior)\n"
+"\n"
+"What happened instead? (Actual behavior)\n"
+"\n"
+"What's different between what you expected and what actually happened?\n"
+"\n"
+"Anything else you want to add:\n"
+"\n"
+"Reviseu la resta de l'informe d'error de sota.\n"
+"Podeu eliminar qualsevol línia que vulgueu.\n"
 
 #: builtin/bugreport.c:108
 msgid "specify a destination for the bugreport file"
 msgstr "especifiqueu una destinació per al fitxer d'informe d'error"
 
 #: builtin/bugreport.c:110
-#, fuzzy
 msgid "specify a strftime format suffix for the filename"
-msgstr "especifiqueu un sufix de format strftime per al nom de fitxer"
+msgstr "especifiqueu un sufix en format strftime per al nom de fitxer"
 
 #: builtin/bugreport.c:132
-#, fuzzy, c-format
+#, c-format
 msgid "could not create leading directories for '%s'"
-msgstr "no s'han pogut crear els directoris inicials de «%s»"
+msgstr "no s'han pogut crear els directoris principals de «%s»"
 
 #: builtin/bugreport.c:139
 msgid "System Info"
 msgstr "Informació del sistema"
 
 #: builtin/bugreport.c:142
-#, fuzzy
 msgid "Enabled Hooks"
-msgstr "no s'ha pogut bifurcar"
+msgstr "Habilita els lligams"
 
 #: builtin/bugreport.c:149
 #, c-format
@@ -12342,9 +12269,8 @@ msgid "Need a repository to unbundle."
 msgstr "Cal un repositori per a desfer un farcell."
 
 #: builtin/bundle.c:185
-#, fuzzy
 msgid "Unbundling objects"
-msgstr "S'estan indexant objectes"
+msgstr "S'estan desagrupant objectes"
 
 #: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
@@ -12464,8 +12390,8 @@ msgstr "llegeix els noms de fitxer de stdin"
 msgid "terminate input and output records by a NUL character"
 msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrés"
 
@@ -12523,10 +12449,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<opcions>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "cadena"
 
@@ -12591,99 +12517,94 @@ msgstr "git switch [<options>] [<branch>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opcions>] [--source=<branca>] <fitxer>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "el camí «%s» no té la nostra versió"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "el camí «%s» no té la seva versió"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "el camí «%s» no té totes les versions necessàries"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "el camí «%s» no té les versions necessàries"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "camí «%s»: no es pot fusionar"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Recreat un conflicte de fusió"
 msgstr[1] "Recreats %d conflictes de fusió"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "S'ha actualitzat %d camí des de %s"
 msgstr[1] "S'han actualitzat %d camins des de %s"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "S'ha actualitzat un camí des de l'índex"
 msgstr[1] "S'ha actualitzat %d camins des de l'índex"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "«%s» no es pot usar amb actualització de camins"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» no es pot usar amb %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, 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."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "no s'ha especificat ni «%s» ni «%s»"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "«%s» s'ha d'utilitzar quan no s'especifica «%s»"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "«%s» o «%s» no poden utilitzar-se amb %s"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "el camí «%s» està sense fusionar"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre índex actual"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12692,50 +12613,50 @@ msgstr ""
 "no es pot continuar amb els canvis «staged» als fitxers següents:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No es pot fer reflog per a «%s»: %s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca «%s»\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ja esteu en «%s»\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "S'ha canviat i restablert a la branca «%s»\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "S'ha canviat a la branca nova «%s»\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca «%s»\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12758,7 +12679,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12785,29 +12706,28 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de néixer"
 
-#: builtin/checkout.c:1177
-#, fuzzy, c-format
+#: builtin/checkout.c:1196
+#, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
 "Please use -- (and optionally --no-guess) to disambiguate"
 msgstr ""
-"\"%s\" podria ser tant un fitxer local com una branca de seguiment. Si us "
-"plau useu -- (i opcionalment --no-gues) per a desambiguar"
+"«%s» podria ser tant un fitxer local com una branca de seguiment.\n"
+"Useu -- (i opcionalment --no-guess) per a desambiguar-ho"
 
-#: builtin/checkout.c:1184
-#, fuzzy
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12818,57 +12738,60 @@ msgid ""
 "one remote, e.g. the 'origin' remote, consider setting\n"
 "checkout.defaultRemote=origin in your config."
 msgstr ""
-"Si voleu comprovar una branca de seguiment remota p. ex. «origen» podeu fer-"
-"ho classificant completament el nom amb l'opció --track git checkout --track"
-" origin/<name> Si voleu tenir sempre agafades d'un ambigu <name> preferiu un"
-" remot p. ex. el paràmetre remot 'origin' considereu "
-"agafar.defaultRemote=origin a la vostra configuració."
+"Si voleu agafar una branca de seguiment remota, p. ex. «origin», podeu\n"
+"fer-ho especificant el nom complet amb l'opció --track:\n"
+"\n"
+"    git checkout --track origin/<nom>\n"
+"\n"
+"Si voleu que en agafar un branca amb un <nom> ambigu s'usi una branca\n"
+"remota, p. ex. «origin» al remot, considereu configurar l'opció\n"
+"checkout.defaultRemote=origin en la vostra configuració."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "només s'esperava una referència"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava només una referència, s'han donat %d."
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referència no vàlida: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referència no és un arbre: %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "s'espera una branca, s'ha obtingut «%s»"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "s'espera una branca, s'ha obtingut la comissió «%s»"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12876,34 +12799,31 @@ msgstr ""
 "no es pot canviar de branca mentre es fusiona\n"
 "Considereu usar «git merge --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1409
-#, fuzzy
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgstr ""
-"no es pot canviar de branca al mig d'una sessió am Considereu \"git am "
-"--quit\" o \"git worktree add\"."
+"no es pot canviar de branca en mig d'una sessió «am»\n"
+"Considereu usar «git am --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1413
-#, fuzzy
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
-"no es pot canviar de branca mentre es rebase considera «git rebase --quit» o"
-" «git worktree add»."
+"no es pot canviar de branca mentre es fa «rebase»\n"
+"Considereu usar «git rebase --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1417
-#, fuzzy
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgstr ""
-"no es pot canviar de branca mentre «cherry pick» considera «git cherry-pick "
-"--quit» o «git worktree add»."
+"no es pot canviar de branca mentre es fa «cherry-pick»\n"
+"Considereu usar «git cherry-pick --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12911,140 +12831,127 @@ msgstr ""
 "no es pot canviar de branca mentre s'està revertint\n"
 "Considereu «git revert --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1425
-#, fuzzy
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
-msgstr "s'està canviant la branca mentre es bisect"
+msgstr "s'està canviant la branca mentre es fa una bisecció"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "«%s» no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» no es pot usar amb «%s»"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "«%s» no pot prendre <start-point>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "No es pot canviar la branca a la no comissió «%s»"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "manca branca o argument de comissió"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusió de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:322
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "estil de conflicte (fusió o diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "estil de conflicte (merge, diff3, o zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "estableix la informació de font de la branca nova"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "configura el mode de seguiment (vegeu git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 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:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camí només a entrades disperses"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c i --orphan són mútuament excloents"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "les opcions «-%c», «-%c», i «%s» no es poden usar juntes"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "falta el nom de la branca; proveu -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "no es pot resoldre %s"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta "
 "comissió"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach no accepta un argument de camí «%s»"
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file és incompatible amb --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file és incompatible amb --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13052,74 +12959,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
 "agafar de l'índex."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "heu d'especificar el camí o camins a restaurar"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "crea un registre de referència per a la branca nova"
 
-#: builtin/checkout.c:1787
-#, fuzzy
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "segon conjectura «git checkout <no-such-branch>» (per defecte)"
+msgstr "segona suposició «git checkout <no-such-branch>» (per defecte)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "utilitza el mode de superposició (per defecte)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "crea i canvia a una branca nova"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "crea/restableix i canvia a una branca"
 
-#: builtin/checkout.c:1837
-#, fuzzy
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
-msgstr "segon conjectura «git switch <no-such-branch>»"
+msgstr "segona suposició «git switch <no-such-branch>»"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "descarta les modificacions locals"
 
-#: builtin/checkout.c:1873
-#, fuzzy
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
-msgstr "de quin arbre agafar"
+msgstr "des de quin arbre agafar"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "restaura l'índex"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "restaura l'arbre de treball (per defecte)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignora les entrades sense fusionar"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "utilitza el mode de superposició"
 
@@ -13154,7 +13058,15 @@ msgstr "Ometria el repositori %s\n"
 msgid "could not lstat %s\n"
 msgstr "no s'ha pogut fer lstat %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "S'ha rebutjat suprimir el directori de treball actual\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Es rebutjarà eliminar el directori de treball actual\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13167,7 +13079,7 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13188,33 +13100,33 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Perdó (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, 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:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Selecciona els ítems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13232,52 +13144,52 @@ msgstr ""
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 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:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "No hi ha més fitxers a netejar; s'està sortint."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
 " clean"
@@ -13285,7 +13197,7 @@ msgstr ""
 "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13293,7 +13205,7 @@ msgstr ""
 "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x i -X no es poden usar junts"
 
@@ -13302,9 +13214,8 @@ msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opcions>] [--] <repositori> [<directori>]"
 
 #: builtin/clone.c:96
-#, fuzzy
 msgid "don't clone shallow repository"
-msgstr "per a clonar des d'un repositori local"
+msgstr "no clonis un repositori superficial"
 
 #: builtin/clone.c:98
 msgid "don't create a checkout"
@@ -13350,19 +13261,20 @@ msgstr "directori-de-plantilla"
 msgid "directory from which templates will be used"
 msgstr "directori des del qual s'usaran les plantilles"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "repositori de referència"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "usa --reference només en clonar"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nom"
@@ -13379,8 +13291,8 @@ msgstr "agafa <branca> en lloc de la HEAD del remot"
 msgid "path to git-upload-pack on the remote"
 msgstr "camí a git-upload-pack en el remot"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
-#: builtin/pull.c:208
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
+#: builtin/pull.c:212
 msgid "depth"
 msgstr "profunditat"
 
@@ -13388,8 +13300,8 @@ msgstr "profunditat"
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial de tal profunditat"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
-#: builtin/pull.c:211
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
+#: builtin/pull.c:215
 msgid "time"
 msgstr "data"
 
@@ -13397,17 +13309,17 @@ msgstr "data"
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una data específica"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
-#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1022
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
+#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "revisió"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona només una branca, HEAD o --branch"
 
@@ -13436,22 +13348,22 @@ msgstr "clau=valor"
 msgid "set config inside the new repository"
 msgstr "estableix la configuració dins del repositori nou"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:230 builtin/push.c:575 builtin/send-pack.c:200
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
+#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "específic al servidor"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
-#: builtin/pull.c:231 builtin/push.c:575 builtin/send-pack.c:201
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
+#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "opció a transmetre"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "usa només adreces IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "usa només adreces IPv6"
@@ -13478,9 +13390,9 @@ msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
 #: builtin/clone.c:322
-#, fuzzy, c-format
+#, c-format
 msgid "failed to start iterator over '%s'"
-msgstr "no s'ha pogut iniciar l'iterador per sobre de «%s»"
+msgstr "no s'ha pogut iniciar l'iterador sobre «%s»"
 
 #: builtin/clone.c:353
 #, c-format
@@ -13503,15 +13415,14 @@ msgid "done.\n"
 msgstr "fet.\n"
 
 #: builtin/clone.c:403
-#, fuzzy
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry with 'git restore --source=HEAD :/'\n"
 msgstr ""
-"El clonatge ha tingut èxit però ha fallat. Podeu inspeccionar el que s'ha "
-"comprovat amb «git status» i tornar-ho a provar amb «git restore "
-"--source=HEAD /»"
+"El clonatge ha tingut èxit, però no s'ha pogut agafar.\n"
+"Podeu inspeccionar el que s'ha agafat amb «git status»\n"
+"i tornar-ho a provar amb «git restore --source=HEAD :/»\n"
 
 #: builtin/clone.c:480
 #, c-format
@@ -13549,29 +13460,25 @@ msgstr "no es pot reempaquetar per a netejar"
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Hi ha massa arguments."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Heu d'especificar un repositori per a clonar."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les opcions --bare i --origin %s són incompatibles."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare i --separate-git-dir són incompatibles."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "les opcions «%s» i «%s %s» no es poden usar juntes"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "el repositori «%s» no existeix"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profunditat %s no és un nombre positiu"
@@ -13591,8 +13498,8 @@ msgstr "el camí destí «%s» ja existeix i no és un directori buit."
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball «%s» ja existeix."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no s'han pogut crear els directoris inicials de «%s»"
@@ -13716,7 +13623,7 @@ msgstr ""
 "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split "
 "options>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "directori"
 
@@ -13740,11 +13647,9 @@ msgid "unrecognized --split argument, %s"
 msgstr "argument --split no reconegut, %s"
 
 #: builtin/commit-graph.c:150
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected non-hex object ID: %s"
-msgstr ""
-"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut "
-"percentatges d'escombraries"
+msgstr "ID de l'objecte no hexadecimal inesperat: %s"
 
 #: builtin/commit-graph.c:155
 #, c-format
@@ -13753,16 +13658,15 @@ msgstr "no és un objecte vàlid: %s"
 
 #: builtin/commit-graph.c:205
 msgid "start walk at all refs"
-msgstr "comença a caminar en totes les referències"
+msgstr "comença el recorregut en totes les referències"
 
 #: builtin/commit-graph.c:207
 msgid "scan pack-indexes listed by stdin for commits"
 msgstr "explora els índexs del paquet llistats per a stdin per a comissions"
 
 #: builtin/commit-graph.c:209
-#, fuzzy
 msgid "start walk at commits listed by stdin"
-msgstr "comença a caminar a les comissions llistades per a stdin"
+msgstr "comença el recorregut per les comissions llistades per stdin"
 
 #: builtin/commit-graph.c:211
 msgid "include all commits already in the commit-graph file"
@@ -13777,9 +13681,9 @@ msgid "allow writing an incremental commit-graph file"
 msgstr "permet escriure un fitxer de graf de comissions incrementals"
 
 #: builtin/commit-graph.c:219
-#, fuzzy
 msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "nombre màxim de comissions en un graf de comissions no basat"
+msgstr ""
+"nombre màxim de comissions en un graf de comissions separades sense base"
 
 #: builtin/commit-graph.c:221
 msgid "maximum ratio between two levels of a split commit-graph"
@@ -13787,27 +13691,24 @@ msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit"
 
 #: builtin/commit-graph.c:223
 msgid "only expire files older than a given date-time"
-msgstr "fes caducar els objectes més antics que l'hora i data donades"
+msgstr "fes caducar només els objectes més antics que l'hora i data donades"
 
 #: builtin/commit-graph.c:225
-#, fuzzy
 msgid "maximum number of changed-path Bloom filters to compute"
-msgstr ""
-"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
+msgstr "nombre màxim de canvis de camí en filtres Bloom a calcular"
 
 #: builtin/commit-graph.c:251
-#, fuzzy
 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "usa com a màxim un dels --reachable --stdin-commits o --stdin-packs"
+msgstr "usa com a màxim un --reachable, --stdin-commits, o --stdin-packs"
 
-#: builtin/commit-graph.c:283
+#: builtin/commit-graph.c:282
 msgid "Collecting commits from input"
 msgstr "S'estan recollint les comissions de l'entrada"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
-#, fuzzy, c-format
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
+#, c-format
 msgid "unrecognized subcommand: %s"
-msgstr "subcomandes no reconeguts"
+msgstr "subordre no reconeguda: %s"
 
 #: builtin/commit-tree.c:18
 msgid ""
@@ -13822,7 +13723,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "s'han ignorat el pare %s duplicat"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "no és un nom d'objecte vàlid %s"
@@ -13845,13 +13746,13 @@ msgstr "pare"
 msgid "id of a parent commit object"
 msgstr "id d'un objecte de comissió pare"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "missatge de comissió"
 
@@ -13859,8 +13760,8 @@ msgstr "missatge de comissió"
 msgid "read commit log message from file"
 msgstr "llegeix el missatge de registre de comissió des d'un fitxer"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
-#: builtin/pull.c:176 builtin/revert.c:118
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
+#: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signa la comissió amb GPG"
 
@@ -13928,7 +13829,7 @@ msgstr ""
 "\n"
 "    git cherry-pick --continue\n"
 "\n"
-"per continuar seleccionant les comissions restants.\n"
+"per a continuar seleccionant les comissions restants.\n"
 "Si voleu ometre aquesta comissió, useu:\n"
 "\n"
 "    git cherry-pick --skip\n"
@@ -13938,10 +13839,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file amb -a no té sentit"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only no té sentit sense camí."
@@ -14029,8 +13926,8 @@ msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "no es pot combinar -m amb --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "les opcions «%s» i «%s:%s» no es poden usar juntes"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -14045,14 +13942,13 @@ msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
 #: builtin/commit.c:894
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
 "with '%c' will be ignored.\n"
 msgstr ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
-"comissió buit avorta la comissió.\n"
+"Introduïu el missatge de comissió per als vostres canvis.\n"
+"S'ignoraran les línies que comencin amb «%c».\n"
 
 #: builtin/commit.c:896
 #, c-format
@@ -14132,15 +14028,14 @@ msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
 #: builtin/commit.c:1026
-#, fuzzy
 msgid "unable to pass trailers to --trailers"
-msgstr "no s'ha pogut analitzar la capçalera de %s"
+msgstr "no s'han pogut passar els «trailers» a --trailers"
 
 #: builtin/commit.c:1066
 msgid "Error building trees"
-msgstr "Error en construir arbres"
+msgstr "Error en construir els arbres"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
@@ -14157,136 +14052,125 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode d'ignorància no vàlid «%s»"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fitxers no seguits no vàlid «%s»"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long i -z són incompatibles"
-
 #: builtin/commit.c:1227
-#, fuzzy
 msgid "You are in the middle of a merge -- cannot reword."
-msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
+msgstr "Esteu enmig d'una fusió -- no es pot fer «reword»."
 
 #: builtin/commit.c:1229
-#, fuzzy
 msgid "You are in the middle of a cherry-pick -- cannot reword."
-msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
+msgstr "Esteu enmig d'un «cherry pick» -- no es pot fer «reword»."
 
 #: builtin/commit.c:1232
-#, fuzzy, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
+#, c-format
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "les opcions de «reword» «%s» i camí «%s» no es poden usar juntes"
 
 #: builtin/commit.c:1234
-#, fuzzy
-msgid ""
-"reword option of --fixup is mutually exclusive with "
-"--patch/--interactive/--all/--include/--only"
-msgstr ""
-"l'opció de reparaula de --fixup és mútuament excloent amb "
-"--patch/--interactive/--all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "les opcions de «reword» «%s» i «%s» no es poden usar juntes"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 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:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 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:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Esteu enmig d'un «rebase» -- no es pot esmenar."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les opcions --squash i --fixup no es poden usar juntes"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 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:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
+msgstr "l'opció -m no es pot combinar amb -c/-C/-F/."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 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:1309
+#: builtin/commit.c:1310
 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:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "opció desconeguda: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "els camins «%s ...» amb -a no tenen sentit"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "mostra la informació de «stash»"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
-#, fuzzy
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "calcula els valors complets endavant/darrere"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "sortida llegible per una màquina"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "mostra l'estat en format llarg (per defecte)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:336
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 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:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14294,11 +14178,11 @@ msgstr ""
 "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
 "(Per defecte: traditional, matching, no.)"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14306,208 +14190,205 @@ msgstr ""
 "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "no detectis canvis de noms"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "detecta canvis de noms, i opcionalment estableix un índex de semblança"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "No s'admet la combinació d'arguments d'ignorància i de fitxers no seguits"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "mostra la diferència en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
-msgstr "autor corregit de la comissió"
+msgstr "sobreescriu l'autor de la comissió"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
-msgstr "data corregida de la comissió"
+msgstr "sobreescriu la data de la comissió"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "comissió"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "reusa i edita el missatge de la comissió especificada"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "reusa el missatge de la comissió especificada"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
-#: builtin/commit.c:1633
-#, fuzzy
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
-msgstr "esmena la comissió anterior"
+msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1633
-#, fuzzy
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
+"usa un missatge amb format de «squash» automàtic per a esmenar la comissió "
 "especificada"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
-"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
-"especificada"
+"usa un missatge amb format de «squash» automàtic per a fer «squash» de la "
+"comissió especificada"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "remolc"
 
-#: builtin/commit.c:1636
-#, fuzzy
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
-msgstr "afegeix un(s) tràiler(s) personalitzat(s)"
+msgstr "afegeix un «trailer» personalitzat"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
-#: builtin/pull.c:145 builtin/revert.c:110
-#, fuzzy
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
+#: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
-msgstr "afegeix Signed-off-by:"
+msgstr "afegeix un «trailer» tipus «Signed-off-by»"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "inclou l'estat en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
-msgstr "Opcions dels continguts de les comissions"
+msgstr "Opcions per al contingut de les comissions"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "afegeix els fitxers especificats a l'índex per a cometre"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evita els lligams de precomissió i missatge de comissió"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "evita el lligam de post escriptura"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "està bé registrar un canvi amb missatge buit"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, 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:1792
+#: builtin/commit.c:1793
 #, 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:1803
-#, fuzzy, c-format
+#: builtin/commit.c:1804
+#, c-format
 msgid "Aborting commit due to empty commit message body.\n"
-msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n"
+msgstr ""
+"S'està interrompent la comissió a causa d'un missatge de comissió buit.\n"
 
-#: builtin/commit.c:1839
-#, fuzzy
+#: builtin/commit.c:1840
 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 restore --staged :/\" to recover."
 msgstr ""
-"s'ha actualitzat el repositori però no s'ha pogut escriure el fitxer "
-"newindex. Comproveu que el disc no està ple i que la quota no s'ha excedit i"
-" després «git restitueix --staged /» per recuperar-se."
+"s'ha actualitzat el repositori, però no s'ha pogut escriure\n"
+" el fitxer «new_index». Comproveu que el disc no està ple i\n"
+"que la quota no s'ha excedit, i després, feu\n"
+"«git restore --staged :/» per a recuperar-lo."
 
 #: builtin/config.c:11
 msgid "git config [<options>]"
@@ -14676,11 +14557,10 @@ msgstr ""
 "d'ordres)"
 
 #: builtin/config.c:166
-#, fuzzy
 msgid "show scope of config (worktree, local, global, system, command)"
 msgstr ""
-"mostra l'abast de la configuració (arbre de treball ordre local global del "
-"sistema)"
+"mostra l'abast de la configuració («worktree», «local», «global», «system», "
+"«command»)"
 
 #: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
@@ -14730,9 +14610,8 @@ msgid "writing to stdin is not supported"
 msgstr "no s'admet escriure a stdin"
 
 #: builtin/config.c:542
-#, fuzzy
 msgid "writing config blobs is not supported"
-msgstr "no es poden escriure els blobs de configuració"
+msgstr "no s'ha admet l'escriptura de blobs de configuració"
 
 #: builtin/config.c:627
 #, c-format
@@ -14770,15 +14649,13 @@ msgid "$HOME not set"
 msgstr "$HOME no està establerta"
 
 #: builtin/config.c:708
-#, fuzzy
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
 "section in \"git help worktree\" for details"
 msgstr ""
-"--worktree no es pot utilitzar amb múltiples arbres de treball tret que "
-"l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la "
-"secció «CONFIGURATION FITXER» a «git help worktree» per als detalls"
+"--worktree no es pot utilitzar amb múltiples arbres de treball tret que\n"
+"l'extensió de configuració worktreeConfig estigui habilitada. Llegiu la secció «CONFIGURATION FILE» a «git help worktree» per a més detalls"
 
 #: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
@@ -14882,9 +14759,11 @@ msgstr ""
 "d'unix"
 
 #: builtin/credential-store.c:66
-#, fuzzy, c-format
+#, c-format
 msgid "unable to get credential storage lock in %d ms"
-msgstr "no s'ha pogut obtenir el directori de treball actual"
+msgstr ""
+"no s'ha pogut obtenir el bloqueig de l'emmagatzematge de credencials en %d "
+"ms"
 
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
@@ -15002,7 +14881,7 @@ msgstr "sempre usa el format llarg"
 
 #: builtin/describe.c:559
 msgid "only follow first parent"
-msgstr "només segueix la primera mare"
+msgstr "només segueix el primer pare"
 
 #: builtin/describe.c:562
 msgid "only output exact matches"
@@ -15020,7 +14899,7 @@ msgstr "només considera les etiquetes que coincideixen amb <patró>"
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
 
@@ -15036,25 +14915,14 @@ msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-dirty»)"
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-broken»)"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long és incompatible amb --abbrev=0"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "No s'ha trobat cap nom, no es pot descriure res."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty és incompatible amb les comissions"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken és incompatible amb les comissions"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin i --merge-base són mútuament excloents"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "les opcions «%s» i de comissió no es poden usar juntes"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -15075,26 +14943,26 @@ msgstr "opció no vàlida: %s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: sense una base de fusió"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "No és un repositori de git"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "s'ha donat un objecte no vàlid «%s»."
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "s'ha donat més de dos blobs: «%s»"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "s'ha donat l'objecte no gestionat «%s»."
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
@@ -15103,84 +14971,82 @@ msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, 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:303
+#: builtin/difftool.c:297
 #, 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:427
-#, fuzzy
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 "els formats de diff combinats («-c» i «--cc») no s'admeten\n"
-"en el mode diff per directoris («-d» i «--dir-diff»)."
+"en el mode diff de directoris («-d» i «--dir-diff»)."
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a «%s»."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "ha fallat: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "usa «diff.guitool» en lloc de «diff.tool»"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "eina"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 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:712
-#, fuzzy
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15188,31 +15054,23 @@ msgstr ""
 "fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de "
 "sortida diferent de zero"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
-msgstr "especifiqueu una ordre personalitzada per veure diffs"
+msgstr "especifiqueu una ordre personalitzada per a veure diffs"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "passa-ho a «diff»"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requereix worktree o --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff és incompatible amb --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool and --extcmd són mútuament excloents"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
 
@@ -15225,295 +15083,274 @@ msgid "type"
 msgstr "tipus"
 
 #: builtin/env--helper.c:46
-#, fuzzy
 msgid "default for git_env_*(...) to fall back on"
-msgstr "per defecte per a gitenv*() per tornar-hi"
+msgstr "valor per defecte per a git_env_*(...) en cas d'absència"
 
 #: builtin/env--helper.c:48
-#, fuzzy
 msgid "be quiet only use git_env_*() value as exit code"
-msgstr "silenciós només utilitza el valor gitenv*() com a codi de sortida"
+msgstr "silenciós només utilitza el valor git_env_*() com a codi de sortida"
 
 #: builtin/env--helper.c:67
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`"
+msgstr "l'opció «--default» espera un valor booleà amb «--type=bool», no «%s»"
 
 #: builtin/env--helper.c:82
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not "
 "`%s`"
 msgstr ""
-"`--default' espera un valor llarg sense signe amb `-type=ulong` no `%s`"
+"l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», no"
+" `%s`"
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opcions-de-llista-de-revisions]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Error: no es poden exportar les etiquetes imbricades a menys que "
 "s'especifiqui --mark-tags."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "el testimoni de --anonymize-map no pot estar buit"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "mostra el progrés després de <n> objectes"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "selecciona la gestió de les etiquetes signades"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "selecciona la gestió dels missatges de publicació en una codificació "
 "alternativa"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "importa marques d'aquest fitxer si existeix"
 
-#: builtin/fast-export.c:1217
-#, fuzzy
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
-msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
+msgstr "fingeix un etiquetador quan en falti un a les etiquetes"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "imprimeix l'arbre complet de per a cada comissió"
 
-#: builtin/fast-export.c:1221
-#, fuzzy
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
-msgstr "Usa la característica done per a acabar el corrent"
+msgstr "usa la característica fet per a acabar el flux"
 
-#: builtin/fast-export.c:1222
-#, fuzzy
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
-msgstr "Omet l'emissió de dades de blob"
+msgstr "omet la sortida de dades de blob"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "especificació de referència"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "aplica l'especificació de referència a les referències exportades"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fast-export.c:1226
-#, fuzzy
+#: builtin/fast-export.c:1199
 msgid "from:to"
-msgstr "des de"
+msgstr "des de:a"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "converteix <from> a <to> en una sortida anònima"
 
-#: builtin/fast-export.c:1230
-#, fuzzy
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
-"Referència pares que no estan en flux d'exportació ràpida per identificador "
-"d'objecte"
+"referència els pares que no estan en flux d'exportació ràpida per "
+"identificador d'objecte"
 
-#: builtin/fast-export.c:1232
-#, fuzzy
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
-msgstr "Mostra els ID dels objectes originals dels blobs/commits"
+msgstr "mostra els ID dels objectes originals dels blobs i comissions"
 
-#: builtin/fast-export.c:1234
-#, fuzzy
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
-msgstr "etiquetes amb els identificadors de marca"
-
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map sense --anonymize no té sentit"
+msgstr "marca les etiquetes amb els identificadors de marca"
 
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "No es poden passar alhora --import-marks i --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Falten les marques «from» per al submòdul «%s»"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Falten les marques per al submòdul «%s»"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "S'esperava l'ordre «mark», s'ha rebut %s"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "S'esperava l'ordre «to», s'ha rebut «%s»"
 
-#: builtin/fast-import.c:3322
-#, fuzzy
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
-"S'esperava un nom de fitxer de format per a l'opció de reescriptura de "
+"S'esperava el format «nom:nom de fitxer» per a l'opció de reescriptura de "
 "submòdul"
 
-#: builtin/fast-import.c:3377
-#, fuzzy, c-format
+#: builtin/fast-import.c:3379
+#, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
 "característica «%s» prohibida a l'entrada sense --allow-unsafe-features"
 
 #: builtin/fetch-pack.c:242
-#, fuzzy, c-format
+#, c-format
 msgid "Lockfile created but not reported: %s"
-msgstr "Submòduls canviats però no actualitzats:"
+msgstr "S'ha creat el fitxer de bloqueig però no s'ha informat: %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git fetch [<opcions>] [<repositori> [<especificació-de-referència>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opcions>] [(<repositori> | <grup>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel no pot ser negatiu"
 
-#: builtin/fetch.c:145 builtin/pull.c:185
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "obtén de tots els remots"
 
-#: builtin/fetch.c:147 builtin/pull.c:245
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "estableix la font per a git pull/fetch"
 
-#: builtin/fetch.c:149 builtin/pull.c:188
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:151
-#, fuzzy
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
-msgstr "demana una transacció atòmica al costat remot"
+msgstr "usa una transacció atòmica per a actualitzar les referències"
 
-#: builtin/fetch.c:153 builtin/pull.c:191
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "camí al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "força la sobreescriptura de la referència local"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "obtén de múltiples remots"
 
-#: builtin/fetch.c:158 builtin/pull.c:195
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "obtén totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submòduls obtinguts en paral·lel"
 
-#: builtin/fetch.c:164
-#, fuzzy
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
-"modifica l'especificació de referència per col·locar totes les referències "
+"modifica l'especificació de referència per a col·locar totes les referències "
 "dins de refs/prefetch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:198
+#: builtin/fetch.c:167 builtin/pull.c:202
 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:168
-#, fuzzy
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
-"poda les etiquetes locals ja no a les remotes i el «clobber» ha canviat les "
-"etiquetes"
+"poda les etiquetes locals que ja no existeixen al remot i adjunta les "
+"etiquetes que han canviat"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/fetch.c:175
-#, fuzzy
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
-msgstr "escriu l'arxiu a aquest fitxer"
+msgstr "escriu les referències obtingudes al fitxer FETCH_HEAD"
 
-#: builtin/fetch.c:176 builtin/pull.c:206
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "retén el paquet baixat"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualització de la referència HEAD"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
-#: builtin/pull.c:218
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
+#: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la història d'un clon superficial"
 
-#: builtin/fetch.c:183 builtin/pull.c:212
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la història d'un clon superficial basat en una data"
 
-#: builtin/fetch.c:189 builtin/pull.c:221
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "converteix en un repositori complet"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "anteposa això a la sortida de camí del submòdul"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15521,146 +15358,147 @@ msgstr ""
 "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que"
 " els fitxers de configuració)"
 
-#: builtin/fetch.c:199 builtin/pull.c:224
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referències que actualitzin .git/shallow"
 
-#: builtin/fetch.c:200 builtin/pull.c:226
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "mapa de referències"
 
-#: builtin/fetch.c:201 builtin/pull.c:227
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "específica l'obtenció del mapa de referències"
 
-#: builtin/fetch.c:208 builtin/pull.c:240
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "informa que només hi ha objectes abastables des d'aquest objecte"
 
-#: builtin/fetch.c:210
-#, fuzzy
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
-"no obtinguis un fitxer de paquet; en canvi, imprimeix els avantpassats dels "
+"no obtinguis un fitxer de paquet; en canvi, mostra els avantpassats dels "
 "consells de negociació"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "executa «maintenance --auto» després d'obtenir"
 
-#: builtin/fetch.c:217 builtin/pull.c:243
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 "comprova si hi ha actualitzacions forçades a totes les branques "
 "actualitzades"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "escriu el graf de comissions després de recollir"
 
-#: builtin/fetch.c:221
-#, fuzzy
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
-msgstr "llegeix les referències des de stdin"
+msgstr "llegeix les especificacions de referència des de stdin"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "No s'ha pogut trobar la referència HEAD remota"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "no s'ha pogut trobar la referència HEAD remota"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, 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:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "s'ha agafat en un altre arbre de treball"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[actualització d'etiqueta]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referència local"
 
-#: builtin/fetch.c:895
-#, fuzzy
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
-msgstr "es tancaria l'etiqueta existent"
+msgstr "s'adjuntaria l'etiqueta existent"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"L'obtenció normalment indica quines branques tenien una actualització forçada,\n"
-"però aquesta comprovació s'ha desactivat. Per tornar a habilitar-la, utilitzeu\n"
-"«--show-forced-updates» o executeu «git config fetch.showForcedUpdates true»."
+"en obtenir normalment indica quines branques tenien una actualització forçada,\n"
+"però aquesta comprovació s'ha desactivat. Per a tornar a habilitar-la, utilitzeu\n"
+"«--show-forced-updates» o executeu «git config fetch.showForcedUpdates true»"
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"S'ha trigat %.2f segons a comprovar les actualitzacions forçades. Podeu\n"
+"s'ha trigat %.2f segons a comprovar les actualitzacions forçades. Podeu\n"
 "utilitzar «--no-show-forced-updates» o executar «git config \n"
-"fetch.showForcedUpdates false» per evitar aquesta comprovació.\n"
+"fetch.showForcedUpdates false» per a evitar aquesta comprovació.\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:1134
-#, fuzzy, c-format
+#: builtin/fetch.c:1141
+#, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
-"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
+"s'ha rebutjat %s perquè no es permeten actualitzar les arrels superficials"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15670,142 +15508,143 @@ msgstr ""
 " intenteu executar «git remote prune %s» per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarà penjant)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, 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 repositori no nu"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "s'ha rebutjat l'obtenció en la branca «%s» agafada a «%s»"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, 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"
+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:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "S'ignora l'opció «%s» per a %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "s'ignora l'opció «%s» per a %s\n"
 
-#: builtin/fetch.c:1447
-#, fuzzy, c-format
+#: builtin/fetch.c:1455
+#, c-format
 msgid "the object %s does not exist"
-msgstr "el camí «%s» no existeix"
+msgstr "l'objecte %s no existeix"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"no s'ha pogut establir la font de HEAD a «%s» des de «%s» quan no assenyala cap "
+"branca."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr ""
 "no s'està configurant la font per a una branca remota amb seguiment remot"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "no s'està configurant la font d'una etiqueta remota"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "tipus de branca desconegut"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 "no s'ha trobat cap branca d'origen.\n"
-"Heu d'especificar exactament una branca amb l'opció --set-upstream."
+"heu d'especificar exactament una branca amb l'opció --set-upstream"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
-msgstr "No s'ha pogut obtenir %s"
+msgid "could not fetch %s"
+msgstr "no s'ha pogut obtenir %s"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "no s'ha pogut obtenir «%s» (codi de sortida: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
-"Cap repositori remot especificat. Especifiqueu un URL o\n"
-"un nom remot del qual es deuen obtenir les revisions noves."
+"no s'ha especificat cap repositori remot. Especifiqueu un URL o\n"
+"un nom remot del qual s'han d'obtenir les revisions noves"
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Necessiteu especificar un nom d'etiqueta."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "necessiteu especificar un nom d'etiqueta"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only necessita un o més --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "No s'admet una profunditat negativa en --deepen"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen i --depth són mútuament excloents"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth i --unshallow no es poden usar junts"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "no s'admet una profunditat negativa en --deepen"
 
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow en un repositori complet no té sentit"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no accepta un argument de repositori"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no té sentit amb especificacions de referència"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "No existeix un remot ni un grup remot: %s"
+msgid "no such remote or remote group: %s"
+msgstr "no existeix un remot ni un grup remot: %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Obtenir un grup i especificar referències no té sentit"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "obtenir un grup i especificar referències no té sentit"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "s'ha de subministrar el remot en usar --negotiate-only"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "El protocol no admet --negotiate-only, se surt."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "el protocol no admet --negotiate-only, se surt"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in "
 "extensions.partialclone"
@@ -15813,15 +15652,13 @@ msgstr ""
 "--filter només es pot utilitzar amb el remot configurat en "
 "extensions.partialclone"
 
-#: builtin/fetch.c:2101
-#, fuzzy
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
-msgstr "L'opció --exec només es pot usar juntament amb --remote"
+msgstr "l'opció --atomic només es pot usar quan s'obté des d'un remot"
 
-#: builtin/fetch.c:2105
-#, fuzzy
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
-msgstr "L'opció --exec només es pot usar juntament amb --remote"
+msgstr "l'opció --stdin només es pot usar quan s'obté des d'un remot"
 
 #: builtin/fmt-merge-msg.c:7
 msgid ""
@@ -15829,23 +15666,27 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 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:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "àlies per --log (en desús)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "usa <nom> en lloc de la branca de destí real"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
@@ -15858,57 +15699,56 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objecte>]"
 
 #: builtin/for-each-ref.c:12
-#, fuzzy
 msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
+msgstr "git for-each-ref [--merged [<commit>]] [--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 [<comissió>]] [--no-contains [<comissió>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr ""
 "posa els marcadors de posició de forma adequada per a intèrprets d'ordres"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "posa els marcadors de posició entre cometes adequades per al perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "posa els marcadors de posició entre cometes adequades per al python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "mostra només <n> referències coincidents"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "respecta els colors del format"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 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:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "imprimeix només les referències que s'han fusionat"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 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:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "imprimeix només les referències que continguin la comissió"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "imprimeix només les referències que no continguin la comissió"
 
@@ -15921,7 +15761,6 @@ msgid "config"
 msgstr "config"
 
 #: builtin/for-each-repo.c:35
-#, fuzzy
 msgid "config key storing a list of repository paths"
 msgstr "clau de configuració emmagatzemant una llista de camins de repositori"
 
@@ -15955,11 +15794,13 @@ msgid "wrong object type in link"
 msgstr "tipus d'objecte incorrecte en l'enllaç"
 
 #: builtin/fsck.c:152
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
-msgstr "enllaç trencat del 7% al 7%"
+msgstr ""
+"enllaç trencat des de %7s %s\n"
+"               fins a %7s %s"
 
 #: builtin/fsck.c:264
 #, c-format
@@ -15972,14 +15813,13 @@ msgid "unreachable %s %s"
 msgstr "inabastable %s %s"
 
 #: builtin/fsck.c:311
-#, fuzzy, c-format
+#, c-format
 msgid "dangling %s %s"
-msgstr "per cent"
+msgstr "sense assignació %s %s"
 
 #: builtin/fsck.c:321
-#, fuzzy
 msgid "could not create lost-found"
-msgstr "no s'ha pogut crear el trobat perdut"
+msgstr "no s'ha pogut crear el trobat-perdut"
 
 #: builtin/fsck.c:332
 #, c-format
@@ -16011,9 +15851,9 @@ msgid "root %s"
 msgstr "arrel %s"
 
 #: builtin/fsck.c:428
-#, fuzzy, c-format
+#, c-format
 msgid "tagged %s %s (%s) in %s"
-msgstr "percentatges marcats"
+msgstr "marcat %s %s (%s) a %s"
 
 #: builtin/fsck.c:457
 #, c-format
@@ -16045,9 +15885,9 @@ msgid "notice: No default references"
 msgstr "avís: no hi ha referències per defecte"
 
 #: builtin/fsck.c:621
-#, fuzzy, c-format
+#, c-format
 msgid "%s: hash-path mismatch, found at: %s"
-msgstr "el resum no coincideix %s"
+msgstr "%s: el resum del camí no coincideix, trobat a: %s"
 
 #: builtin/fsck.c:624
 #, c-format
@@ -16055,130 +15895,129 @@ msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objecte corrupte o no trobat: %s"
 
 #: builtin/fsck.c:628
-#, fuzzy, c-format
+#, c-format
 msgid "%s: object is of unknown type '%s': %s"
-msgstr "l'objecte %s té un identificador de tipus %d desconegut"
+msgstr "%s: l'objecte és de tipus desconegut «%s»: %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "fitxer sha1 malmès: %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "S'està comprovant el directori d'objecte"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "S'està comprovant l'enllaç %s"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a una cosa estranya (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: el HEAD separat no apunta a res"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "avís: %s apunta a una branca no nascuda (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "S'està comprovant l'arbre de la memòria cau"
 
-#: builtin/fsck.c:743
-#, fuzzy, c-format
+#: builtin/fsck.c:744
+#, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "percentatges d'apuntador sha1 no vàlid a l'arbre de la memòria cau"
+msgstr "%s: apuntador sha1 no vàlid a l'arbre de la memòria cau"
 
-#: builtin/fsck.c:752
-#, fuzzy
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
-msgstr "no arbre en l'arbre de la memòria cau"
+msgstr "un no arbre en l'arbre de la memòria cau"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
-msgstr "fes els objectes d'índex nodes de cap"
+msgstr "fes dels objectes d'índex nodes cap"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr ""
-"fes que els registres de referències siguin nodes de cap (per defecte)"
+"fes que els registres de referències siguin nodes cap (per defecte)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "també considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "comprova només la connectivitat"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "habilita la comprovació més estricta"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "mostra el progrés"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:860 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/fsck.c:888
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: falta l'objecte"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»"
@@ -16197,18 +16036,13 @@ msgstr "S'ha produït un error en fer fstat %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "no s'ha pogut analitzar «%s» valor «%s»"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no es pot fer stat en «%s»"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
+#: builtin/gc.c:504
 #, c-format
-msgid "cannot read '%s'"
-msgstr "no es pot llegir «%s»"
-
-#: builtin/gc.c:503
-#, fuzzy, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
 "and remove %s\n"
@@ -16216,62 +16050,62 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"L'última execució de gc ha informat el següent. Corregiu\n"
-"la causa primordial i elimineu %s.\n"
+"L'última execució de gc ha informat el següent. Corregiu la causa\n"
+" principal i elimineu %s\n"
 "No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "poda objectes sense referència"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automàtica"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 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"
+"força l'execució de gc encara que hi pugui haver un altre gc executant-se"
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "no s'ha pogut analitzar el valor %s de gc.logexpiry"
 
-#: builtin/gc.c:587
-#, fuzzy, c-format
+#: builtin/gc.c:588
+#, c-format
 msgid "failed to parse prune expiry value %s"
-msgstr "no s'ha pogut analitzar el valor de venciment de la poda per cent"
+msgstr "no s'ha pogut analitzar el valor de venciment de la poda %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "S'està empaquetant el repositori automàticament en el rerefons per a un "
 "rendiment òptim.\n"
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 "S'està empaquetant automàticament el repositori per a un rendiment òptim.\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu «git help gc» per a neteja manual.\n"
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16279,7 +16113,7 @@ msgstr ""
 "gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si "
 "no)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove "
 "them."
@@ -16287,235 +16121,210 @@ msgstr ""
 "Hi ha massa objectes solts inabastables; executeu «git prune» per a "
 "eliminar-los."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule no està permès"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argument --schedule no reconegut, «%s»"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "s'ha produït un error en escriure el graf de comissions"
 
-#: builtin/gc.c:904
-#, fuzzy
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
-msgstr "s'ha produït un error en omplir els remots"
+msgstr "s'ha produït un error en preobtenir els remots"
 
-#: builtin/gc.c:1020
-#, fuzzy
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
-msgstr "no s'ha pogut iniciar el pack-objects"
+msgstr "no s'ha pogut iniciar el procés «git pack-objects»"
 
-#: builtin/gc.c:1037
-#, fuzzy
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
-msgstr "no s'ha pogut finalitzar el pack-objects"
+msgstr "no s'ha pogut finalitzar el procés «git pack-objects»"
 
-#: builtin/gc.c:1089
-#, fuzzy
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
-msgstr "no s'han pogut netejar els percentatges multi-paquet"
+msgstr "no s'han pogut escriu l'índex del multipaquet"
 
-#: builtin/gc.c:1105
-#, fuzzy
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
-msgstr "l'índex múltiple és massa petit"
+msgstr "ha fallat el venciment de «git multi-pack-index expire»"
 
-#: builtin/gc.c:1164
-#, fuzzy
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
-msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+msgstr "ha fallat l'execució de «git multi-pack-index repack»"
 
-#: builtin/gc.c:1173
-#, fuzzy
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
-"s'està ometent la tasca de reempaquetar incremental perquè "
-"core.multiPackIndex està desactivat"
+"s'està ometent la tasca incremental-repack perquè core.multiPackIndex està "
+"desactivat"
 
-#: builtin/gc.c:1277
-#, fuzzy, c-format
+#: builtin/gc.c:1278
+#, c-format
 msgid "lock file '%s' exists, skipping maintenance"
-msgstr "el fitxer de bloqueig «%s» existeix s'omet el manteniment"
+msgstr "el fitxer de bloqueig «%s» existeix, s'omet el manteniment"
 
-#: builtin/gc.c:1307
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "la tasca «%s» ha fallat"
 
-#: builtin/gc.c:1389
-#, fuzzy, c-format
+#: builtin/gc.c:1390
+#, c-format
 msgid "'%s' is not a valid task"
-msgstr "«%s» no és un terme vàlid"
+msgstr "«%s» no és una tasca vàlida"
 
-#: builtin/gc.c:1394
-#, fuzzy, c-format
+#: builtin/gc.c:1395
+#, c-format
 msgid "task '%s' cannot be selected multiple times"
-msgstr "«%s» no es pot usar amb %s"
+msgstr "la tasca «%s» no es pot seleccionar múltiples vegades"
 
-#: builtin/gc.c:1409
-#, fuzzy
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "executa les tasques basades en l'estat del repositori"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "freqüència"
 
-#: builtin/gc.c:1411
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "executa les tasques basant-se en freqüència"
 
-#: builtin/gc.c:1414
-#, fuzzy
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
-msgstr "no informeu sobre el progrés o altra informació sobre stderr"
+msgstr "no informeu sobre el progrés o altra informació as stderr"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tasca"
 
-#: builtin/gc.c:1416
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "executa una tasca específica"
 
-#: builtin/gc.c:1433
-#, fuzzy
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
-msgstr "usa com a màxim un de --auto i --schedule=<frequency>"
+msgstr "usa com a màxim un entre --auto i --schedule=<frequency>"
 
-#: builtin/gc.c:1476
-#, fuzzy
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
-msgstr "no s'ha pogut executar «git status» a «%s»"
+msgstr "no s'ha pogut executar «git config»"
 
-#: builtin/gc.c:1628
-#, fuzzy, c-format
+#: builtin/gc.c:1629
+#, c-format
 msgid "failed to expand path '%s'"
-msgstr "s'ha produït un error en crear el camí «%s»%s"
+msgstr "s'ha produït un error en expandir el camí «%s»"
 
-#: builtin/gc.c:1655 builtin/gc.c:1693
-#, fuzzy
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
-msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
+msgstr "s'ha produït un error en iniciar launchctl"
 
-#: builtin/gc.c:1768 builtin/gc.c:2221
-#, fuzzy, c-format
+#: builtin/gc.c:1769 builtin/gc.c:2237
+#, c-format
 msgid "failed to create directories for '%s'"
-msgstr "s'ha produït un error en crear el directori «%s»"
+msgstr "s'ha produït un error en crear els directoris per a «%s»"
 
-#: builtin/gc.c:1795
-#, fuzzy, c-format
+#: builtin/gc.c:1796
+#, c-format
 msgid "failed to bootstrap service %s"
-msgstr "s'ha produït un error en eliminar %s"
+msgstr "s'ha produït un error en arrencar el servei %s"
 
-#: builtin/gc.c:1888
-#, fuzzy
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
-msgstr "no s'han pogut crear els fitxers de sortida"
+msgstr "no s'han pogut crear un fitxer xml temporal"
 
-#: builtin/gc.c:1978
-#, fuzzy
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
-msgstr "s'ha produït un error en fer stat a %s"
+msgstr "s'ha produït un error en iniciar schtasks"
 
-#: builtin/gc.c:2047
-#, fuzzy
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre "
 "«cron»"
 
-#: builtin/gc.c:2064
-#, fuzzy
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»"
 
-#: builtin/gc.c:2068
-#, fuzzy
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "s'ha produït un error en obrir stdin de «crontab»"
 
-#: builtin/gc.c:2110
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "«crontab» ha mort"
 
-#: builtin/gc.c:2175
-#, fuzzy
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
-msgstr "s'ha produït un error en fer stat a %s"
+msgstr "s'ha produït un error en iniciar systemctl"
 
-#: builtin/gc.c:2185
-#, fuzzy
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
-msgstr "no s'ha pogut executar «%s»"
+msgstr "s'ha produït un error en executar systemctl"
 
-#: builtin/gc.c:2194 builtin/gc.c:2199 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "s'ha produït un error en suprimir «%s»"
 
-#: builtin/gc.c:2379
-#, fuzzy, c-format
+#: builtin/gc.c:2395
+#, c-format
 msgid "unrecognized --scheduler argument '%s'"
-msgstr "argument --schedule no reconegut, «%s»"
+msgstr "l'argument --scheduler no reconegut «%s»"
 
-#: builtin/gc.c:2404
-#, fuzzy
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
-msgstr "ni els temporitzadors de systemd ni el crontab estan disponibles"
+msgstr "ni els temporitzadors de systemd ni de crontab estan disponibles"
 
-#: builtin/gc.c:2419
-#, fuzzy, c-format
+#: builtin/gc.c:2435
+#, c-format
 msgid "%s scheduler is not available"
-msgstr "%s no és disponible"
+msgstr "el planificador %s no està disponible"
 
-#: builtin/gc.c:2433
-#, fuzzy
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
-msgstr "un altre procés és planificar el manteniment en segon pla"
+msgstr "un altre procés està planificant un manteniment en segon pla"
 
-#: builtin/gc.c:2455
-#, fuzzy
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
-msgstr "git manteniment start ---scheduler=<scheduler>]"
+msgstr "git maintenance start [--scheduler=<scheduler>]"
 
-#: builtin/gc.c:2464
-#, fuzzy
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "planificador"
 
-#: builtin/gc.c:2465
-#, fuzzy
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
-msgstr "planificador per activar l'execució de manteniment del git"
+msgstr "planificador per a activar l'execució de manteniment del git"
 
-#: builtin/gc.c:2479
-#, fuzzy
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
-msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
+msgstr "no s'ha pogut afegir un repositori a la configuració global"
 
-#: builtin/gc.c:2488
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcommand> [<options>]"
 
-#: builtin/gc.c:2507
-#, fuzzy, c-format
+#: builtin/gc.c:2523
+#, c-format
 msgid "invalid subcommand: %s"
-msgstr "comissió no vàlida %s"
+msgstr "subordre no vàlida: %s"
 
 #: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
@@ -16699,7 +16508,7 @@ msgstr "usa <n> fils de treball"
 
 #: builtin/grep.c:928
 msgid "shortcut for -C NUM"
-msgstr "drecera per -C NUM"
+msgstr "drecera per a -C NUM"
 
 #: builtin/grep.c:931
 msgid "show a line with the function name before matches"
@@ -16791,9 +16600,8 @@ msgstr ""
 "--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
 
 #: builtin/grep.c:1188
-#, fuzzy
 msgid "both --cached and trees are given"
-msgstr "es donen ambdós --cached i arbres"
+msgstr "ambdós --cached i arbres venen donats"
 
 #: builtin/hash-object.c:83
 msgid ""
@@ -16867,46 +16675,45 @@ msgid "print all configuration variable names"
 msgstr "imprimeix tots els noms de les variables de configuració"
 
 #: builtin/help.c:78
-#, fuzzy
 msgid ""
 "git help [-a|--all] [--[no-]verbose]]\n"
 "         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
-msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]"
+msgstr ""
+"git help [-a|--all] [--[no-]verbose]]\n"
+"         [[-i|--info] [-m|--man] [-w|--web]] [<command>]"
 
 #: builtin/help.c:80
-#, fuzzy
 msgid "git help [-g|--guides]"
-msgstr "git help --g|--guides]"
+msgstr "git help [-g|--guides]"
 
 #: builtin/help.c:81
-#, fuzzy
 msgid "git help [-c|--config]"
-msgstr "git help --c|--config]"
+msgstr "git help [-c|--config]"
 
 #: builtin/help.c:196
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'ajuda no reconegut «%s»"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "S'ha produït un error en iniciar emacsclient."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "s'ha produït un error en executar «%s»"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16915,7 +16722,7 @@ msgstr ""
 "«%s»: camí a un visualitzador de manuals no compatible.\n"
 "Considereu usar «man.<eina>.cmd» en lloc d'això."
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16924,43 +16731,41 @@ msgstr ""
 "«%s»: ordre per a un visualitzador de manuals compatible.\n"
 "Considereu usar «man.<eina>.path» en lloc d'això."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: visualitzador de manuals desconegut."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "«%s» és un àlies de «%s»"
 
-#: builtin/help.c:565 git.c:380
-#, fuzzy, c-format
+#: builtin/help.c:564 git.c:380
+#, c-format
 msgid "bad alias.%s string: %s"
-msgstr "àlies incorrecte.%s string%s"
+msgstr "cadena «alias.%s» incorrecte: %s"
 
-#: builtin/help.c:581
-#, fuzzy
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
-msgstr "fetch --all no accepta un argument de repositori"
+msgstr "aquesta opció no accepta cap altre argument"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/help.c:624
-#, fuzzy
+#: builtin/help.c:623
 msgid "'git help config' for more information"
-msgstr "'git help config' per a més informació"
+msgstr "«git help config» per a més informació"
 
 #: builtin/index-pack.c:221
 #, c-format
@@ -17160,9 +16965,9 @@ msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
 #: builtin/index-pack.c:1440
-#, fuzzy, c-format
+#, c-format
 msgid "packfile name '%s' does not end with '.%s'"
-msgstr "el nom del fitxer de paquet «%s» no acaba amb «.pack»"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb «.%s»"
 
 #: builtin/index-pack.c:1464
 #, c-format
@@ -17170,14 +16975,14 @@ msgid "cannot write %s file '%s'"
 msgstr "no es pot escriure «%s» al fitxer «%s»"
 
 #: builtin/index-pack.c:1472
-#, fuzzy, c-format
+#, c-format
 msgid "cannot close written %s file '%s'"
-msgstr "no s'ha pogut tancar l'arxiu «%s» per escrit"
+msgstr "no s'ha pogut tancar el fitxer %s escrit «%s»"
 
 #: builtin/index-pack.c:1489
-#, fuzzy, c-format
-msgid "unable to rename temporary '*.%s' file to '%s"
-msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
+#, c-format
+msgid "unable to rename temporary '*.%s' file to '%s'"
+msgstr "no s'ha pogut canviar el nom del fitxer temporal «*.%s» a «%s»"
 
 #: builtin/index-pack.c:1514
 msgid "error while closing pack file"
@@ -17227,18 +17032,10 @@ msgstr "%s incorrecte"
 msgid "unknown hash algorithm '%s'"
 msgstr "algorisme hash desconegut «%s»"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin no es pot usar sense --stdin"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin requereix un repositori git"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format no es pot usar sense --stdin"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
@@ -17365,10 +17162,6 @@ msgstr "hash"
 msgid "specify the hash algorithm to use"
 msgstr "especifiqueu l'algorisme de resum a usar"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir i --bare són mútuament excloents"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17491,404 +17284,381 @@ msgid "decorate options"
 msgstr "opcions de decoració"
 
 #: builtin/log.c:190
-#, fuzzy
 msgid ""
 "trace the evolution of line range <start>,<end> or function :<funcname> in "
 "<file>"
 msgstr ""
-"Traça l'evolució del rang de línia <start>,<end> or funcions :<funcname> in "
-"{8771193"
+"traça l'evolució del rang de línia <start>,<end> o funcions :<funcname> a "
+"<file>"
 
 #: builtin/log.c:213
-#, fuzzy
 msgid "-L<range>:<file> cannot be used with pathspec"
-msgstr "%s: %s no es pot usar amb %s"
+msgstr "-L<range>:<file> no es pot usar amb una especificació de camí"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer incorrecte"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "no s'ha pogut llegir l'objecte %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipus desconegut: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: cobertura no vàlida des del mode descripció"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "no s'ha pogut obrir el fitxer de pedaç %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "necessita exactament un interval"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "no és un interval"
 
-#: builtin/log.c:1173
-#, fuzzy
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
-msgstr "la lletra de la portada necessita un format de correu electrònic"
+msgstr "la carta de presentació necessita un format de correu electrònic"
 
-#: builtin/log.c:1179
-#, fuzzy
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
-msgstr "no s'ha pogut crear el fitxer de portada"
+msgstr "s'ha produït un error en crear el fitxer de carta de presentació"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "dos directoris de sortida?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "comissió desconeguda %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "no s'ha pogut trobar la base exacta de la fusió"
 
-#: builtin/log.c:1532
-#, fuzzy
+#: builtin/log.c:1547
 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 ""
-"no s'ha pogut obtenir la font si voleu registrar la comissió base "
-"automàticament si us plau useu la branca git --set-upstream-to per al "
-"seguiment d'una branca remota. O podeu especificar la comissió base per "
+"no s'ha pogut obtenir la font, si voleu registrar la comissió base\n"
+"automàticament, useu git branch --set-upstream-to per a seguir una\n"
+"una branca remota. També podeu especificar la comissió base amb "
 "--base=<base-commit-id> manualment"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "no s'ha pogut trobar la base exacta de la fusió"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 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:1582
+#: builtin/log.c:1597
 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:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1703
-#, fuzzy
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
-msgstr "no s'ha pogut inferir l'interval-diferències"
+msgstr ""
+"no s'ha pogut inferir el rang de diferències d'origen de les sèries actuals"
 
-#: builtin/log.c:1705
-#, fuzzy, c-format
+#: builtin/log.c:1720
+#, c-format
 msgid "using '%s' as range-diff origin of current series"
-msgstr "utilitzant «%s» com a origen de rang-diferencia de la sèrie actual"
+msgstr ""
+"utilitzant «%s» com a origen de rang de diferències de la sèrie actual"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 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:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 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:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <sufix> en lloc de «.patch»"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 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:1765
-#, fuzzy
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sèrie com a l'enèsima llançada"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "mida màxima del nom del fitxer de sortida"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "useu [RFC PATCH] en comptes de [PATCH]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "genera parts d'una carta de presentació basant-se en la descripció d'una "
 "branca"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "useu [<prefix>] en comptes de [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capçalera From"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 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:1791
+#: builtin/log.c:1806
 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:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 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:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 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:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "adjunta el pedaç"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "mostra el progrés durant la generació de pedaços"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "mostra els canvis contra <rev> a la carta de presentació o a un sol pedaç"
 
-#: builtin/log.c:1827
-#, fuzzy
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
-"mostra els canvis contra <refspec> a la lletra de la portada o a un sol "
+"mostra els canvis contra <refspec> a la carta de presentació o a un sol "
 "pedaç"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "percentatge pel qual la creació és ponderada"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n i -k són mútuament excloents"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc i -k són mútuament excloents"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, i --output-directory són mútuament excloents"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requereix --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:2112
-#, fuzzy
+#: builtin/log.c:2127
 msgid "Range-diff:"
-msgstr "Diferència-interval"
+msgstr "Diferència de l'interval:"
 
-#: builtin/log.c:2113
-#, fuzzy, c-format
+#: builtin/log.c:2128
+#, c-format
 msgid "Range-diff against v%d:"
-msgstr "Diferència de l'interval contra el v%d"
+msgstr "Diferència de l'interval contra el v%d:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "S'estan generant els pedaços"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "no s'han pogut crear els fitxers de sortida"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> "
@@ -17897,132 +17667,133 @@ msgstr ""
 "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
 "manualment.\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcions>] [<fitxer>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "separa els camins amb el caràcter NUL"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifica l'estat de fitxer amb etiquetes"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usa lletres minúscules per als fitxers «assume unchanged»"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usa lletres minúscules per als fitxers «fsmonitor clean»"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 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:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "mostra en la sortida els fitxers suprimits"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "mostra en la sortida els fitxers modificats"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "mostra en la sortida els altres fitxers"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "mostra en la sortida els fitxers ignorats"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 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:636
+#: builtin/ls-files.c:639
 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:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "mostra només els noms dels directoris «other»"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "mostra els terminadors de línia dels fitxers"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "no mostris els directoris buits"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "mostra en la sortida els fitxers sense fusionar"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "mostra la informació de resolució de desfet"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "omet els fitxers coincidents amb el patró"
 
-#: builtin/ls-files.c:652
-
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "llegeix els patrons des de <file>"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "afegeix les exclusions estàndards de git"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 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:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 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:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "arbre"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 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:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "mostra les dades de depuració"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "suprimeix les entrades duplicades"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "mostra els directoris dispersos en presència d'un índex dispers"
+
 #: builtin/ls-remote.c:9
-#, fuzzy
 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]\n"
-"                     [--upload-pack=<executable>] [-q | --quiet]\n"
-"                     [--exit-code] [--get-url] [--symref]\n"
-"                     [<repositori> [<referències>...]]"
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+"              [-q | --quiet] [--exit-code] [--get-url]\n"
+"              [--symref] [<repository> [<refs>...]]"
 
 #: builtin/ls-remote.c:60
 msgid "do not print remote URL"
@@ -18099,44 +17870,36 @@ msgstr ""
 
 #. TRANSLATORS: keep <> in "<" mail ">" info.
 #: builtin/mailinfo.c:14
-#, fuzzy
 msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
-msgstr "git diff --no-index [<opcions>] <camí> <camí>"
+msgstr "git mailinfo [<options>] <msg> <patch> < mail >info"
 
 #: builtin/mailinfo.c:58
-#, fuzzy
 msgid "keep subject"
-msgstr "retén els objectes inabastables"
+msgstr "mantén l'assumpte"
 
 #: builtin/mailinfo.c:60
-#, fuzzy
 msgid "keep non patch brackets in subject"
-msgstr "mantén els parèntesis sense pedaços en el tema"
+msgstr "mantén els parèntesis que no són del pedaç en l'assumpte"
 
 #: builtin/mailinfo.c:62
-#, fuzzy
 msgid "copy Message-ID to the end of commit message"
-msgstr "edita el missatge de comissió"
+msgstr "copia el Message-ID al final del missatge de comissió"
 
 #: builtin/mailinfo.c:64
-#, fuzzy
 msgid "re-code metadata to i18n.commitEncoding"
 msgstr "torna a codificar les metadades a i18n.commitEncoding"
 
 #: builtin/mailinfo.c:67
-#, fuzzy
 msgid "disable charset re-coding of metadata"
-msgstr "inhabilita la codificació del joc de caràcters de les metadades"
+msgstr "inhabilita la recodificació del joc de caràcters de les metadades"
 
 #: builtin/mailinfo.c:69
-#, fuzzy
 msgid "encoding"
 msgstr "codificació"
 
 #: builtin/mailinfo.c:70
-#, fuzzy
 msgid "re-code metadata to this encoding"
-msgstr "torna a codificar les metadades a aquesta codificació"
+msgstr "recodifica les metadades en aquesta codificació"
 
 #: builtin/mailinfo.c:72
 msgid "use scissors"
@@ -18147,12 +17910,10 @@ msgid "<action>"
 msgstr "<acció>"
 
 #: builtin/mailinfo.c:74
-#, fuzzy
 msgid "action when quoted CR is found"
-msgstr "acció quan es troba la CR citada"
+msgstr "acció quan es troba un CR en una cita"
 
 #: builtin/mailinfo.c:77
-#, fuzzy
 msgid "use headers in message's body"
 msgstr "utilitza les capçaleres en el cos del missatge"
 
@@ -18220,26 +17981,30 @@ msgid "use a diff3 based merge"
 msgstr "usa una fusió basada en diff3"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "usa una fusió basada en zealous diff3"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "en conflictes, usa la nostra versió"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "en conflictes, usa la seva versió"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "en conflictes, usa una versió d'unió"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "en conflictes, usa aquesta mida de marcador"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "no avisis de conflictes"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
 
@@ -18278,195 +18043,198 @@ msgstr "S'està fusionant %s amb %s\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "l'opció «m» requereix un valor"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "l'opció «%s» requereix un valor"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:257 builtin/pull.c:133
+#: builtin/merge.c:258 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:260 builtin/pull.c:136
+#: builtin/merge.c:261 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:261 builtin/pull.c:139
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:263 builtin/pull.c:142
+#: builtin/merge.c:264 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:266 builtin/pull.c:148
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una única comissió en lloc de fusionar"
 
-#: builtin/merge.c:268 builtin/pull.c:151
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissió si la fusió té èxit (per defecte)"
 
-#: builtin/merge.c:270 builtin/pull.c:154
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:274 builtin/pull.c:161
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanç ràpid no és possible"
 
-#: builtin/merge.c:278 builtin/pull.c:164
+#: builtin/merge.c:279 builtin/pull.c:168
 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:279 builtin/notes.c:785 builtin/pull.c:168
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "estratègia"
 
-#: builtin/merge.c:280 builtin/pull.c:169
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "estratègia de fusió a usar"
 
-#: builtin/merge.c:281 builtin/pull.c:172
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:282 builtin/pull.c:173
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "opció per a l'estratègia de fusió seleccionada"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 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:291
+msgid "use <name> instead of the real target"
+msgstr "usa <nom> en lloc de destí real"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "avorta la fusió en curs actual"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort però deixa l'índex i l'arbre de treball intactes"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:297 builtin/pull.c:180
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar històries no relacionades"
 
-#: builtin/merge.c:304
-#, fuzzy
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "evita els ganxos pre-combinació i missatge de comissió"
+msgstr "evita els lligams pre-merge-commit i commit-msg"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "no s'ha pogut executar «stash»."
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "l'«stash» ha fallat"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Ja està actualitzat. (res a fer «squash»)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» no assenyala una comissió"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 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:743
-#, fuzzy, c-format
+#: builtin/merge.c:745
+#, c-format
 msgid "unknown strategy option: -X%s"
-msgstr "opció desconeguda: %s\n"
+msgstr "opció d'estratègia desconeguda: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de «%s»"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, 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:829
+#: builtin/merge.c:831
 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"
 msgstr ""
-"Introduïu un missatge de comissió per explicar per què aquesta fusió és\n"
+"Introduïu un missatge de comissió per a explicar per què aquesta fusió és\n"
 "necessària, especialment si es fusiona una branca amb funcionalitat\n"
 "nova.\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Un missatge buit interromp la comissió.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18475,74 +18243,74 @@ msgstr ""
 "Les línies que comencen amb «%c» seran ignorades i un missatge buit "
 "interromp la comissió.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, 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:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 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:1016
+#: builtin/merge.c:1018
 #, 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:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor incorrecte «%s» en l'entorn «%s»"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no és quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort no espera cap argument"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit no espera cap argument"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue no espera cap argument"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18550,7 +18318,7 @@ msgstr ""
 "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18558,86 +18326,78 @@ msgstr ""
 "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 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:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "No podeu combinar --squash amb --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "No podeu combinar --squash amb --commit."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 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:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 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:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no és una cosa que puguem fusionar"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 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:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, 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:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'està rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'està intentant l'estratègia de fusió %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratègia de fusió %s ha fallat.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "S'està usant l'estratègia %s per a preparar la resolució a mà.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18645,48 +18405,43 @@ msgstr ""
 "demanat\n"
 
 #: builtin/mktag.c:10
-#, fuzzy
 msgid "git mktag"
-msgstr "tag mktag"
+msgstr "git mktag"
 
 #: builtin/mktag.c:27
-#, fuzzy, c-format
+#, c-format
 msgid "warning: tag input does not pass fsck: %s"
-msgstr "avís: «:include:» no s'admet: %s\n"
+msgstr "avís: l'entrada d'etiqueta no passa fsck: %s"
 
 #: builtin/mktag.c:38
-#, fuzzy, c-format
+#, c-format
 msgid "error: tag input does not pass fsck: %s"
 msgstr "error: l'entrada d'etiqueta no passa fsck: %s"
 
 #: builtin/mktag.c:41
-#, fuzzy, c-format
+#, c-format
 msgid "%d (FSCK_IGNORE?) should never trigger this callback"
-msgstr "%d (FSCKIGNORE?) no hauria d'activar aquesta crida de retorn"
+msgstr "%d (FSCK_IGNORE?) no hauria d'activar mai aquesta crida de retorn"
 
 #: builtin/mktag.c:56
-#, fuzzy, c-format
+#, c-format
 msgid "could not read tagged object '%s'"
-msgstr "no s'ha pogut llegir l'objecte %s"
+msgstr "no s'ha pogut llegir l'objecte etiquetat «%s»"
 
 #: builtin/mktag.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "object '%s' tagged as '%s', but is a '%s' type"
-msgstr "l'objecte %s és %s, no pas %s"
+msgstr "l'objecte «%s» s'ha etiquetat com a «%s», però és del tipus «%s»"
 
 #: builtin/mktag.c:98
-#, fuzzy
 msgid "tag on stdin did not pass our strict fsck check"
-msgstr ""
-"l'etiqueta a l'entrada estàndard no ha passat la comprovació estricta del "
-"fsck"
+msgstr "l'etiqueta a stdin no ha passat la comprovació estricta del fsck"
 
 #: builtin/mktag.c:101
-#, fuzzy
 msgid "tag on stdin did not refer to a valid object"
-msgstr "%s no apunta a un objecte vàlid"
+msgstr "l'etiqueta a stdin no apunta a un objecte vàlid"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
 
@@ -18707,13 +18462,12 @@ msgid "allow creation of more than one tree"
 msgstr "permet la creació de més d'un arbre"
 
 #: builtin/multi-pack-index.c:10
-#, fuzzy
 msgid ""
 "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
 "snapshot=<path>]"
 msgstr ""
-"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
-"size=<size>)"
+"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
+"snapshot=<path>]"
 
 #: builtin/multi-pack-index.c:14
 msgid "git multi-pack-index [<options>] verify"
@@ -18728,44 +18482,39 @@ msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
 msgstr "git multi-pack-index [<opcions>] repack [--batch-size=<mida>]"
 
 #: builtin/multi-pack-index.c:57
-#, fuzzy
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
-"directori de l'objecte que conté el conjunt de parells packfile i pack-index"
+"directori de l'objecte que conté el conjunt de parells de fitxers i índexs "
+"de paquets"
 
 #: builtin/multi-pack-index.c:98
-#, fuzzy
 msgid "preferred-pack"
 msgstr "paquet preferit"
 
 #: builtin/multi-pack-index.c:99
-#, fuzzy
 msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
-"empaqueta per a reutilitzar quan es calcula un mapa de bits multi-paquet"
+"empaqueta per a reutilitzar quan es calcula un mapa de bits multipaquet"
 
 #: builtin/multi-pack-index.c:100
-#, fuzzy
 msgid "write multi-pack bitmap"
-msgstr "no s'han pogut netejar els percentatges multi-paquet"
+msgstr "escriu un map de bits multipaquet"
 
 #: builtin/multi-pack-index.c:105
-#, fuzzy
 msgid "write multi-pack index containing only given indexes"
-msgstr "git multi-pack-index [<opcions>] verify"
+msgstr ""
+"escriu un índex multipaquet que contingui només els índexs donats"
 
 #: builtin/multi-pack-index.c:107
-#, fuzzy
 msgid "refs snapshot for selecting bitmap commits"
-msgstr "instantània de refs per seleccionar entregues de mapa de bits"
+msgstr "instantània de referències per a seleccionar les comissions de mapa de bits"
 
-#: builtin/multi-pack-index.c:202
-#, fuzzy
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr ""
-"durant el reempaquetament dels fitxers de recollida de paquets de mida més "
+"durant el reempaquetament, recull els fitxers de paquets de mida més "
 "petita en un lot que és més gran que aquesta mida"
 
 #: builtin/mv.c:18
@@ -18861,53 +18610,53 @@ msgstr "%s, origen=%s, destí=%s"
 msgid "Renaming %s to %s\n"
 msgstr "S'està canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "el canvi del nom de «%s» ha fallat"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opcions>] <comissió>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opcions>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opcions>] --stdin"
 
-#: builtin/name-rev.c:524
-#, fuzzy
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
-msgstr "imprimeix només les branques de l'objecte"
+msgstr ""
+"imprimeix només els noms basats en referències (no els noms d'objecte)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "només usa les etiquetes per a anomenar les comissions"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "només usa les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "ignora les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr "llista totes les comissions abastables de totes les referències"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "llegeix de stdin"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "permet imprimir els noms «undefined» (per defecte)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
 
@@ -19028,26 +18777,26 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Escriviu/editeu les notes per l'objecte següent:"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "no s'ha pogut iniciar «show» per a l'objecte «%s»"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "no s'ha pogut llegir la sortida de «show»"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, 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
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 "especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "no s'ha pogut escriure l'objecte de nota"
 
@@ -19056,7 +18805,7 @@ 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:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no s'ha pogut obrir o llegir «%s»"
@@ -19097,8 +18846,8 @@ msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "hi ha massa arguments"
 
@@ -19145,7 +18894,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "S'està eliminant la nota de l'objecte %s\n"
@@ -19269,19 +19018,19 @@ msgstr "cal especificar una referència de notes a fusionar"
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy desconeguda: %s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, 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:874
+#: builtin/notes.c:878
 #, 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:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with"
@@ -19292,41 +19041,41 @@ msgstr ""
 "cometeu el resultat amb «git notes merge --commit», o avorteu la fusió amb "
 "«git notes merge --abort».\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objecte %s no té cap nota\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 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:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "no eliminis, només mostra"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "informa de notes podades"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "referència de notes"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referència-de-notes>"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
@@ -19346,18 +19095,18 @@ msgstr ""
 "<llista-de-objectes>]"
 
 #: builtin/pack-objects.c:572
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
 "pack %s"
 msgstr ""
-"Writereuseobject: no s'ha pogut localitzar %s, s'esperava a la posició "
+"write_reuse_object: no s'ha pogut localitzar %s, s'esperava a la posició "
 "%<PRIuMAX> al paquet %s"
 
 #: builtin/pack-objects.c:580
-#, fuzzy, c-format
+#, c-format
 msgid "bad packed object CRC for %s"
-msgstr "objecte CRC mal empaquetat per a percentatges"
+msgstr "CRC de l'objecte empaquetat malmès per a %s"
 
 #: builtin/pack-objects.c:591
 #, c-format
@@ -19375,9 +19124,9 @@ msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "ordenats %u objectes, s'esperaven %<PRIu32>"
 
 #: builtin/pack-objects.c:1036
-#, fuzzy, c-format
+#, c-format
 msgid "expected object at offset %<PRIuMAX> in pack %s"
-msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
+msgstr "objecte esperat a la posició %<PRIuMAX> al paquet %s"
 
 #: builtin/pack-objects.c:1160
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
@@ -19395,9 +19144,8 @@ msgid "failed to stat %s"
 msgstr "s'ha produït un error en fer stat a %s"
 
 #: builtin/pack-objects.c:1268
-#, fuzzy
 msgid "failed to write bitmap index"
-msgstr "escriu índex de mapa de bits"
+msgstr "s'ha produït un error en escriure l'índex de mapa de bits"
 
 #: builtin/pack-objects.c:1294
 #, c-format
@@ -19411,37 +19159,38 @@ msgstr ""
 " s'empaqueten"
 
 #: builtin/pack-objects.c:1984
-#, fuzzy, c-format
+#, c-format
 msgid "delta base offset overflow in pack for %s"
-msgstr "desplaçament de base delta desbordament en paquet de percentatges"
+msgstr "desbordament del desplaçament base de diferències en paquet per a %s"
 
 #: builtin/pack-objects.c:1993
-#, fuzzy, c-format
+#, c-format
 msgid "delta base offset out of bound for %s"
-msgstr "decalatge de base de delta fora d'enllaç per un percentatge"
+msgstr "desplaçament base de diferències fora dels límits per a %s"
 
 #: builtin/pack-objects.c:2274
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
 #: builtin/pack-objects.c:2439
-#, fuzzy, c-format
+#, c-format
 msgid "unable to parse object header of %s"
-msgstr "no s'ha pogut analitzar la capçalera de l'objecte dels percentatges"
+msgstr "no s'ha pogut analitzar la capçalera de l'objecte de %s"
 
 #: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525
 #: builtin/pack-objects.c:2535
-#, fuzzy, c-format
+#, c-format
 msgid "object %s cannot be read"
-msgstr "no es poden llegir els objectes percentuals"
+msgstr "no es pot llegir l'objecte %s"
 
 #: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539
-#, fuzzy, c-format
+#, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr "objecte%s longitud d'objecte inconsistent (%<PRIuMAX> vs%<PRIuMAX>)"
+msgstr ""
+"l'objecte %s té una longitud d'objecte inconsistent (%<PRIuMAX> vs "
+"%<PRIuMAX>)"
 
 #: builtin/pack-objects.c:2549
-#, fuzzy
 msgid "suboptimal pack - out of memory"
 msgstr "paquet subòptim - sense memòria"
 
@@ -19465,41 +19214,41 @@ msgid "inconsistency with delta count"
 msgstr "inconsistència amb el comptador de diferències"
 
 #: builtin/pack-objects.c:3174
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "value of uploadpack.blobpackfileuri must be of the form '<object-hash> "
 "<pack-hash> <uri>' (got '%s')"
 msgstr ""
-"el valor de uppack.blobpackfileuri ha de ser de la forma '<object-hash> "
-"<pack-hash> <uri>' (gotat '%s')"
+"el valor de uploadpack.blobpackfileuri ha de tenir la forma «<object-hash> "
+"<pack-hash> <uri>» (s'ha rebut «%s»)"
 
 #: builtin/pack-objects.c:3177
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "object already configured in another uploadpack.blobpackfileuri (got '%s')"
 msgstr ""
-"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (gotat "
-"'%')"
+"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (s'ha rebut "
+"«%s»)"
 
 #: builtin/pack-objects.c:3212
-#, fuzzy, c-format
+#, c-format
 msgid "could not get type of object %s in pack %s"
-msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
+msgstr "no s'ha pogut obtenir el tipus de l'objecte %s al paquet %s"
 
 #: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351
 #: builtin/pack-objects.c:3365
-#, fuzzy, c-format
+#, c-format
 msgid "could not find pack '%s'"
-msgstr "no s'ha pogut finalitzar «%s»"
+msgstr "no s'ha pogut trobar el paquet «%s»"
 
 #: builtin/pack-objects.c:3408
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
-"s'esperava un identificador d'objecte de vora amb brossa s'han obtingut "
-"percentatges d'escombraries"
+"s'esperava un identificador vora de l'objecte, s'ha rebut brossa:\n"
+" %s"
 
 #: builtin/pack-objects.c:3414
 #, c-format
@@ -19507,7 +19256,7 @@ msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
-"s'esperava un ID d'objecte, s'ha rebut brossa:\n"
+"s'esperava un identificador d'objecte, s'ha rebut brossa:\n"
 " %s"
 
 #: builtin/pack-objects.c:3507
@@ -19515,24 +19264,22 @@ msgid "invalid value for --missing"
 msgstr "valor no vàlid per a --missing"
 
 #: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619
-#, fuzzy
 msgid "cannot open pack index"
 msgstr "no s'ha pogut obrir l'índex del paquet"
 
 #: builtin/pack-objects.c:3541
-#, fuzzy, c-format
+#, c-format
 msgid "loose object at %s could not be examined"
-msgstr "no s'han pogut examinar els objectes solts"
+msgstr "no s'ha pogut examinar l'objecte solt a %s"
 
 #: builtin/pack-objects.c:3627
-#, fuzzy
 msgid "unable to force loose object"
 msgstr "no s'ha pogut forçar l'objecte solt"
 
 #: builtin/pack-objects.c:3757
-#, fuzzy, c-format
+#, c-format
 msgid "not a rev '%s'"
-msgstr "no és una revisió \"%s\""
+msgstr "«%s» no és una revisió"
 
 #: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061
 #, c-format
@@ -19570,7 +19317,7 @@ msgstr "mida màxima de cada fitxer empaquetat de sortida"
 #: builtin/pack-objects.c:3890
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
-"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+"ignora els objectes manllevats d'un emmagatzematge d'objectes alternatiu"
 
 #: builtin/pack-objects.c:3892
 msgid "ignore packed objects"
@@ -19633,9 +19380,8 @@ msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
 #: builtin/pack-objects.c:3924
-#, fuzzy
 msgid "read packs from stdin"
-msgstr "llegeix les actualitzacions des de stdin"
+msgstr "llegeix els paquets des de stdin"
 
 #: builtin/pack-objects.c:3926
 msgid "output pack to stdout"
@@ -19657,10 +19403,9 @@ msgstr "empaqueta els objectes inabastables solts"
 
 #: builtin/pack-objects.c:3934
 msgid "unpack unreachable objects newer than <time>"
-msgstr "desempaqueta els objectes inabastables més nous que <hora>"
+msgstr "desempaqueta els objectes inabastables més nous que <data>"
 
 #: builtin/pack-objects.c:3937
-#, fuzzy
 msgid "use the sparse reachability algorithm"
 msgstr "utilitza l'algorisme d'accessibilitat dispers"
 
@@ -19677,7 +19422,6 @@ msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
 #: builtin/pack-objects.c:3945
-#, fuzzy
 msgid "ignore this pack"
 msgstr "ignora aquest paquet"
 
@@ -19700,7 +19444,6 @@ msgid "write a bitmap index together with the pack index"
 msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
 
 #: builtin/pack-objects.c:3957
-#, fuzzy
 msgid "write a bitmap index if possible"
 msgstr "escriu un índex de mapa de bits si és possible"
 
@@ -19709,79 +19452,63 @@ msgid "handling for missing objects"
 msgstr "gestió dels objectes absents"
 
 #: builtin/pack-objects.c:3964
-#, fuzzy
 msgid "do not pack objects in promisor packfiles"
-msgstr "no empaqueta els objectes als fitxers del paquet promisor"
+msgstr "empaquetis els objectes als fitxers de paquet «promisor»"
 
 #: builtin/pack-objects.c:3966
-#, fuzzy
 msgid "respect islands during delta compression"
 msgstr "respecta les illes durant la compressió delta"
 
 #: builtin/pack-objects.c:3968
-#, fuzzy
 msgid "protocol"
 msgstr "protocol"
 
 #: builtin/pack-objects.c:3969
-#, fuzzy
 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
 msgstr ""
-"exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
+"exclou qualsevol uploadpack.blobpackfileuri configurat amb aquest protocol"
 
 #: builtin/pack-objects.c:4002
-#, fuzzy, c-format
+#, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
-msgstr ""
-"la profunditat de la cadena delta és massa profunda forçant un percentatge"
+msgstr "la profunditat de la cadena delta %d és massa profunda, forçant %d"
 
 #: builtin/pack-objects.c:4007
-#, fuzzy, c-format
+#, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr "pack.deltaCacheLimit és massa alt forçant un percentatge"
+msgstr "pack.deltaCacheLimit és massa alt, forçant %d"
 
 #: builtin/pack-objects.c:4063
-#, fuzzy
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
-"--max-pack-size no es pot utilitzar per construir un paquet per a la "
+"--max-pack-size no es pot utilitzar per a construir un paquet per a la "
 "transferència"
 
 #: builtin/pack-objects.c:4065
-#, fuzzy
 msgid "minimum pack size limit is 1 MiB"
 msgstr "el límit mínim de mida del paquet és 1 MiB"
 
 #: builtin/pack-objects.c:4070
-#, fuzzy
 msgid "--thin cannot be used to build an indexable pack"
-msgstr "--thin no es pot utilitzar per construir un paquet indexable"
-
-#: builtin/pack-objects.c:4073
-#, fuzzy
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable i --unpack-unreachable són incompatibles"
+msgstr "--thin no es pot utilitzar per a construir un paquet indexable"
 
 #: builtin/pack-objects.c:4079
-#, fuzzy
 msgid "cannot use --filter without --stdout"
 msgstr "no es pot utilitzar --filter sense --stdout"
 
 #: builtin/pack-objects.c:4081
-#, fuzzy
 msgid "cannot use --filter with --stdin-packs"
-msgstr "no es pot utilitzar --filter sense --stdout"
+msgstr "no es pot utilitzar --filter sense --stdin-packs"
 
 #: builtin/pack-objects.c:4085
-#, fuzzy
 msgid "cannot use internal rev list with --stdin-packs"
-msgstr "no es poden especificar noms de camí amb --stdin"
+msgstr "no es pot utilitzar la llista de revisió interna amb --stdin-packs"
 
 #: builtin/pack-objects.c:4144
 msgid "Enumerating objects"
 msgstr "S'estan enumerant els objectes"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19791,7 +19518,6 @@ msgstr ""
 "diferències), paquets reusats %<PRIu32>"
 
 #: builtin/pack-redundant.c:601
-#, fuzzy
 msgid ""
 "'git pack-redundant' is nominated for removal.\n"
 "If you still use this command, please add an extra\n"
@@ -19799,11 +19525,11 @@ msgid ""
 "and let us know you still use it by sending an e-mail\n"
 "to <git@vger.kernel.org>.  Thanks.\n"
 msgstr ""
-".git pack-redundant' és nominat per a la seva supressió.\n"
-"Si encara feu servir aquesta ordre, afegiu-hi un extra\n"
-"opció, «--i-still-use-this», a la línia d'ordres\n"
-"i fem-nos saber que encara l'useu enviant un correu electrònic\n"
-"a <git@vger.kernel.org>to  Gràcies."
+"«git pack-redundant» està nominat per a la seva supressió.\n"
+"Si encara feu servir aquesta ordre, afegiu-hi l'opció\n"
+"addicional, «--i-still-use-this», a la línia d'ordres\n"
+"i feu-nos saber que encara l'useu enviant un correu electrònic\n"
+"a <git@vger.kernel.org>.  Gràcies.\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -19823,22 +19549,21 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
 #: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <data>] [--] [<head>...]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "informa d'objectes podats"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
-msgstr "fes caducar els objectes més vells que <hora>"
+msgstr "fes caducar els objectes més antics que <data>"
 
-#: builtin/prune.c:138
-#, fuzzy
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
-msgstr "limita el trànsit d'objectes fora dels fitxers del paquet promisor"
+msgstr "limita el recorregut als objectes fora dels fitxers de paquet «promisor»"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "no es pot podar en un repositori d'objectes preciosos"
 
@@ -19852,44 +19577,48 @@ msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opcions>] [<repositori> [<especificació-de-referència>...]]"
 
-#: builtin/pull.c:123
+#: builtin/pull.c:124
 msgid "control for recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/pull.c:127
+#: builtin/pull.c:128
 msgid "Options related to merging"
 msgstr "Opcions relacionades amb fusionar"
 
-#: builtin/pull.c:130
+#: builtin/pull.c:131
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
 
-#: builtin/pull.c:158 builtin/revert.c:126
+#: builtin/pull.c:159 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permet l'avanç ràpid"
 
-#: builtin/pull.c:167 parse-options.h:339
+#: builtin/pull.c:165
+msgid "control use of pre-merge-commit and commit-msg hooks"
+msgstr "controla l'ús dels lligams pre-merge-commit i commit-msg"
+
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "fes «stash» i «stash pop» automàticament abans i després"
 
-#: builtin/pull.c:183
+#: builtin/pull.c:187
 msgid "Options related to fetching"
 msgstr "Opcions relacionades amb obtenir"
 
-#: builtin/pull.c:193
+#: builtin/pull.c:197
 msgid "force overwrite of local branch"
 msgstr "força la sobreescriptura de la branca local"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:205
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de submòduls baixats en paral·lel"
 
-#: builtin/pull.c:317
+#: builtin/pull.c:321
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor no vàlid per a pull.ff: %s"
 
-#: builtin/pull.c:445
+#: builtin/pull.c:449
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -19897,14 +19626,14 @@ msgstr ""
 "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
 "acabeu d'obtenir."
 
-#: builtin/pull.c:447
+#: builtin/pull.c:451
 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:448
+#: builtin/pull.c:452
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -19912,7 +19641,7 @@ msgstr ""
 "Generalment això vol dir que heu proveït una especificació de\n"
 "referència de comodí que no tenia cap coincidència en el costat remot."
 
-#: builtin/pull.c:451
+#: builtin/pull.c:455
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -19923,43 +19652,44 @@ msgstr ""
 "Perquè aquest no és el remot configurat per defecte per a la vostra\n"
 "branca actual, heu d'especificar una branca en la línia d'ordres."
 
-#: builtin/pull.c:456 builtin/rebase.c:951
+#: builtin/pull.c:460 builtin/rebase.c:951
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:458 builtin/pull.c:473
+#: builtin/pull.c:462 builtin/pull.c:477
 msgid "Please specify which branch you want to rebase against."
 msgstr "Especifiqueu sobre quina branca voleu fer «rebase»."
 
-#: builtin/pull.c:460 builtin/pull.c:475
+#: builtin/pull.c:464 builtin/pull.c:479
 msgid "Please specify which branch you want to merge with."
 msgstr "Especifiqueu amb quina branca voleu fusionar."
 
-#: builtin/pull.c:461 builtin/pull.c:476
+#: builtin/pull.c:465 builtin/pull.c:480
 msgid "See git-pull(1) for details."
 msgstr "Vegeu git-pull(1) per a més informació."
 
-#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482
 #: builtin/rebase.c:957
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:471 builtin/rebase.c:949
+#: builtin/pull.c:475 builtin/rebase.c:949
 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:480
+#: builtin/pull.c:484
 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"
+"Si voleu establir la informació de seguiment per a aquesta branca, podeu fer-ho"
 " amb:"
 
-#: builtin/pull.c:485
+#: builtin/pull.c:489
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -19968,23 +19698,22 @@ msgstr ""
 "La vostra configuració especifica fusionar amb la referència «%s»\n"
 "del remot, però no s'ha obtingut tal referència."
 
-#: builtin/pull.c:596
+#: builtin/pull.c:600
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no s'ha pogut accedir a la comissió %s"
 
-#: builtin/pull.c:902
+#: builtin/pull.c:908
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'està ignorant --verify-signatures en fer «rebase»"
 
-#: builtin/pull.c:936
-#, fuzzy
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19993,33 +19722,33 @@ msgid ""
 "or --ff-only on the command line to override the configured default per\n"
 "invocation.\n"
 msgstr ""
-"Baixar sense especificar com conciliar branques divergents està\n"
-"desaconsellat. Podeu desactivar aquest missatge executant una de les\n"
-"següents ordres abans de la propera baixada:\n"
+"Teniu branques divergents i necessiteu especificar com reconciliar-les.\n"
+"Podeu fer-ho executant una de les ordres següents abans que torneu\n"
+"a fer una baixada:\n"
 "\n"
-"  git config pull.rebase false  # merge (estratègia per defecte)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
-"  git config pull.ff only       # només fast-forward\n"
+"  git config pull.ff only       # fast-forward only\n"
 "\n"
 "Podeu reemplaçar «git config» per «git config --global» per a establir una\n"
 "preferència per defecte per a tots els repositoris. Podeu també usar --rebase,\n"
-"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\n"
+"--no-rebase o --ff-only en la línia d'ordres per a sobreescriure el valor\n"
 "per defecte configuració en aquesta execució.\n"
 
-#: builtin/pull.c:1010
+#: builtin/pull.c:1046
 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:1014
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:1015
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:1040
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20030,7 +19759,7 @@ msgstr ""
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20047,25 +19776,23 @@ msgstr ""
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:1061
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar múltiples branques a un HEAD buit."
 
-#: builtin/pull.c:1066
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/pull.c:1068
-#, fuzzy
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
-msgstr "No es pot fer «rebase» sobre múltiples branques."
+msgstr "No es pot fer un avançament ràpid a branques múltiples."
 
-#: builtin/pull.c:1082
-#, fuzzy
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
-msgstr "Cal especificar com conciliar les branques divergents."
+msgstr "Cal especificar com reconciliar les branques divergents."
 
-#: builtin/pull.c:1096
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -20223,21 +19950,20 @@ msgid ""
 msgstr ""
 "No podeu actualitzar una referència remota que assenyala un\n"
 "objecte no de comissió, ni actualitzar una referència remota per\n"
-"fer que assenyali un objecte no de comissió, sense usar l'opció\n"
+"a fer que assenyali un objecte no de comissió, sense usar l'opció\n"
 "«--force».\n"
 
 #: builtin/push.c:285
-#, fuzzy
 msgid ""
 "Updates were rejected because the tip of the remote-tracking\n"
 "branch has been updated since the last checkout. You may want\n"
 "to integrate those changes locally (e.g., 'git pull ...')\n"
 "before forcing an update.\n"
 msgstr ""
-"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
-"actual està darrere de la seva branca remota corresponent. Integreu\n"
-"els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n"
-"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més informació."
+"S'han rebutjat les actualitzacions perquè el punt actual de la vostra\n"
+"branca està darrere de la seva branca remota corresponent. Integreu\n"
+"els canvis localment (per exemple, «git pull ...») abans de forçar\n"
+"una pujada.\n"
 
 #: builtin/push.c:355
 #, c-format
@@ -20249,7 +19975,7 @@ msgstr "S'està pujant a %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "s'ha produït un error en pujar algunes referències a «%s»"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "repositori"
 
@@ -20322,10 +20048,6 @@ msgstr "signa la pujada amb GPG"
 msgid "request atomic transaction on remote side"
 msgstr "demana una transacció atòmica al costat remot"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete és incompatible amb --all, --mirror i --tags"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no té sentit sense referències"
@@ -20355,26 +20077,14 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all i --tags són incompatibles"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror i --tags són incompatibles"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all i --mirror són incompatibles"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "les opcions de pujada no han de tenir caràcters de línia nova"
@@ -20405,19 +20115,17 @@ msgid "passed to 'git log'"
 msgstr "passa-ho a «git log»"
 
 #: builtin/range-diff.c:35
-#, fuzzy
 msgid "only emit output related to the first range"
-msgstr "mostra només les comissions que no siguin en la primera branca"
+msgstr "emet només la sortida relacionada amb el primer interval"
 
 #: builtin/range-diff.c:37
-#, fuzzy
 msgid "only emit output related to the second range"
-msgstr "fes que la sortida sigui relativa al directori superior del projecte"
+msgstr "emet només la sortida relacionada amb el segon interval"
 
 #: builtin/range-diff.c:60 builtin/range-diff.c:64
-#, fuzzy, c-format
+#, c-format
 msgid "not a commit range: '%s'"
-msgstr "cap .. en rang: «%s»"
+msgstr "no és un rang de comissions: «%s»"
 
 #: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
@@ -20428,15 +20136,14 @@ msgid "need two commit ranges"
 msgstr "calen dos rangs de comissió"
 
 #: builtin/read-tree.c:41
-#, fuzzy
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
 " [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
 "ish1> [<tree-ish2> [<tree-ish3>]])"
 msgstr ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
-" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
-"[--index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
+" [-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
+"ish1> [<tree-ish2> [<tree-ish3>]])"
 
 #: builtin/read-tree.c:116
 msgid "write resulting index to <file>"
@@ -20503,30 +20210,27 @@ msgid "debug unpack-trees"
 msgstr "depura unpack-trees"
 
 #: builtin/read-tree.c:149
-#, fuzzy
 msgid "suppress feedback messages"
 msgstr "suprimeix els missatges de retroacció"
 
 #: builtin/read-tree.c:183
 msgid "You need to resolve your current index first"
-msgstr "Primer heu de resoldre l'índex actual"
+msgstr "Primer heu de resoldre el vostre índex actual"
 
 #: builtin/rebase.c:35
-#, fuzzy
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 msgstr ""
-"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 
 #: builtin/rebase.c:37
-#, fuzzy
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
 "[<branch>]"
 msgstr ""
-"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root "
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
 "[<branch>]"
 
 #: builtin/rebase.c:39
@@ -20547,29 +20251,28 @@ msgid "could not generate todo list"
 msgstr "no s'ha pogut generar la llista per a fer"
 
 #: builtin/rebase.c:331
-#, fuzzy
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "s'ha de proporcionar una comissió base amb --upstream o --onto"
 
 #: builtin/rebase.c:390
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires the merge backend"
-msgstr "%s requereix un «rebase» interactiu"
+msgstr "%s requereix un rerefons de fusió"
 
 #: builtin/rebase.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "could not get 'onto': '%s'"
-msgstr "no s'ha pogut obtenir «onto» «%s»"
+msgstr "no s'ha pogut obtenir «onto»: «%s»"
 
 #: builtin/rebase.c:449
-#, fuzzy, c-format
+#, c-format
 msgid "invalid orig-head: '%s'"
-msgstr "orig-head '%s' no és vàlid"
+msgstr "orig-head no és vàlid: «%s»"
 
 #: builtin/rebase.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
-msgstr "s'ignorarà allowrerereautoupdate «%s» no vàlid"
+msgstr "s'ignora allow_rerere_autoupdate no vàlid: «%s»"
 
 #: builtin/rebase.c:597
 msgid ""
@@ -20584,7 +20287,7 @@ msgstr ""
 "Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
 
 #: builtin/rebase.c:680
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "git encountered an error while preparing the patches to replay\n"
@@ -20594,15 +20297,19 @@ msgid ""
 "\n"
 "As a result, git cannot rebase them."
 msgstr ""
-"git va trobar un error en preparar els pedaços per a tornar a reproduir "
-"aquests revisions per cent. Com a resultat git no pot refer-los."
+"\n"
+"git ha trobat un error en preparar els pedaços per a tornar a reproduir\n"
+"aquestes revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"Com a resultat, git no pot fer un «rebase» d'elles."
 
 #: builtin/rebase.c:925
-#, fuzzy, c-format
+#, c-format
 msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
 msgstr ""
-"no es reconeix el tipus buit «%s»; els valors vàlids són «drop» «keep» i "
-"«ask»."
+"tipus buit no reconegut «%s»; els valors vàlids són «drop», «keep» i «ask»."
 
 #: builtin/rebase.c:943
 #, c-format
@@ -20635,7 +20342,6 @@ msgstr ""
 "\n"
 
 #: builtin/rebase.c:989
-#, fuzzy
 msgid "exec commands cannot contain newlines"
 msgstr "les ordres exec no poden contenir línies noves"
 
@@ -20648,7 +20354,6 @@ msgid "rebase onto given branch instead of upstream"
 msgstr "fes un «rebase» en la branca donada en comptes de la font"
 
 #: builtin/rebase.c:1025
-#, fuzzy
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "utilitza la base de fusió de la font i la branca com a base actual"
 
@@ -20665,19 +20370,16 @@ msgid "display a diffstat of what changed upstream"
 msgstr "mostra un «diffstat» del que ha canviat a la font"
 
 #: builtin/rebase.c:1035
-#, fuzzy
 msgid "do not show diffstat of what changed upstream"
-msgstr "no mostris «diffstat» de quina font ha canviat"
+msgstr "no mostris «diffstat» del que ha canviat a la font"
 
 #: builtin/rebase.c:1038
-#, fuzzy
 msgid "add a Signed-off-by trailer to each commit"
-msgstr "afegeix una línia signada per cada entrega"
+msgstr "afegeix un «trailer» tipus «Signed-off-by» a cada comissió"
 
 #: builtin/rebase.c:1041
-#, fuzzy
 msgid "make committer date match author date"
-msgstr "Agrupa per «comitter» en comptes de per autor"
+msgstr "fes que la data del «comitter» coincideixi amb la data de l'autor"
 
 #: builtin/rebase.c:1043
 msgid "ignore author date and use current date"
@@ -20725,11 +20427,11 @@ msgstr "mostra el pedaç que s'està aplicant o fusionant"
 
 #: builtin/rebase.c:1073
 msgid "use apply strategies to rebase"
-msgstr "utilitza estratègies d'aplicació per fer «rebase»"
+msgstr "utilitza estratègies d'aplicació per a fer «rebase»"
 
 #: builtin/rebase.c:1077
 msgid "use merging strategies to rebase"
-msgstr "utilitza estratègies de fusió per fer «rebase»"
+msgstr "utilitza estratègies de fusió per a fer «rebase»"
 
 #: builtin/rebase.c:1081
 msgid "let the user edit the list of commits to rebase"
@@ -20744,7 +20446,6 @@ msgid "how to handle commits that become empty"
 msgstr "com gestionar les comissions que queden buides"
 
 #: builtin/rebase.c:1093
-#, fuzzy
 msgid "keep commits which start empty"
 msgstr "manté les comissions que comencen en blanc"
 
@@ -20753,10 +20454,8 @@ msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "mou les comissions que comencen amb squash!/fixup! sota -i"
 
 #: builtin/rebase.c:1104
-#, fuzzy
 msgid "add exec lines after each commit of the editable list"
-msgstr ""
-"afegeix línies d'exec després de cada publicació de la llista editable"
+msgstr "afegeix línies d'exec després de cada comissió de la llista editable"
 
 #: builtin/rebase.c:1108
 msgid "allow rebasing commits with empty messages"
@@ -20764,11 +20463,11 @@ msgstr "permet fer «rebase» de les comissions amb missatges buits"
 
 #: builtin/rebase.c:1112
 msgid "try to rebase merges instead of skipping them"
-msgstr "intenta fer «rebase» de les fusions en comptes de ometre-les"
+msgstr "intenta fer «rebase» de les fusions en comptes d'ometre-les"
 
 #: builtin/rebase.c:1115
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "usa «merge-base --fork-point» per refinar la font"
+msgstr "usa «merge-base --fork-point» per a refinar la font"
 
 #: builtin/rebase.c:1117
 msgid "use the given merge strategy"
@@ -20787,9 +20486,8 @@ msgid "rebase all reachable commits up to the root(s)"
 msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel"
 
 #: builtin/rebase.c:1126
-#, fuzzy
 msgid "automatically re-schedule any `exec` that fails"
-msgstr "torna a planificar automàticament qualsevol `exec` que falli"
+msgstr "torna a planificar automàticament qualsevol «exec» que falli"
 
 #: builtin/rebase.c:1128
 msgid "apply all changes, even those already present upstream"
@@ -20800,23 +20498,8 @@ msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
 
 #: builtin/rebase.c:1180
-#, fuzzy
 msgid "--preserve-merges was replaced by --rebase-merges"
-msgstr ""
-"git rebase --preserve-merges està en desús. Utilitzeu --rebase-merges en "
-"lloc seu."
-
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "no es pot combinar «--keep-base» amb «--onto»"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "no es pot combinar «--keep-base» amb «--root»"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "no es pot combinar «--root» amb «--fork-point»"
+msgstr "--preserve-merges ha estat substituït per --rebase-merges"
 
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
@@ -20848,7 +20531,7 @@ msgid "could not move back to %s"
 msgstr "no s'ha pogut tornar a %s"
 
 #: builtin/rebase.c:1325
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
 "I wonder if you are in the middle of another rebase.  If that is the\n"
@@ -20859,9 +20542,13 @@ msgid ""
 "and run me again.  I am stopping in case you still have something\n"
 "valuable there.\n"
 msgstr ""
-"Sembla que ja hi ha un directori per cent i em pregunto si està vostè enmig "
-"d'un altre rebase. Si és així, si us plau, provi-ho si no és així, si us "
-"plau inciti-me."
+"Sembla que ja exigeix un directori %s, i em pregunto\n"
+"si esteu enmig d'un altre «rebase». Si aquest és el cas, proveu\n"
+"\t%s\n"
+"Si no és cas\n"
+"\t%s\n"
+"i executeu aquesta ordre de nou. S'atura l'operació en cas que\n"
+"tingueu quelcom valuós.\n"
 
 #: builtin/rebase.c:1353
 msgid "switch `C' expects a numerical value"
@@ -20877,13 +20564,13 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requereix --merge o --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "no es poden combinar les opcions d'aplicació amb les opcions de fusió"
+msgid "apply options and merge options cannot be used together"
+msgstr "les opcions apply i merge no es poden usar juntes"
 
 #: builtin/rebase.c:1476
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown rebase backend: %s"
-msgstr "Rebase de system%s desconegut"
+msgstr "Rerefons de «rebase» desconegut: %s"
 
 #: builtin/rebase.c:1505
 msgid "--reschedule-failed-exec requires --exec or --interactive"
@@ -20899,14 +20586,14 @@ msgid "Could not create new root commit"
 msgstr "No s'ha pogut crear una comissió arrel nova"
 
 #: builtin/rebase.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': need exactly one merge base with branch"
-msgstr "'%s' necessita exactament una base de fusió amb branca"
+msgstr "«%s»: necessita exactament una base de fusió amb branca"
 
 #: builtin/rebase.c:1571
-#, fuzzy, c-format
+#, c-format
 msgid "'%s': need exactly one merge base"
-msgstr "'%s' necessita exactament una base de fusió"
+msgstr "«%s»: necessita exactament una base de fusió"
 
 #: builtin/rebase.c:1580
 #, c-format
@@ -20914,18 +20601,17 @@ msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a una comissió vàlida «%s»"
 
 #: builtin/rebase.c:1607
-#, fuzzy, c-format
+#, c-format
 msgid "no such branch/commit '%s'"
-msgstr "fatal no existeix aquesta branca/commit «%s»"
+msgstr "no existeix aquesta branca o comissió «%s»"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referència: %s"
 
 #: builtin/rebase.c:1629
-#, fuzzy
 msgid "Could not resolve HEAD to a revision"
 msgstr "No s'ha pogut resoldre HEAD a una revisió"
 
@@ -20990,7 +20676,7 @@ msgstr "Avanç ràpid %s a %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -21021,7 +20707,7 @@ msgstr ""
 "per defecte, establiu la variable de configuració\n"
 "«receive.denyCurrentBranch» a «refuse»."
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -21043,13 +20729,13 @@ msgstr ""
 "\n"
 "Per a silenciar aquest missatge, podeu establir-la a «refuse»."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Heu d'especificar un directori."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "heu d'especificar un directori"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -21057,7 +20743,7 @@ msgid ""
 "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
 " <refs>..."
 msgstr ""
-"git reflog expire [--expire=<hora>] [--expire-unreachable=<hora>] "
+"git reflog expire [--expire=<data>] [--expire-unreachable=<data>] "
 "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all]"
 " <referències>..."
 
@@ -21073,41 +20759,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referència>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "«%s» no és una marca de temps vàlida"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "S'estan marcant els objectes abastables..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s no apunta a enlloc"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "no s'ha especificat cap registre de referència per a suprimir"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "no és un registre de referència: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "cap registre de referència per a «%s»"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de referència no vàlid: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -21198,6 +20884,11 @@ msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
 msgid "Updating %s"
 msgstr "S'està actualitzant %s"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "No s'ha pogut obtenir %s"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21256,9 +20947,9 @@ msgid "Could not setup master '%s'"
 msgstr "No s'ha pogut configurar la mestra «%s»"
 
 #: builtin/remote.c:322
-#, c-format, fuzzy
+#, c-format
 msgid "unhandled branch.%s.rebase=%s; assuming 'true'"
-msgstr "branca no gestionada.%s.rebase=%s; assumint 'true'"
+msgstr "no s'ha gestionat branch.%s.rebase=%s; assumint «true»"
 
 #: builtin/remote.c:366
 #, c-format
@@ -21280,14 +20971,15 @@ msgid "could not set '%s'"
 msgstr "no s'ha pogut establir «%s»"
 
 #: builtin/remote.c:665
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The %s configuration remote.pushDefault in:\n"
 "\t%s:%d\n"
 "now names the non-existent remote '%s'"
 msgstr ""
-"La configuració dels percentatges és remota.pushDefault ins%d ara anomena "
-"els \"%s\" remots inexistents"
+"La configuració %s remote.pushDefault a:\n"
+"\t%s:%d\n"
+"ara anomena un remot no existent «%s»"
 
 #: builtin/remote.c:696 builtin/remote.c:841 builtin/remote.c:948
 #, c-format
@@ -21367,9 +21059,9 @@ msgid "rebases interactively onto remote %s"
 msgstr "es fa «rebase» interactivament sobre el remot %s"
 
 #: builtin/remote.c:1068
-#, fuzzy, c-format
+#, c-format
 msgid "rebases interactively (with merges) onto remote %s"
-msgstr "rebases interactivament (amb fusions) en percentatges remots"
+msgstr "es fa «rebase» interactivament (amb fusions) sobre el remot %s"
 
 #: builtin/remote.c:1071
 #, c-format
@@ -21642,172 +21334,154 @@ msgstr ""
 "--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
 
 #: builtin/repack.c:201
-#, fuzzy
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
-"no s'han pogut iniciar pack-objects per tornar a empaquetar els objectes "
-"«promissor»"
+"no s'ha pogut iniciar pack-objects per a tornar a empaquetar els objectes "
+"«promisor»"
 
-#: builtin/repack.c:273 builtin/repack.c:816
-#, fuzzy
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
-"reempaqueta S'esperen línies d'id. de l'objecte hexadecimal complet només "
+"repack: s'esperen només línies amb l'id d'objecte hexadecimal complet "
 "des de pack-objects."
 
-#: builtin/repack.c:297
-#, fuzzy
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
-"no s'ha pogut finalitzar el paquet d'objectes per tornar a empaquetar "
-"objectes promisor"
+"no s'ha pogut finalitzar pack-objects per a tornar a empaquetar els objectes "
+"«promisor»"
 
-#: builtin/repack.c:312
-#, fuzzy, c-format
+#: builtin/repack.c:314
+#, c-format
 msgid "cannot open index for %s"
-msgstr "s'ha produït un error en obrir l'índex per «%s»"
+msgstr "no s'ha pogut obrir l'índex per a %s"
 
-#: builtin/repack.c:371
-#, fuzzy, c-format
+#: builtin/repack.c:373
+#, c-format
 msgid "pack %s too large to consider in geometric progression"
-msgstr "el paquet %s és massa gran per considerar en la progressió geomètrica"
+msgstr "el paquet %s és massa gran per a considerar-ho en progressió geomètrica"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
-#, fuzzy, c-format
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
+#, c-format
 msgid "pack %s too large to roll up"
-msgstr "el paquet %s és massa gran per enrotllar-lo"
+msgstr "el paquet %s és massa gran per a enrotllar-lo"
 
-#: builtin/repack.c:496
-#, fuzzy, c-format
+#: builtin/repack.c:498
+#, c-format
 msgid "could not open tempfile %s for writing"
-msgstr "no s'ha pogut obrir «%s» per a escriptura"
+msgstr "no s'ha pogut obrir el fitxer temporal «%s» per a escriptura"
 
-#: builtin/repack.c:514
-#, fuzzy
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
-msgstr "no s'ha pogut crear el fitxer temporal"
+msgstr "no s'ha pogut tancar el fitxer temporal amb la instantània de referències"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "empaqueta-ho tot en un únic paquet"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "el mateix que -a, i solta els objectes inabastables"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "elimina els paquets redundants, i executeu git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passa --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passa --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "escriu índex de mapa de bits"
 
-#: builtin/repack.c:646
-#, fuzzy
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
-msgstr "passa --delta-illes a git-pack-objects"
+msgstr "passa --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "data aproximada"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
-msgstr "amb -A, no soltis els objectes més vells que aquest"
+msgstr "amb -A, no soltis els objectes més antics que aquest"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "mida de la finestra que s'usa per a compressió de diferències"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
 "d'entrades"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "limita el nombre màxim de fils"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "mida màxima de cada fitxer de paquet"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:664
-#, fuzzy
+#: builtin/repack.c:666
 msgid "do not repack this pack"
-msgstr "no reempaqueta aquest paquet"
+msgstr "no reempaquetis aquest paquet"
 
-#: builtin/repack.c:666
-#, fuzzy
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "troba una progressió geomètrica amb el factor <N>"
 
-#: builtin/repack.c:668
-#, fuzzy
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
-msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+msgstr "escriu un índex multipaquet dels paquets resultants"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable i -A són incompatibles"
-
-#: builtin/repack.c:713
-#, fuzzy
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--long és incompatible amb --abbrev=0"
-
-#: builtin/repack.c:825
-#, fuzzy
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
-msgstr "Res nou per empaquetar."
+msgstr "Res nou a empaquetar."
 
-#: builtin/repack.c:855
-#, fuzzy, c-format
+#: builtin/repack.c:859
+#, c-format
 msgid "missing required file: %s"
-msgstr "falten els arguments per a %s"
+msgstr "falta el fitxer requerit: %s"
 
-#: builtin/repack.c:857
-#, fuzzy, c-format
+#: builtin/repack.c:861
+#, c-format
 msgid "could not unlink: %s"
-msgstr "no s'ha pogut bloquejar «%s»"
+msgstr "no s'ha pogut desenllaçar: «%s»"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -21819,7 +21493,7 @@ msgstr "git replace [-f] --edit <objecte>"
 
 #: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <comissió> [<mare>...]"
+msgstr "git replace [-f] --graft <comissió> [<parent>...]"
 
 #: builtin/replace.c:25
 msgid "git replace [-f] --convert-graft-file"
@@ -21834,127 +21508,114 @@ msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<patró>]]"
 
 #: builtin/replace.c:90
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "invalid replace format '%s'\n"
 "valid formats are 'short', 'medium' and 'long'"
 msgstr ""
-"format de substitució no vàlid «%s» els formats vàlids són «short» «medium» "
-"i «long»"
+"format de reemplaçament no vàlid «%s»\n"
+"els formats vàlids són «short» «medium» i «long»"
 
 #: builtin/replace.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "replace ref '%s' not found"
-msgstr "no s'ha trobat la ref '%s'"
+msgstr "no s'ha trobat la referència de reemplaç '«%s»"
 
 #: builtin/replace.c:141
-#, fuzzy, c-format
+#, c-format
 msgid "Deleted replace ref '%s'"
 msgstr "S'ha suprimit la referència «%s»"
 
 #: builtin/replace.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid ref name"
-msgstr "'%s' no és un nom de referència vàlid"
+msgstr "«%s» no és un nom de referència vàlid"
 
 #: builtin/replace.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "replace ref '%s' already exists"
-msgstr "reemplaça la referència «%s» ja existeix"
+msgstr "la referència de reemplaçament «%s» ja existeix"
 
 #: builtin/replace.c:178
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Objects must be of the same type.\n"
 "'%s' points to a replaced object of type '%s'\n"
 "while '%s' points to a replacement object of type '%s'."
 msgstr ""
-"Els objectes han de ser del mateix tipus. «%s» apunta a un objecte "
-"substituït del tipus «%s» mentre que «%s» apunta a un objecte de substitució"
-" del tipus «%s»."
+"Els objectes han de ser del mateix tipus.\n"
+"«%s» apunta a un objecte substituït del tipus «%s»\n"
+"mentre que «%s» apunta a un objecte de substitució del tipus «%s»."
 
 #: builtin/replace.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open %s for writing"
-msgstr "no s'han pogut obrir els percentatges per escriure"
+msgstr "no s'ha pogut obrir %s per a escriptura"
 
 #: builtin/replace.c:242
-#, fuzzy
 msgid "cat-file reported failure"
-msgstr "error en el fitxer de gat"
+msgstr "cat-file ha informat d'un error"
 
 #: builtin/replace.c:258
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open %s for reading"
-msgstr "no s'han pogut obrir els percentatges de lectura"
+msgstr "no s'ha pogut obrir %s per a lectura"
 
-#: builtin/replace.c:272
-#, fuzzy
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "no s'ha pogut engendrar el mktree"
 
-#: builtin/replace.c:276
-#, fuzzy
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "no s'ha pogut llegir des de mktree"
 
-#: builtin/replace.c:285
-#, fuzzy
+#: builtin/replace.c:284
 msgid "mktree reported failure"
-msgstr "mktree ha fallat"
+msgstr "mktree ha informat d'una fallada"
 
-#: builtin/replace.c:289
-#, fuzzy
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree no ha retornat un nom d'objecte"
 
-#: builtin/replace.c:298
-#, fuzzy, c-format
+#: builtin/replace.c:297
+#, c-format
 msgid "unable to fstat %s"
-msgstr "no s'han pogut fer fstat%s"
+msgstr "no s'ha pogut fer fstat %s"
 
-#: builtin/replace.c:303
-#, fuzzy
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "no s'ha pogut escriure l'objecte a la base de dades"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, fuzzy, c-format
-msgid "not a valid object name: '%s'"
-msgstr "no és un nom d'objecte vàlid «%s»"
-
-#: builtin/replace.c:326
-#, fuzzy, c-format
+#: builtin/replace.c:325
+#, c-format
 msgid "unable to get object type for %s"
-msgstr "no s'ha pogut obtenir el tipus d'objecte per un percentatge"
+msgstr "no s'ha pogut obtenir el tipus d'objecte per a %s"
 
-#: builtin/replace.c:342
-#, fuzzy
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "l'edició del fitxer d'objecte ha fallat"
 
-#: builtin/replace.c:351
-#, fuzzy, c-format
+#: builtin/replace.c:350
+#, c-format
 msgid "new object is the same as the old one: '%s'"
-msgstr "l'objecte nou és el mateix que l'antic «%s»"
+msgstr "l'objecte nou és el mateix que l'antic: «%s»"
 
-#: builtin/replace.c:384
-#, fuzzy, c-format
+#: builtin/replace.c:383
+#, c-format
 msgid "could not parse %s as a commit"
-msgstr "no s'han pogut analitzar els percentatges com a comissió"
+msgstr "no s'ha pogut analitzar %s com a comissió"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "etiqueta de fusió mal formada en la comissió «%s»"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21963,106 +21624,103 @@ msgstr ""
 "la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
 "useu --edit en lloc de --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "la comissió original «%s» té una signatura gpg"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
 
-#: builtin/replace.c:488
-#, fuzzy, c-format
+#: builtin/replace.c:487
+#, c-format
 msgid "graft for '%s' unnecessary"
-msgstr "empelt per '%s' innecessari"
+msgstr "«graft» per a «%s» innecessari"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "la comissió nova és la mateixa que l'antiga: «%s»"
 
-#: builtin/replace.c:527
-#, fuzzy, c-format
+#: builtin/replace.c:526
+#, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
-msgstr "no s'han pogut convertir els següents percentatges d'empelt"
+msgstr "no s'han pogut convertir els següents «grafts»:\n"
+"%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
-msgstr "llista les referències reemplaçades"
+msgstr "llista les referències de reemplaçament"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "suprimeix les referències de reemplaçament"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "edita un objecte existent"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
-msgstr "canvia les mares d'una comissió"
+msgstr "canvia els pares d'una comissió"
 
-#: builtin/replace.c:552
-#, fuzzy
+#: builtin/replace.c:551
 msgid "convert existing graft file"
-msgstr "converteix el fitxer d'empelt existent"
+msgstr "converteix el fitxer «graft» existent"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "reemplaça la referència si existeix"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimeixis bellament els continguts per a --edit"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "usa aquest format"
 
-#: builtin/replace.c:569
-#, fuzzy
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
-msgstr "no es pot utilitzar «--format» en no llistar"
+msgstr "no es pot utilitzar «--format» quan no s'està llistant"
 
-#: builtin/replace.c:577
-#, fuzzy
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f només té sentit quan s'escriu un reemplaçament"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw només té sentit amb --edit"
 
-#: builtin/replace.c:587
-#, fuzzy
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d necessita almenys un argument"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "nombre incorrecte d'arguments"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e necessita exactament un argument"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g necessita almenys un argument"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file arguments"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "només es pot especificar un patró amb -l"
 
@@ -22076,169 +21734,154 @@ msgid "register clean resolutions in index"
 msgstr "registra les resolucions netes en l'índex"
 
 #: builtin/rerere.c:77
-#, fuzzy
 msgid "'git rerere forget' without paths is deprecated"
-msgstr "'git rererere oblid' sense camins està en desús"
+msgstr "«git rerere forget» sense camins està en desús"
 
 #: builtin/rerere.c:111
 #, c-format
 msgid "unable to generate diff for '%s'"
-msgstr "s'ha pogut generar el diff per a «%s»"
+msgstr "no s'ha pogut generar el diff per a «%s»"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
 
-#: builtin/reset.c:33
-#, fuzzy
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>"
+msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 
-#: builtin/reset.c:34
-#, fuzzy
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 
-#: builtin/reset.c:35
-#, fuzzy
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>]"
+msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "mixt"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "suau"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "dur"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "fusió"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "reteniment"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vàlid."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "S'ha produït un error en trobar l'arbre de HEAD."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, 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:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ara és a %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, 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:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "sigues silenciós, només informa d'errors"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'índex i l'arbre de treball"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr "registra només el fet que els camins eliminats s'afegiran després"
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid."
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 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:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "el restabliment de %s no es permet en un repositori nu"
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N només es pot usar amb --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:422
-#, fuzzy, c-format
+#: builtin/reset.c:523
+#, c-format
 msgid ""
 "\n"
 "It took %.2f seconds to enumerate unstaged changes after reset.  You can\n"
 "use '--quiet' to avoid this.  Set the config setting reset.quiet to true\n"
 "to make this the default.\n"
 msgstr ""
-"S'ha trigat segons de 4% a enumerar els canvis sense classificar després del"
-" reinici. Podeu utilitzar «--quiet» per evitar-ho. Establiu el paràmetre de "
-"configuració reset.quiet a cert per fer que això sigui el predeterminat."
+"\n"
+"S'ha trigat %.2f segons a enumerar els canvis «unstaged» després del reinici.\n"
+"Podeu utilitzar «--quiet» per a evitar-ho. Establiu el paràmetre de configuració\n"
+"reset.quiet a true per a fer que aquesta configuració sigui predeterminada.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "no es pot combinar --exclude-promisor-objects i --missing"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "el filtratge d'objectes requereix --objects"
@@ -22248,9 +21891,9 @@ msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
 #: builtin/rev-list.c:679
-#, fuzzy
-msgid "marked counting is incompatible with --objects"
-msgstr "el recompte marcat és incompatible amb --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "«marked counting» i «%s» no es poden usar junts"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22269,19 +21912,16 @@ msgid "output in stuck long form"
 msgstr "emet en forma llarga enganxada"
 
 #: builtin/rev-parse.c:438
-#, fuzzy
 msgid "premature end of input"
-msgstr "error de lectura d'entrada"
+msgstr "final prematur de l'entrada"
 
 #: builtin/rev-parse.c:442
-#, fuzzy
 msgid "no usage string given before the `--' separator"
 msgstr "no s'ha indicat cap cadena d'ús abans del separador «--»"
 
 #: builtin/rev-parse.c:548
-#, fuzzy
 msgid "Needed a single revision"
-msgstr "make_script: s'ha produït un error en preparar les revisions"
+msgstr "Cal una sola revisió"
 
 #: builtin/rev-parse.c:552
 msgid ""
@@ -22291,61 +21931,55 @@ msgid ""
 "\n"
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr ""
-"git rev-parse --parseopt [<opcions>] -- [<arguments>...]\n"
-"   o bé: git rev-parse --sq-quote [<argument>...]\n"
-"   o bé: git rev-parse [<opcions>] [<argument>...]\n"
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+"   o bé: git rev-parse --sq-quote [<arg>...]\n"
+"   o bé: git rev-parse [<options>] [<arg>...]\n"
 "\n"
 "Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer ús."
 
 #: builtin/rev-parse.c:712
-#, fuzzy
 msgid "--resolve-git-dir requires an argument"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--resolve-git-dir requereix un argument"
 
 #: builtin/rev-parse.c:715
-#, fuzzy, c-format
+#, c-format
 msgid "not a gitdir '%s'"
-msgstr "no és una revisió \"%s\""
+msgstr "no és un directori git «%s»"
 
 #: builtin/rev-parse.c:739
-#, fuzzy
 msgid "--git-path requires an argument"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--git-path requereix un argument"
 
 #: builtin/rev-parse.c:749
-#, fuzzy
 msgid "-n requires an argument"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "-n requereix un argument"
 
 #: builtin/rev-parse.c:763
-#, fuzzy
 msgid "--path-format requires an argument"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--path-format requereix un argument"
 
 #: builtin/rev-parse.c:769
-#, fuzzy, c-format
+#, c-format
 msgid "unknown argument to --path-format: %s"
-msgstr "Valor no vàlid per a --patch-format: %s"
+msgstr "argument no vàlid per a --path-format: %s"
 
 #: builtin/rev-parse.c:776
-#, fuzzy
 msgid "--default requires an argument"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--default requereix un argument"
 
 #: builtin/rev-parse.c:782
-#, fuzzy
 msgid "--prefix requires an argument"
-msgstr "--bisect-next no requereix cap argument"
+msgstr "--prefix requereix un argument"
 
 #: builtin/rev-parse.c:851
-#, fuzzy, c-format
+#, c-format
 msgid "unknown mode for --abbrev-ref: %s"
-msgstr "valor desconegut per a --diff-merges: %s"
+msgstr "mode desconegut per a --abbrev-ref: %s"
 
 #: builtin/rev-parse.c:1023
-#, fuzzy, c-format
+#, c-format
 msgid "unknown mode for --show-object-format: %s"
-msgstr "mode de creació d'objecte no vàlid: %s"
+msgstr "mode desconegut per a --show-object-format: %s"
 
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
@@ -22449,11 +22083,11 @@ msgid_plural ""
 "the following files have staged content different from both the\n"
 "file and the HEAD:"
 msgstr[0] ""
-"el fitxer següent té contingut «stage» diferent d'ambdós el\n"
-"fitxer i la HEAD:"
+"el fitxer següent té contingut «staged» diferent al fitxer\n"
+"i a HEAD:"
 msgstr[1] ""
-"els fitxers següents tenen contingut «stage» diferent d'ambdós\n"
-"el fitxer i la HEAD:"
+"els fitxers següents tenen contingut «staged» diferent al fitxer\n"
+"i a HEAD:"
 
 #: builtin/rm.c:213
 msgid ""
@@ -22504,16 +22138,14 @@ msgid "exit with a zero status even if nothing matched"
 msgstr "surt amb estat zero encara que res hagi coincidit"
 
 #: builtin/rm.c:285
-#, fuzzy
 msgid "No pathspec was given. Which files should I remove?"
 msgstr ""
-"No s'ha indicat cap especificació de camí. Quins fitxers haig de suprimir?"
+"No s'ha indicat cap especificació de camí. Quins fitxers s'han de suprimir?"
 
 #: builtin/rm.c:315
-#, fuzzy
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"si us plau astaqueu els canvis a .gitmodules o feu un «stash» per continuar"
+"feu un «stage» dels canvis a .gitmodules o feu un «stash» per a continuar"
 
 #: builtin/rm.c:337
 #, c-format
@@ -22526,15 +22158,16 @@ msgid "git rm: unable to remove %s"
 msgstr "git rm: no s'ha pogut eliminar %s"
 
 #: builtin/send-pack.c:20
-#, fuzzy
 msgid ""
 "git send-pack [--mirror] [--dry-run] [--force]\n"
 "              [--receive-pack=<git-receive-pack>]\n"
 "              [--verbose] [--thin] [--atomic]\n"
 "              [<host>:]<directory> (--all | <ref>...)"
 msgstr ""
-"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] [<màquina>:]<directori> [<referència>...]\n"
-"  --all i especificació <referència> explícita són mútuament excloents."
+"git send-pack [--mirror] [--dry-run] [--force]\n"
+"              [--receive-pack=<git-receive-pack>]\n"
+"              [--verbose] [--thin] [--atomic]\n"
+"              [<host>:]<directory> (--all | <ref>...)"
 
 #: builtin/send-pack.c:192
 msgid "remote name"
@@ -22561,65 +22194,56 @@ msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<opcions>]"
 
 #: builtin/shortlog.c:123
-#, fuzzy
 msgid "using multiple --group options with stdin is not supported"
-msgstr "no s'admet escriure a stdin"
+msgstr "no s'admet l'ús de múltiples opcions --group amb stdin"
 
 #: builtin/shortlog.c:133
-#, fuzzy
 msgid "using --group=trailer with stdin is not supported"
-msgstr "no s'admet escriure a stdin"
+msgstr "no s'admet l'ús de --group=trailer amb stdin"
 
 #: builtin/shortlog.c:323
-#, fuzzy, c-format
+#, c-format
 msgid "unknown group type: %s"
-msgstr "tipus desconegut"
+msgstr "tipus de grup desconegut: %s"
 
 #: builtin/shortlog.c:351
-#, fuzzy
 msgid "group by committer rather than author"
-msgstr "Agrupa per «comitter» en comptes de per autor"
+msgstr "agrupa per «comitter» en comptes de per autor"
 
 #: builtin/shortlog.c:354
 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:356
-#, fuzzy
 msgid "suppress commit descriptions, only provides commit count"
 msgstr ""
-"Omet les descripcions de comissió, només proveeix el recompte de comissions"
+"omet les descripcions de les comissions, només proveeix el recompte de comissions"
 
 #: builtin/shortlog.c:358
-#, fuzzy
 msgid "show the email address of each author"
-msgstr "Mostra l'adreça electrònica de cada autor"
+msgstr "mostra l'adreça electrònica de cada autor"
 
 #: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
 #: builtin/shortlog.c:360
-#, fuzzy
 msgid "linewrap output"
-msgstr "Ajusta les línies de la sortida"
+msgstr "ajusta les línies de la sortida"
 
 #: builtin/shortlog.c:362
-#, fuzzy
 msgid "field"
 msgstr "camp"
 
 #: builtin/shortlog.c:363
-#, fuzzy
 msgid "group by field"
-msgstr "Agrupa per camp"
+msgstr "agrupa per camp"
 
 #: builtin/shortlog.c:394
 msgid "too many arguments given outside repository"
 msgstr "hi ha massa arguments donats fora del repositori"
 
 #: builtin/show-branch.c:13
-#, fuzzy
 msgid ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 "                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
@@ -22627,9 +22251,9 @@ msgid ""
 "                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t[--current] [--color[=<quan>] | --no-color] [--sparse]\n"
-"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t[--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
+"                [--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"                [--more=<n> | --list | --independent | --merge-base]\n"
+"                [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 
 #: builtin/show-branch.c:17
 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -22712,13 +22336,6 @@ msgstr "<n>[,<base>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostra les <n> entrades més recents començant a la base"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-"
-"base"
-msgstr ""
-"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "no s'ha donat cap branca, i HEAD no és vàlid"
@@ -22739,32 +22356,30 @@ msgstr[1] "es poden mostrar només %d entrades a la vegada."
 msgid "no such ref %s"
 msgstr "no hi ha tal referència %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "no es pot gestionar més d'%d revisió."
 msgstr[1] "no es poden gestionar més de %d revisions."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "«%s» no és una referència vàlida."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "no es pot trobar la comissió %s (%s)"
 
 #: builtin/show-index.c:21
-#, fuzzy
 msgid "hash-algorithm"
-msgstr "<algorisme>"
+msgstr "algorisme de resum"
 
 #: builtin/show-index.c:31
-#, fuzzy
 msgid "Unknown hash algorithm"
-msgstr "variable  «%s» desconeguda"
+msgstr "Algorisme de resum desconegut"
 
 #: builtin/show-ref.c:12
 msgid ""
@@ -22813,113 +22428,127 @@ msgid "show refs from stdin that aren't in local repository"
 msgstr "mostra les referències de stdin que no siguin en el repositori local"
 
 #: builtin/sparse-checkout.c:22
-#, fuzzy
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <opcions>"
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opcions>"
 
 #: builtin/sparse-checkout.c:46
-#, fuzzy
 msgid "git sparse-checkout list"
-msgstr "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
-#, fuzzy
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "aquest arbre de treball no és dispers"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout"
 " no existeixi)"
 
-#: builtin/sparse-checkout.c:173
-#, c-format, fuzzy
+#: builtin/sparse-checkout.c:176
+#, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr ""
-"el directori '%s' conté fitxers no seguits, però no està en el con de la "
-"verificació dispersa"
+"el directori «%s» conté fitxers no seguits, però no està en el con de "
+"sparse-checkout"
 
-#: builtin/sparse-checkout.c:181
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:184
+#, c-format
 msgid "failed to remove directory '%s'"
-msgstr "s'ha produït un error en crear el directori «%s»"
+msgstr "s'ha produït un error en suprimir el directori «%s»"
 
-#: builtin/sparse-checkout.c:321
-#, fuzzy
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "no s'ha pogut crear el directori per al fitxer sparse-checkout"
 
-#: builtin/sparse-checkout.c:362
-#, fuzzy
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
-"no s'ha pogut actualitzar el format del repositori per habilitar "
+"no s'ha pogut actualitzar el format del repositori per a habilitar "
 "worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
-#, fuzzy
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:384
-#, fuzzy
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "no s'ha pogut modificar la configuració de l'índex dispers"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
-#, fuzzy
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "inicialitza el «sparse-checkout» en mode con"
 
-#: builtin/sparse-checkout.c:406
-#, fuzzy
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "commuta l'ús d'un índex dispers"
 
-#: builtin/sparse-checkout.c:434
-#, fuzzy
-msgid "failed to modify sparse-index config"
-msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "s'ha produït un error en obrir «%s»"
 
-#: builtin/sparse-checkout.c:507
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:528
+#, c-format
 msgid "could not normalize path %s"
-msgstr "no s'ha pogut normalitzar el camí"
-
-#: builtin/sparse-checkout.c:519
-#, fuzzy
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <patrons>)"
+msgstr "no s'ha pogut normalitzar el camí %s"
 
-#: builtin/sparse-checkout.c:544
-#, fuzzy, c-format
+#: builtin/sparse-checkout.c:557
+#, c-format
 msgid "unable to unquote C-style string '%s'"
-msgstr "no s'ha pogut treure la cadena de l'estil C «%s»"
+msgstr "no s'ha pogut treure la cita a la cadena amb estil C «%s»"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
-#, fuzzy
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "no s'han pogut carregar els patrons de «sparse-checkout» existents"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "els patrons de «sparse-checkout» existents no usen el mode con"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <patrons>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "llegeix els patrons de l'entrada estàndard"
 
-#: builtin/sparse-checkout.c:682
-#, fuzzy
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout init [--cone]"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "no hi ha un sparse-checkout a afegir"
 
-#: builtin/sparse-checkout.c:701
-#, fuzzy
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patrons>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"ha d'estar en un sparse-checkout per a tornar a aplicar patrons "
+"de dispersió"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
-msgstr "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "s'ha produït un error en actualitzar el directori de treball"
 
@@ -22932,12 +22561,10 @@ msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opcions>] [<stash>]"
 
 #: builtin/stash.c:26 builtin/stash.c:50
-#, fuzzy
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
 #: builtin/stash.c:27
-#, fuzzy
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
@@ -22946,23 +22573,23 @@ msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branca> [<stash>]"
 
 #: builtin/stash.c:30
-#, fuzzy
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|-patch] [-k|-[no-]keep-index] [-q|--quiet] "
-"[-u|--include-untracked] [-a|-all] [-m|-message <message>] [--pathspec-from-"
-"file=<file> [--path-spec-file-nul]]"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
+"          [--pathspec-from-file=<fitxer> [--pathspec-file-nul]]\n"
+"          [--] [<pathspec>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<missatge>]"
 
 #: builtin/stash.c:55
@@ -22988,13 +22615,12 @@ msgstr ""
 "          [--] [<pathspec>...]]"
 
 #: builtin/stash.c:87
-#, fuzzy
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "               [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [<missatge>]"
+"               [-u|--include-untracked] [-a|--all] [<missatge>]"
 
 #: builtin/stash.c:130
 #, c-format
@@ -23016,20 +22642,19 @@ msgid "%s is not a valid reference"
 msgstr "«%s» no és una referència vàlida"
 
 #: builtin/stash.c:227
-#, fuzzy
 msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear amb paràmetres no està implementat"
 
 #: builtin/stash.c:447
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: Untracked file in way of tracked file!  Renaming\n"
 "            %s -> %s\n"
 "         to make room.\n"
 msgstr ""
 "AV�S: El fitxer no seguit en el camí del fitxer seguit!  S'està reanomenant\n"
-"            %s - % %s\n"
-"         per fer espai."
+"            %s -> %s\n"
+"         per a fer-ne espai.\n"
 
 #: builtin/stash.c:508
 msgid "cannot apply a stash in the middle of a merge"
@@ -23041,7 +22666,6 @@ msgid "could not generate diff %s^!."
 msgstr "no s'ha pogut generar diff %s^!."
 
 #: builtin/stash.c:526
-#, fuzzy
 msgid "conflicts in index. Try without --index."
 msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
 
@@ -23058,152 +22682,162 @@ msgstr "S'està fusionant %s amb %s"
 msgid "Index was not unstashed."
 msgstr "L'índex no estava «unstashed»."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "intenta tornar a crear l'índex"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Descartada %s (%s)"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: no s'ha pogut descartar l'entrada «stash»"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "«%s» no és una referència «stash»"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: builtin/stash.c:824
-#, fuzzy
+#: builtin/stash.c:825
 msgid "failed to parse tree"
-msgstr "s'ha produït un error en analitzar %s"
+msgstr "s'ha produït un error en analitzar l'arbre"
 
-#: builtin/stash.c:835
-#, fuzzy
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
-msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
+msgstr "s'ha produït un error en desempaquetar els arbres"
 
-#: builtin/stash.c:855
-#, fuzzy
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "inclou els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:858
-#, fuzzy
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
-msgstr "inclou els fitxers no seguits a «stash»"
+msgstr "mostra només els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "No es pot actualitzar %s amb %s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "missatge «stash»"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "«git stash store» requereix un argument <comissió>"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "No hi ha canvis a «stage»"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "No es poden desar els fitxers no seguits"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "No es pot desar l'estat «stage» actual"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 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"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "No es poden usar --staged i --include-untracked o --all a la vegada"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Heu oblidat de fer «git add»?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "S'han desat el directori de treball i l'estat d'índex %s"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "mantén l'índex"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
-#, fuzzy
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "fes «stash» només dels canvis «staged»"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
-msgstr "stash en mode pedaç"
+msgstr "fes «stash» en mode pedaç"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "mode silenciós"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "inclou els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "inclou els fitxers ignorats"
 
-#: builtin/stash.c:1717
-#, fuzzy
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
 msgstr ""
-"s'ha eliminat el suport «rebase.useBuiltin»! Per a més detalls vegeu la seva"
-" entrada a «git help config»."
+"s'ha eliminat l'opció stash.useBuiltin.\n"
+"Per a més detalls vegeu la seva entrada a «git help config»."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -23222,7 +22856,7 @@ 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:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "S'espera un nom de referència ple, s'ha rebut %s"
@@ -23245,7 +22879,7 @@ msgstr ""
 "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori "
 "és el seu repositori font autoritzat."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "àncora alternativa per als camins relatius"
 
@@ -23265,26 +22899,27 @@ msgid "Entering '%s'\n"
 msgstr "S'està entrant a «%s»\n"
 
 #: builtin/submodule--helper.c:523
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
-"runcommand ha retornat un estat diferent de zero per als percentatges ."
+"run_command ha retornat un estat diferent de zero per a %s\n"
+"."
 
 #: builtin/submodule--helper.c:545
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested submodules of %s\n"
 "."
 msgstr ""
-"runcommand ha retornat un estat diferent de zero mentre es repeteix als "
-"submòduls niats de percentatges ."
+"run_command ha retornat un estat diferent de zero mentre es treballava recursivament als "
+"submòduls imbricats de %s\n"
+"."
 
 #: builtin/submodule--helper.c:561
-#, fuzzy
 msgid "suppress output of entering each submodule command"
-msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
+msgstr "omet la sortida en entrar a cada ordre del submòdul"
 
 #: builtin/submodule--helper.c:563 builtin/submodule--helper.c:864
 #: builtin/submodule--helper.c:1453
@@ -23320,9 +22955,8 @@ msgstr ""
 "submòdul «%s»"
 
 #: builtin/submodule--helper.c:685
-#, fuzzy
 msgid "suppress output for initializing a submodule"
-msgstr "Omet la sortida d'inicialitzar un submòdul"
+msgstr "omet la sortida en inicialitzar un submòdul"
 
 #: builtin/submodule--helper.c:690
 msgid "git submodule--helper init [<options>] [<path>]"
@@ -23331,7 +22965,7 @@ msgstr "git submodule--helper init [<opcions>] [<camí>]"
 #: builtin/submodule--helper.c:763 builtin/submodule--helper.c:898
 #, 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:811
 #, c-format
@@ -23343,19 +22977,17 @@ msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»"
 msgid "failed to recurse into submodule '%s'"
 msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
-#, fuzzy
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
-msgstr "Suprimeix la sortida de l'estat del submòdul"
+msgstr "suprimeix la sortida de l'estat del submòdul"
 
 #: builtin/submodule--helper.c:863
-#, fuzzy
 msgid ""
 "use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr ""
-"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
-"submòdul HEAD"
+"utilitza la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
+"HEAD del submòdul"
 
 #: builtin/submodule--helper.c:869
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
@@ -23366,68 +22998,57 @@ msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camí>"
 
 #: builtin/submodule--helper.c:965
-#, fuzzy, c-format
+#, c-format
 msgid "* %s %s(blob)->%s(submodule)"
-msgstr "* el %s(blob)->%s(submòdul)"
+msgstr "* %s %s(blob)->%s(submòdul)"
 
 #: builtin/submodule--helper.c:968
-#, fuzzy, c-format
+#, c-format
 msgid "* %s %s(submodule)->%s(blob)"
-msgstr "* un %s per cents(submòdul)->%s(blob)"
+msgstr "* %s %s(submòdul)->%s(blob)"
 
 #: builtin/submodule--helper.c:981
-#, fuzzy, c-format
+#, c-format
 msgid "%s"
-msgstr "percentatges"
+msgstr "%s"
 
 #: builtin/submodule--helper.c:1031
-#, fuzzy, c-format
+#, c-format
 msgid "couldn't hash object from '%s'"
-msgstr "no s'ha pogut analitzar l'objecte «%s»"
+msgstr "no s'ha pogut fer el resum de l'objecte de «%s»"
 
 #: builtin/submodule--helper.c:1035
-#, fuzzy, c-format
+#, c-format
 msgid "unexpected mode %o\n"
-msgstr "mode inesperat $mod_dst"
+msgstr "mode inesperat %o\n"
 
 #: builtin/submodule--helper.c:1276
-#, fuzzy
 msgid "use the commit stored in the index instead of the submodule HEAD"
 msgstr ""
-"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
-"submòdul HEAD"
+"utilitza la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
+"HEAD del submòdul"
 
 #: builtin/submodule--helper.c:1278
-#, fuzzy
 msgid "compare the commit in the index with that in the submodule HEAD"
 msgstr ""
-"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
-"submòdul HEAD"
+"compara la comissió emmagatzemada a l'índex en lloc de l'emmagatzemada al "
+"HEAD del submòdul"
 
 #: builtin/submodule--helper.c:1280
-#, fuzzy
 msgid "skip submodules with 'ignore_config' value set to 'all'"
-msgstr "omet els submòduls amb el valor «ignoreconfig» establert a «all»"
+msgstr "omet els submòduls amb el valor «ignore_config» establert a «all»"
 
 #: builtin/submodule--helper.c:1282
-#, fuzzy
 msgid "limit the summary size"
-msgstr "limita a caps"
+msgstr "limita la mida del resum"
 
 #: builtin/submodule--helper.c:1287
-#, fuzzy
 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
-msgstr "git submodule--helper init [<opcions>] [<camí>]"
+msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
 
 #: builtin/submodule--helper.c:1311
-#, fuzzy
 msgid "could not fetch a revision for HEAD"
-msgstr "no s'ha pogut separar HEAD"
-
-#: builtin/submodule--helper.c:1316
-#, fuzzy
-msgid "--cached and --files are mutually exclusive"
-msgstr "-n i -k són mútuament excloents"
+msgstr "no s'ha pogut obtenir una revisió per a HEAD"
 
 #: builtin/submodule--helper.c:1373
 #, c-format
@@ -23452,24 +23073,23 @@ msgid "failed to update remote for submodule '%s'"
 msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
 
 #: builtin/submodule--helper.c:1451
-#, fuzzy
 msgid "suppress output of synchronizing submodule url"
-msgstr "Omet la sortida de la sincronització de l'url del submòdul"
+msgstr "omet la sortida de la sincronització de l'URL del submòdul"
 
 #: builtin/submodule--helper.c:1458
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"L'arbre de treball de submòdul «%s» conté un directori .git\n"
-"(useu «rm -rf» si realment voleu eliminar-lo, incloent tota la seva història)"
+"L'arbre de treball del submòdul «%s» conté un directori .git. Aquest es "
+"reemplaçarà amb un fitxer a .git mitjançant l'ús d'«absorbgitdirs»."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23478,322 +23098,304 @@ msgstr ""
 "L'arbre de treball del submòdul «%s» conté modificacions locals; useu «-f» "
 "per a descartar-les"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "S'ha esborrat el directori «%s»\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "no s'ha pogut crear el directori de submòdul buit %s"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n"
 
-#: builtin/submodule--helper.c:1590
-#, fuzzy
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
-"Elimina els arbres de treball dels submòduls fins i tot si contenen canvis "
+"elimina els arbres de treball dels submòduls fins i tot si contenen canvis "
 "locals"
 
-#: builtin/submodule--helper.c:1591
-#, fuzzy
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
-msgstr "Desregistra recursivament tots els submòduls"
+msgstr "desregistra tots els submòduls"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Useu «--all» si realment voleu desinicialitzar tots els submòduls"
 
-#: builtin/submodule--helper.c:1655
-#, fuzzy
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
 "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
-"Un càlcul alternatiu d'un superprojecte no és vàlid. Per permetre que Git "
-"cloni sense una alternativa en aquest cas establiu "
-"submòdul.alternateErrorStrategy a 'info' o clona equivalentment amb "
-"«--reference-if-able' en lloc de «--reference»."
+"Un càlcul alternatiu des d'un alternatiu d'un superprojecte no és vàlid.\n"
+"Per a permetre que Git cloni sense una alternativa en aquests casos, establiu\n"
+"submodule.alternateErrorStrategy a «info» o bé cloneu amb\n"
+"«--reference-if-able' en comptes de «--reference»."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy"
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
 
-#: builtin/submodule--helper.c:1771
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1772
+#, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr "refusant crear/usar '%s' en el directori git d'un altre submòdul"
+msgstr "s'ha rebutjat crear/usar «%s» en el directori git d'un altre submòdul"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "directori no buit: «%s»"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarà el submòdul nou"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "nom del submòdul nou"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "url del qual clonar el submòdul"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "força el progrés del clonatge"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "no permetis clonar en un directori no buit"
 
-#: builtin/submodule--helper.c:1887
-#, fuzzy
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
 "<url> --path <path>"
 msgstr ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [---reference "
-"<repository>] [--name <name>] [--depth <] [---single-branch] --url <url> "
-"--path <path>"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "El camí de submòdul «%s» no està inicialitzat"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potser voleu usar «update --init»?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "S'està ometent el submòdul no fusionat %s"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "S'està ometent el submòdul «%s»"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
 
-#: builtin/submodule--helper.c:2372
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2373
+#, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
-msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»"
+msgstr "No s'ha pogut agafar «%s» en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2376
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2377
+#, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
-msgstr ""
-"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
+msgstr "No s'ha pogut fer «rebase» «%s» en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2380
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2381
+#, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
-msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»"
+msgstr "No s'ha pogut fusionar «%s» en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2384
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2385
+#, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
-msgstr ""
-"L'execució de «$command $sha1» ha fallat en el camí de submòdul "
-"«$displaypath»"
+msgstr "L'execució de «%s %s» ha fallat en el camí de submòdul «%s»"
 
-#: builtin/submodule--helper.c:2408
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2409
+#, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
-msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»"
+msgstr "Camí de submòdul «%s»: s'ha agafat «%s»\n"
 
-#: builtin/submodule--helper.c:2412
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2413
+#, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
-msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»"
+msgstr "Camí de submòdul «%s»: s'ha fet «rebase» en «%s»\n"
 
-#: builtin/submodule--helper.c:2416
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2417
+#, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
-msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»"
+msgstr "Camí de submòdul «%s»: s'ha fusionat en «%s»\n"
 
-#: builtin/submodule--helper.c:2420
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2421
+#, c-format
 msgid "Submodule path '%s': '%s %s'\n"
-msgstr "El camí de submòdul «%s» no està inicialitzat"
+msgstr "El camí de submòdul «%s»: '%s %s'\n"
 
-#: builtin/submodule--helper.c:2444
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2445
+#, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
-"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
-"intentant obtenir directament $sha1:"
+"No s'ha pogut obtenir en el camí de submòdul «$%s»; s'està intentant obtenir"
+" directament %s:"
 
-#: builtin/submodule--helper.c:2453
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:2454
+#, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
 "of that commit failed."
 msgstr ""
-"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1."
-" L'obtenció directa d'aquella comissió ha fallat."
+"S'ha obtingut en un camí de submòdul «%s», però no contenia %s. "
+"L'obtenció directa d'aquesta comissió ha fallat."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "camí a l'arbre de treball"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 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:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:2517
-#, fuzzy
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
-msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
+msgstr "crea un clon superficial truncat al nombre de revisions especificat"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "tasques paral·leles"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 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:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrés del clonatge"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "valor incorrecte per al paràmetre update"
 
-#: builtin/submodule--helper.c:2565
-#, fuzzy
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
-msgstr "Omet la sortida d'inicialitzar un submòdul"
+msgstr "omet la sortida per les actualitzacions per «rebase» o fusió"
 
-#: builtin/submodule--helper.c:2566
-#, fuzzy
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "força les actualitzacions"
 
-#: builtin/submodule--helper.c:2568
-#, fuzzy
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
-msgstr "Crea un objecte arbre des de l'índex actual"
+msgstr "no obtinguis els objectes nous del lloc remot"
 
-#: builtin/submodule--helper.c:2570
-#, fuzzy
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr ""
-"substitueix el mode d'actualització en cas que el repositori sigui un clon "
+"sobreescriu el mode d'actualització en cas que el repositori sigui un clon "
 "nou"
 
-#: builtin/submodule--helper.c:2571
-#, fuzzy
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:2581
-#, fuzzy
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
-#, fuzzy
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "SHA1 esperat per superproject"
 
-#: builtin/submodule--helper.c:2584
-#, fuzzy
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
-#, fuzzy
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
-msgstr "SHA1 del CAP del submòdul"
+msgstr "SHA1 del HEAD del submòdul"
 
-#: builtin/submodule--helper.c:2591
-#, fuzzy
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
-msgstr "git submodule--helper init [<opcions>] [<camí>]"
+msgstr "git submodule--helper run-update-procedure [<options>] <path>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23802,173 +23404,152 @@ 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "no s'ha pogut obtenir el gestor del repositori pel submòdul «%s»"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "comprova si és segur escriure al fitxer .gitmodules"
 
-#: builtin/submodule--helper.c:2878
-#, fuzzy
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
-msgstr "no s'ha definit la configuració al fitxer .gitmodules"
+msgstr "desconfigura l'opció de configuració al fitxer .gitmodules"
 
-#: builtin/submodule--helper.c:2883
-#, fuzzy
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
-msgstr "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nom> [<valor>]"
 
-#: builtin/submodule--helper.c:2884
-#, fuzzy
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
-msgstr "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
-#, fuzzy
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr "Assegureu-vos que el fitxer .gitmodules és a l'arbre de treball"
+msgstr "assegureu-vos que el fitxer .gitmodules és a l'arbre de treball"
 
-#: builtin/submodule--helper.c:2920
-#, fuzzy
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
-msgstr "Omet la sortida d'inicialitzar un submòdul"
+msgstr "omet la sortida en configurar un URL d'un submòdul"
 
-#: builtin/submodule--helper.c:2924
-#, fuzzy
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgstr "git submodule--helper set-url [--quiet] <path> <newurl>"
 
-#: builtin/submodule--helper.c:2957
-#, fuzzy
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
-msgstr "mostra les branques amb seguiment remot"
+msgstr "estableix la branca de seguiment per defecte a «master»"
 
-#: builtin/submodule--helper.c:2959
-#, fuzzy
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
-msgstr "mostra les branques amb seguiment remot"
+msgstr "estableix la branca de seguiment per defecte"
 
-#: builtin/submodule--helper.c:2963
-#, fuzzy
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 
-#: builtin/submodule--helper.c:2964
-#, fuzzy
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 
-#: builtin/submodule--helper.c:2971
-#, fuzzy
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
-msgstr "cal el nom de branca"
-
-#: builtin/submodule--helper.c:2974
-#, fuzzy
-msgid "--branch and --default are mutually exclusive"
-msgstr "--deepen i --depth són mútuament excloents"
+msgstr "cal --branch o --default"
 
-#: builtin/submodule--helper.c:3037
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3038
+#, c-format
 msgid "Adding existing repo at '%s' to the index\n"
-msgstr "S'està afegint el repositori existent a «$sm_path» a l'índex"
+msgstr "S'està afegint el repositori existent a «%s» a l'índex\n"
 
-#: builtin/submodule--helper.c:3040
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3041
+#, c-format
 msgid "'%s' already exists and is not a valid git repo"
-msgstr "«$sm_path» ja existeix i no és un repositori de git vàlid"
+msgstr "«%s» ja existeix i no és un repositori de git vàlid"
 
-#: builtin/submodule--helper.c:3053
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3054
+#, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
-msgstr ""
-"S'ha trobat un directori de git per a «$sm_name» localment amb els remots:"
+msgstr "S'ha trobat un directori de git per a «%s» localment amb els remots:\n"
 
-#: builtin/submodule--helper.c:3060
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3061
+#, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
 "  %s\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 voleu reusar aquest directori de git local en lloc de clonar de nou de\n"
-"  $realrepo\n"
+"Si voleu reusar aquest directori de git local en comptes de clonar de nou de\n"
+"  %s\n"
 "useu l'opció «--force». Si el directori de git local no és el repositori correcte\n"
 "o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--name»."
 
-#: builtin/submodule--helper.c:3072
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3073
+#, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr ""
-"S'està reactivant el directori de git local per al submòdul «$sm_name»."
+"S'està reactivant el directori de git local per al submòdul «%s»\n"
 
-#: builtin/submodule--helper.c:3109
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3110
+#, c-format
 msgid "unable to checkout submodule '%s'"
-msgstr "No s'ha pogut agafar el submòdul «$sm_path»"
+msgstr "no s'ha pogut agafar el submòdul «%s»"
 
-#: builtin/submodule--helper.c:3148
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3149
+#, c-format
 msgid "Failed to add submodule '%s'"
-msgstr "S'ha produït un error en afegir el submòdul «$sm_path»"
+msgstr "S'ha produït un error en afegir el submòdul «%s»"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
+#, c-format
 msgid "Failed to register submodule '%s'"
-msgstr "S'ha produït un error en registrar el submòdul «$sm_path»"
+msgstr "S'ha produït un error en registrar el submòdul «%s»"
 
-#: builtin/submodule--helper.c:3221
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3222
+#, c-format
 msgid "'%s' already exists in the index"
-msgstr "«$sm_path» ja existeix en l'índex"
+msgstr "«%s» ja existeix en l'índex"
 
-#: builtin/submodule--helper.c:3224
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3225
+#, c-format
 msgid "'%s' already exists in the index and is not a submodule"
-msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
+msgstr "«%s» ja existeix en l'índex i no és submòdul"
 
-#: builtin/submodule--helper.c:3253
-#, fuzzy
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
-msgstr "la branca o entrega a agafar"
+msgstr "la branca del repositori a afegir com a submòdul"
 
-#: builtin/submodule--helper.c:3254
-#, fuzzy
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
-msgstr "permet afegir fitxers que d'altra manera s'ignoren"
+msgstr "permet afegir un camí de submòdul que si no s'hagués ignorat"
 
-#: builtin/submodule--helper.c:3256
-#, fuzzy
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
-msgstr "imprimeix només les referències que s'han fusionat"
+msgstr "mostra només els missatges d'error"
 
-#: builtin/submodule--helper.c:3260
-#, fuzzy
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr ""
-"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+"manlleva els objectes dels repositoris de referències"
 
-#: builtin/submodule--helper.c:3262
-#, fuzzy
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
@@ -23976,33 +23557,32 @@ msgstr ""
 "estableix el nom del submòdul a la cadena donada en lloc de per defecte al "
 "seu camí"
 
-#: builtin/submodule--helper.c:3269
-#, fuzzy
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
-msgstr "git submodule--helper init [<opcions>] [<camí>]"
+msgstr "git submodule--helper add [<opcions>] [--] <repositori> [<camí>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "El camí relatiu només es pot usar des del nivell superior de l'arbre de "
 "treball"
 
-#: builtin/submodule--helper.c:3305
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3306
+#, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
-msgstr "URL de repositori: «$repo» ha de ser absolut o començar amb ./|../"
+msgstr "URL de repositori: «%s» ha de ser absolut o començar amb ./|../"
 
-#: builtin/submodule--helper.c:3340
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:3341
+#, c-format
 msgid "'%s' is not a valid submodule name"
-msgstr "«%s» no és un nom de remot vàlid"
+msgstr "«%s» no és un nom de submòdul vàlid"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» no és una subordre vàlida de submodule--helper"
@@ -24036,26 +23616,24 @@ msgid "reason of the update"
 msgstr "raó de l'actualització"
 
 #: builtin/tag.c:25
-#, fuzzy
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "        <tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <fitxer>]\n"
+"        <tagname> [<head>]"
 
 #: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nom-d'etiqueta>..."
 
 #: builtin/tag.c:28
-#, fuzzy
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
 "        [--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
 msgstr ""
-"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] [--points-at <objecte>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
+"        [--format=<format>] [--merged <comissió>] [--no-merged <comissió>] [<patró>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -24097,31 +23675,32 @@ msgstr ""
 "  %s\n"
 "Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós mateix si voleu.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "no s'ha pogut signar l'etiqueta"
 
-#: builtin/tag.c:259
-#, fuzzy, c-format
+#: builtin/tag.c:258
+#, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
 "already a tag. If you meant to tag the object that it points to, use:\n"
 "\n"
 "\tgit tag -f %s %s^{}"
 msgstr ""
-"Heu creat una etiqueta niada. L'objecte al qual fa referència la vostra nova"
-" etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte que apunta per "
-"utilitzar l'etiqueta git -f%s%s perds^{}"
+"Heu creat una etiqueta embrincada. L'objecte al qual fa referència la nova\n"
+"etiqueta ja és una etiqueta. Si voleu etiquetar l'objecte al qual apunta, useu:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "el tipus d'objecte és incorrecte."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "S'ha deixat el missatge de l'etiqueta en %s\n"
@@ -24202,45 +23781,22 @@ msgstr "imprimeix només les etiquetes que no s'han fusionat"
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column i -n són incompatibles"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "es permet l'opció -n només amb mode llista"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "es permet l'opció --contains només amb mode llista"
-
-#: builtin/tag.c:550
-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:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "es permet --points-at option només amb mode llista"
-
-#: builtin/tag.c:554
-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:568
-msgid "only one -F or -m option is allowed."
-msgstr "només es permet una opció -F o -m."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "l'opció «%s» només està permesa en mode de llista"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» no és un nom d'etiqueta vàlid."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'etiqueta «%s» ja existeix"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta «%s» actualitzada (era %s)\n"
@@ -24368,9 +23924,8 @@ msgid "clear skip-worktree bit"
 msgstr "esborra el bit skip-worktree"
 
 #: builtin/update-index.c:1020
-#, fuzzy
 msgid "do not touch index-only entries"
-msgstr "no toquis entrades de només índex"
+msgstr "no toquis les entrades de només índex"
 
 #: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
@@ -24437,7 +23992,6 @@ 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:1063
-#, fuzzy
 msgid "write out the index even if is not flagged as changed"
 msgstr "escriu l'índex encara que no estigui marcat com a canviat"
 
@@ -24562,9 +24116,8 @@ msgid "quit after a single request/response exchange"
 msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
 
 #: builtin/upload-pack.c:26
-#, fuzzy
 msgid "serve up the info/refs for git-http-backend"
-msgstr "serveix la informació/refs per a git-http-backend"
+msgstr "serveix les info/refs per a git-http-backend"
 
 #: builtin/upload-pack.c:29
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
@@ -24636,9 +24189,9 @@ msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
 #: builtin/worktree.c:75
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s/%s: %s"
-msgstr "S'està eliminant %s"
+msgstr "S'està eliminant %s/%s: %s"
 
 #: builtin/worktree.c:148
 msgid "report pruned working trees"
@@ -24646,7 +24199,7 @@ msgstr "informa dels arbres de treball podats"
 
 #: builtin/worktree.c:150
 msgid "expire working trees older than <time>"
-msgstr "fes caducar els arbres de treball més vells que <hora>"
+msgstr "fes caducar els arbres de treball més antics que <data>"
 
 #: builtin/worktree.c:220
 #, c-format
@@ -24654,27 +24207,27 @@ msgid "'%s' already exists"
 msgstr "«%s» ja existeix"
 
 #: builtin/worktree.c:229
-#, fuzzy, c-format
+#, c-format
 msgid "unusable worktree destination '%s'"
-msgstr "no s'ha pogut fer «stat» a «%s»"
+msgstr "destinació de l'arbre de treball no utilitzable «%s»"
 
 #: builtin/worktree.c:234
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
 "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
-"«%s» és un arbre de treball que manca però bloquejat; useu «add -f -f» per a"
-" sobreescriure o «unlock» i «prune» o «remove» per a netejar"
+"«%s» és un arbre de treball que manca però que està bloquejat;\n"
+"useu «%s -f -f» per a sobreescriure-ho, o «unlock» i «prune» o «remove» per a netejar"
 
 #: builtin/worktree.c:236
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
 "use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
-"'%s' és un arbre de treball que manca però ja està registrat; useu 'add -f' "
-"per sobreescriure o 'prune' o 'remove' per netejar"
+"manca «%s» però ja està registrat a l'arbre de treball;\n"
+"useu «%s»  per a sobreescriure-ho, o «prune» o «remove» per a netejar"
 
 #: builtin/worktree.c:287
 #, c-format
@@ -24682,227 +24235,203 @@ msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de «%s»"
 
 #: builtin/worktree.c:309
-#, fuzzy
 msgid "initializing"
-msgstr "inicialitzant"
+msgstr "s'està inicialitzant"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
 
-#: builtin/worktree.c:423
-#, fuzzy, c-format
+#: builtin/worktree.c:422
+#, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
-msgstr ""
-"Preparant l'arbre de treball (la branca de reestructuració \"%s\"; estava en"
-" percentatges)"
+msgstr "S'està preparant l'arbre de treball (s'està reiniciant la branca «%s»; estava a %s)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 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:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
-msgstr "raó per bloquejar"
+msgstr "raó per a bloquejar"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configura el mode de seguiment (vegeu git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "prova de fer coincidir el nom de la branca nova amb una branca amb seguiment"
 " remot"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B i --detach són mútuament excloents"
-
-#: builtin/worktree.c:509
-#, fuzzy
-msgid "--reason requires --lock"
-msgstr "raó per bloquejar"
-
-#: builtin/worktree.c:513
-#, fuzzy
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "afegit amb --lock"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track només es pot usar si es crea una branca nova"
 
-#: builtin/worktree.c:692
-#, fuzzy
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
-msgstr "mostra les anotacions i raons esteses, si està disponible"
+msgstr "mostra les anotacions esteses i les raons, si estan disponibles"
 
-#: builtin/worktree.c:694
-#, fuzzy
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
-msgstr "fes caducar els arbres de treball més vells que <hora>"
-
-#: builtin/worktree.c:703
-#, fuzzy
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "-p i --overlay són mútuament excloents"
+msgstr "afegeix l'anotació «prunable» als arbres de treball més antics que <data>"
 
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» no és un arbre de treball"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 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:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» ja està bloquejat, raó: «%s»"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» ja està bloquejat"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» no està bloquejat"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "els arbres de treball que contenen submòduls no es poden moure ni eliminar"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "força el moviment encara que l'arbre de treball estigui brut o bloquejat"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "«%s» és un arbre de treball principal"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
 
-#: builtin/worktree.c:869
-#, fuzzy, c-format
+#: builtin/worktree.c:868
+#, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
-"no es pot moure un bloqueig de l'arbre de treball bloquejat el raon per cent"
-" utilitza «move -f -f» per substituir o desbloquejar primer"
+"no es pot moure un arbre de treball bloquejat, raó del bloqueig: %s\n"
+"useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
 
-#: builtin/worktree.c:871
-#, fuzzy
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
-"no es pot moure un arbre de treball bloquejat; useu primer «move -f -f» per "
-"sobreescriure o desbloquejar"
+"no es pot moure un arbre de treball bloquejat;\n"
+"useu primer «move -f -f» per a sobreescriure'l o desbloquejar-lo primer"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "s'ha produït un error en moure «%s» a «%s»"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "no s'ha pogut executar «git status» a «%s»"
 
-#: builtin/worktree.c:929
-#, fuzzy, c-format
+#: builtin/worktree.c:928
+#, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
-"'%s' conté fitxers modificats o no seguits useu --force per suprimir-los"
+"«%s» conté fitxers modificats o no seguits, useu --force per a suprimir-los"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "força l'eliminació encara que l'arbre de treball estigui brut o bloquejat"
 
-#: builtin/worktree.c:980
-#, fuzzy, c-format
+#: builtin/worktree.c:979
+#, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
-"no s'ha pogut eliminar un bloqueig de l'arbre de treball bloquejat perquè "
-"els raonadors utilitzen «remove -f -f» per substituir o desbloquejar primer"
+"no es pot suprimir un arbre de treball bloquejat, raó del bloqueig: %s\n"
+"useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
 
-#: builtin/worktree.c:982
-#, fuzzy
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
-"no es pot eliminar un arbre de treball bloquejat; useu primer «remove -f -f»"
-" per sobreescriure o desbloquejar"
+"no es pot suprimir un arbre de treball bloquejat;\n"
+"useu primer «remove -f -f» per a sobreescriure'l o desbloquejar-lo"
 
-#: builtin/worktree.c:985
-#, fuzzy, c-format
+#: builtin/worktree.c:984
+#, c-format
 msgid "validation failed, cannot remove working tree: %s"
-msgstr ""
-"la validació ha fallat no es poden eliminar els percentatges dels arbres de "
-"treball"
+msgstr "la validació ha fallat, no es pot suprmir l'arbre de treball: %s"
 
-#: builtin/worktree.c:1009
-#, fuzzy, c-format
+#: builtin/worktree.c:1008
+#, c-format
 msgid "repair: %s: %s"
-msgstr "%s no vàlid: «%s»"
+msgstr "repara: %s: %s"
 
-#: builtin/worktree.c:1012
-#, fuzzy, c-format
+#: builtin/worktree.c:1011
+#, c-format
 msgid "error: %s: %s"
-msgstr "error en %s %s: %s"
+msgstr "error: %s: %s"
 
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -24921,7 +24450,6 @@ msgid "only useful for debugging"
 msgstr "només útil per a la depuració"
 
 #: git.c:28
-#, fuzzy
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -24930,9 +24458,12 @@ msgid ""
 "           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
-"git [--version] [--help] [-C <path>] [-c <name>=<value>] [--exec-"
-"path[=<path>]] [---html-path] [---info-path] [--paginate | -P | --no-pager] "
-"[-git-dir=<-name]"
+"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
+"           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
 
 #: git.c:36
 msgid ""
@@ -24946,21 +24477,16 @@ msgstr ""
 "«git help <concepte>» per a llegir sobre una subordre o concepte\n"
 "específic. Vegeu «git help git» per a una visió general del sistema."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "no s'ha especificat un directori per --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "no s'ha especificat un directori per a l'opció «%s»\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "no s'ha especificat un nom d'espai per --namespace\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "no s'ha especificat un directori per --work-tree\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24972,14 +24498,9 @@ msgid "-c expects a configuration string\n"
 msgstr "-c espera una cadena de configuració\n"
 
 #: git.c:260
-#, fuzzy, c-format
-msgid "no config key given for --config-env\n"
-msgstr "no s'ha especificat un directori per --work-tree\n"
-
-#: git.c:300
 #, c-format
-msgid "no directory given for -C\n"
-msgstr "no s'ha especificat un directori per -C\n"
+msgid "no config key given for --config-env\n"
+msgstr "no s'ha indicat cap clau de configuració per a --config-env\n"
 
 #: git.c:326
 #, c-format
@@ -24987,9 +24508,9 @@ msgid "unknown option: %s\n"
 msgstr "opció desconeguda: %s\n"
 
 #: git.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "while expanding alias '%s': '%s'"
-msgstr "en expandir l'àlies '%s' '%s'"
+msgstr "en expandir l'àlies «%s»: «%s»"
 
 #: git.c:384
 #, c-format
@@ -24997,42 +24518,42 @@ msgid ""
 "alias '%s' changes environment variables.\n"
 "You can use '!git' in the alias to do this"
 msgstr ""
-"àlies «%s» canvia variables d'entorn. Podeu utilitzar «!git» a l'àlies per a"
-" fer-ho"
+"l'àlies «%s» canvia variables d'entorn.\n"
+"Podeu utilitzar «!git» a l'àlies per a fer-ho"
 
 #: git.c:391
-#, fuzzy, c-format
+#, c-format
 msgid "empty alias for %s"
-msgstr "àlies buit per a percentatges"
+msgstr "àlies buit per a %s"
 
 #: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "àlies recursiu: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "fallada d'escriptura en la sortida estàndard"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "ha fallat el tancament en la sortida estàndard"
 
-#: git.c:832
-#, fuzzy, c-format
+#: git.c:835
+#, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr "bucle d'àlies detectat expansió de «%s» no acaba%"
+msgstr "bucle d'àlies detectat expansió de «%s» no acaba:%s"
 
-#: git.c:882
-#, fuzzy, c-format
+#: git.c:885
+#, c-format
 msgid "cannot handle %s as a builtin"
-msgstr "no es poden gestionar els percentatges com a integrat"
+msgstr "no es pot gestionar %s com a integrat"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -25041,45 +24562,32 @@ msgstr ""
 "ús: %s\n"
 "\n"
 
-#: git.c:915
-#, fuzzy, c-format
+#: git.c:918
+#, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr "ha fallat l'expansió de l'àlies '%s'; '%s' no és una ordre git"
+msgstr "ha fallat l'expansió de l'àlies «%s»; «%s» no és una ordre git\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n"
 
-#: http-fetch.c:118
-#, fuzzy, c-format
+#: http-fetch.c:128
+#, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
-msgstr "l'argument a --packfile ha de ser un hash vàlid (té '%')"
+msgstr "l'argument a --packfile ha de ser un resum vàlid (s'ha obtingut «%s»)"
 
-#: http-fetch.c:128
-#, fuzzy
+#: http-fetch.c:138
 msgid "not a git repository"
-msgstr "No és un repositori de git"
-
-#: http-fetch.c:134
-#, fuzzy
-msgid "--packfile requires --index-pack-args"
-msgstr "--pathspec-file-nul requereix --pathspec-from-file"
-
-#: http-fetch.c:143
-#, fuzzy
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "-N només es pot usar amb --mixed"
+msgstr "no és un repositori de git"
 
 #: t/helper/test-fast-rebase.c:141
-#, fuzzy
 msgid "unhandled options"
-msgstr "make_script: opcions no gestionades"
+msgstr "opcions no gestionades"
 
 #: t/helper/test-fast-rebase.c:146
-#, fuzzy
 msgid "error preparing revisions"
-msgstr "make_script: s'ha produït un error en preparar les revisions"
+msgstr "s'ha produït un error en preparar les revisions"
 
 #: t/helper/test-reach.c:154
 #, c-format
@@ -25099,93 +24607,76 @@ msgid "exit immediately after advertising capabilities"
 msgstr "surt immediatament després d'anunciar les funcionalitats"
 
 #: t/helper/test-simple-ipc.c:581
-#, fuzzy
 msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
-msgstr "test-helper simple-ipc is-active [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<nom>] [<opcions>]"
 
 #: t/helper/test-simple-ipc.c:582
-#, fuzzy
 msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
-msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<nom>] [<fils>]"
 
 #: t/helper/test-simple-ipc.c:583
-#, fuzzy
 msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
-msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"
+msgstr "test-helper simple-ipc start-daemon [<nom>] [<fils>] [<max-wait>]"
 
 #: t/helper/test-simple-ipc.c:584
-#, fuzzy
 msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
-msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<nom>] [<max-wait>]"
 
 #: t/helper/test-simple-ipc.c:585
-#, fuzzy
 msgid "test-helper simple-ipc send         [<name>] [<token>]"
-msgstr "Test-helper simple-ipc envia [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nom>] [<testimoni>]"
 
 #: t/helper/test-simple-ipc.c:586
-#, fuzzy
 msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
-msgstr "Test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<nom>] [<bytecount>] [<byte>]"
 
 #: t/helper/test-simple-ipc.c:587
-#, fuzzy
 msgid ""
 "test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
 "[<batchsize>]"
 msgstr ""
-"test-helper simple-ipc múltiple [<name>] [<threads>] [<bytecount>] "
+"test-helper simple-ipc multiple     [<nom>] [<fils>] [<bytecount>] "
 "[<batchsize>]"
 
 #: t/helper/test-simple-ipc.c:595
-#, fuzzy
 msgid "name or pathname of unix domain socket"
 msgstr "nom o nom de camí del sòcol de domini unix"
 
 #: t/helper/test-simple-ipc.c:597
-#, fuzzy
 msgid "named-pipe name"
-msgstr "nom de pila amb nom"
+msgstr "nom del conducte amb nom"
 
 #: t/helper/test-simple-ipc.c:599
-#, fuzzy
 msgid "number of threads in server thread pool"
-msgstr "nombre de fils en la reserva de fils del servidor"
+msgstr "nombre de fils en el conjunt de fils del servidor"
 
 #: t/helper/test-simple-ipc.c:600
-#, fuzzy
 msgid "seconds to wait for daemon to start or stop"
-msgstr "segons a esperar que el dimoni comenci o atura"
+msgstr "segons a esperar que el dimoni comenci o s'aturi"
 
 #: t/helper/test-simple-ipc.c:602
-#, fuzzy
 msgid "number of bytes"
-msgstr "nombre incorrecte d'arguments"
+msgstr "nombre d'octets"
 
 #: t/helper/test-simple-ipc.c:603
-#, fuzzy
 msgid "number of requests per thread"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "nombre de peticions per fil"
 
 #: t/helper/test-simple-ipc.c:605
-#, fuzzy
 msgid "byte"
-msgstr "octets"
+msgstr "octet"
 
 #: t/helper/test-simple-ipc.c:605
-#, fuzzy
 msgid "ballast character"
 msgstr "caràcter de llast"
 
 #: t/helper/test-simple-ipc.c:606
-#, fuzzy
 msgid "token"
 msgstr "testimoni"
 
 #: t/helper/test-simple-ipc.c:606
-#, fuzzy
 msgid "command token to send to the server"
-msgstr "testimoni d'ordres per enviar al servidor"
+msgstr "testimoni d'ordre a enviar al servidor"
 
 #: http.c:350
 #, c-format
@@ -25197,31 +24688,29 @@ 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:380
-#, fuzzy
 msgid "Public key pinning not supported with cURL < 7.39.0"
-msgstr "No s'admet la fixació de clau pública amb cURL < 7.44.0"
+msgstr "No s'admet la fixació de clau pública amb cURL < 7.39.0"
 
 #: http.c:812
-#, fuzzy
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPTNOREVOKE no està suportat amb cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE no està admès amb cURL < 7.44.0"
 
 #: http.c:1016
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr "El dorsal SSL «%s» no està implementat. Els dorsals SSL compatibles"
+msgstr "El rerefons SSL «%s» no està admès. Els rerefons SSL admesos:"
 
 #: http.c:1023
-#, fuzzy, c-format
+#, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
-"No s'ha pogut establir el dorsal SSL a «%s» s'ha construït cURL sense "
-"dorsals SSL"
+"No s'ha pogut establir el rerefons SSL a «%s»: cURL es va construir sense "
+"rerefons SSL"
 
 #: http.c:1027
-#, fuzzy, c-format
+#, c-format
 msgid "Could not set SSL backend to '%s': already set"
-msgstr "No s'ha pogut establir el dorsal SSL a «%s» ja establert"
+msgstr "No s'ha pogut establir el rerefons SSL a «%s»: ja establert"
 
 #: http.c:1876
 #, c-format
@@ -25235,24 +24724,23 @@ msgstr ""
 "   redirecció: %s"
 
 #: remote-curl.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "invalid quoting in push-option value: '%s'"
-msgstr "cita no vàlida en el valor de l'opció d'empenta «%s»"
+msgstr "citació no vàlida en el valor de l'opció de pujada: «%s»"
 
 #: remote-curl.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "oversinfo/refs no és vàlid és un repositori git?"
+msgstr "%sinfo/refs no vàlides: és un repositori git?"
 
 #: remote-curl.c:405
-#, fuzzy
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
-"la resposta del servidor no és vàlida; el servei esperat ha rebut el paquet "
+"resposta del servidor no és vàlida; el servei esperat, ha rebut in paquet "
 "de neteja"
 
 #: remote-curl.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "invalid server response; got '%s'"
 msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
 
@@ -25267,9 +24755,9 @@ msgid "Authentication failed for '%s'"
 msgstr "S'ha produït un error en autenticar per «%s»"
 
 #: remote-curl.c:504
-#, c-format, fuzzy
+#, c-format
 msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
-msgstr "no es pot accedir a '%s' amb la configuració de http.pinnedPubkey:%s"
+msgstr "no es pot accedir a «%s» la configuració de http.pinnedPubkey :%s"
 
 #: remote-curl.c:508
 #, c-format
@@ -25282,25 +24770,23 @@ msgid "redirecting to %s"
 msgstr "s'està redirigint a %s"
 
 #: remote-curl.c:645
-#, fuzzy
 msgid "shouldn't have EOF when not gentle on EOF"
-msgstr "No hauria de tenir EOF quan no sigui suau al EOF"
+msgstr "no hauria de tenir EOF quan s'és lax amb els EOF"
 
 #: remote-curl.c:657
 msgid "remote server sent unexpected response end packet"
 msgstr "el servidor remot ha enviat un paquet de final de resposta inesperat"
 
 #: remote-curl.c:726
-#, fuzzy
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "no s'han pogut rebobinar les dades de publicació rpc - proveu d'augmentar "
 "http.postBuffer"
 
 #: remote-curl.c:755
-#, fuzzy, c-format
+#, c-format
 msgid "remote-curl: bad line length character: %.4s"
-msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
+msgstr "remote-curl: caràcter de longitud de línia erroni: %.4s"
 
 #: remote-curl.c:757
 msgid "remote-curl: unexpected response end packet"
@@ -25312,89 +24798,252 @@ msgid "RPC failed; %s"
 msgstr "RPC ha fallat; %s"
 
 #: remote-curl.c:873
-#, fuzzy
 msgid "cannot handle pushes this big"
-msgstr "no es pot gestionar empènyer aquest gran"
+msgstr "no es pot gestionar pujades tan grans"
 
 #: remote-curl.c:986
-#, fuzzy, c-format
+#, c-format
 msgid "cannot deflate request; zlib deflate error %d"
-msgstr "no es pot desinflar la sol·licitud; zlib deflate error%d"
+msgstr "no es pot descomprimir la sol·licitud; error de deflate zlib %d"
 
 #: remote-curl.c:990
-#, fuzzy, c-format
+#, c-format
 msgid "cannot deflate request; zlib end error %d"
-msgstr "no es pot desinflar la sol·licitud; error final zlib percentatged"
+msgstr "no es pot descomprimir la sol·licitud; error de finalització de zlib %d"
 
 #: remote-curl.c:1040
-#, fuzzy, c-format
+#, c-format
 msgid "%d bytes of length header were received"
-msgstr "s'han rebut bytes percentuals de la capçalera de longitud"
+msgstr "s'han rebut %d bytes de longitud de capçalera"
 
 #: remote-curl.c:1042
-#, fuzzy, c-format
+#, c-format
 msgid "%d bytes of body are still expected"
-msgstr "encara s'esperen bytes de cos per cent"
+msgstr "encara s'esperen %d bytes del cos"
 
 #: remote-curl.c:1131
-#, fuzzy
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "el transport ximple http no admet capacitats superficials"
 
 #: remote-curl.c:1146
-#, fuzzy
 msgid "fetch failed."
-msgstr "el fetch ha fallat."
+msgstr "l'obtenció ha fallat."
 
 #: remote-curl.c:1192
-#, fuzzy
 msgid "cannot fetch by sha1 over smart http"
-msgstr "no s’ha pogut obtenir per la sha1 a través de l’intel·ligent http"
+msgstr "no s'ha pogut obtenir per sha1 a través de l'http intel·ligent"
 
 #: remote-curl.c:1236 remote-curl.c:1242
-#, fuzzy, c-format
+#, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
-msgstr "error de protocol esperat sha/ref s'ha obtingut «%s»"
+msgstr "error de protocol: s'esperava sha/ref, s'ha obtingut «%s»"
 
 #: remote-curl.c:1254 remote-curl.c:1372
-#, fuzzy, c-format
+#, c-format
 msgid "http transport does not support %s"
-msgstr "El transport http no dóna suport als percentatges"
+msgstr "El transport http no admet %s"
 
 #: remote-curl.c:1290
-#, fuzzy
 msgid "git-http-push failed"
 msgstr "git-http-push ha fallat"
 
 #: remote-curl.c:1478
-#, fuzzy
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr "ús remot de curl git remote-curl <remote> [<url>]"
+msgstr "remote-curl: ús: git remote-curl <remote> [<url>]"
 
 #: remote-curl.c:1510
-#, fuzzy
 msgid "remote-curl: error reading command stream from git"
-msgstr "error remot en llegir el flux d'ordres des de git"
+msgstr "remote-curl: error en llegir el flux d'ordres del git"
 
 #: remote-curl.c:1517
-#, fuzzy
 msgid "remote-curl: fetch attempted without a local repo"
-msgstr "s'ha intentat recuperar el valor remot sense un repositori local"
+msgstr "remote-curl: s'ha intentat l'obtenció sense un dipòsit local"
 
 #: remote-curl.c:1558
-#, fuzzy, c-format
+#, c-format
 msgid "remote-curl: unknown command '%s' from git"
-msgstr "comandament desconegut «%s» del git"
+msgstr "remote-curl: ordre «%s» desconeguda del git"
+
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "cal un directori de treball"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "no s'ha pogut trobar un arrel d'allistament"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "no s'ha pogut commutar a «%s»"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "no s'ha pogut configurar %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "no s'ha pogut configurar log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Els allistaments escalars requereixen un arbre de treball"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "el HEAD remot no és una branca: «%.*s»"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"no s'ha pogut obtenir el nom de la branca per defecte del remot; s'usa "
+"ela predeterminada localment"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr ""
+"s'ha produït un error en obtenir el nom de branca predeterminada"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "s'ha produït un error en desregistrar el repositori"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "s'ha produït un error en suprimir l'allistament del directori"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "branca a agafar després de clonar"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "quan es clona, crear un directori de treball complet"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "només baixa les metadades per a la branca que s'agafarà"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<opcions>] [--] <repo> [<dir>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "no es pot deduir el nom de l'arbre de treball de «%s»"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "el directori «%s» ja existeix"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+"s'ha produït un error en obtenir la branca per defecte per a «%s»"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "no s'ha pogut configurar el remot a «%s»"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "no s'ha pogut configurar «%s»"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "ha fallat la clonació parcial; s'està intentant la clonació completa"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "no s'ha pogut configurar per a una clonació completa"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "«scalar list» no accepta arguments"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigura tots els allistaments registrats"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all o <enlistment>, però no ambdós"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "no existeix un repositori de git a: «%s»"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task>  {<enlistment>]\n"
+"Tasques:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "no existeix la tasca: «%s»"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "supressió de l'escalar <enlistment>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "s'ha rebutjat suprimir el directori de treball actual"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "inclou la versió del Git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "inclou les opcions de construcció del Git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <ordre> [<opcions>]\n"
+"\n"
+"Ordres:\n"
 
 #: compat/compiler.h:26
-#, fuzzy
 msgid "no compiler information available\n"
-msgstr "no hi ha informació disponible del compilador"
+msgstr "no hi ha informació disponible del compilador\n"
 
 #: compat/compiler.h:38
-#, fuzzy
 msgid "no libc information available\n"
-msgstr "mostra la informació de branca"
+msgstr "no hi ha informació disponible de libc\n"
 
 #: list-objects-filter-options.h:94
 msgid "args"
@@ -25412,42 +25061,39 @@ msgstr "data-de-caducitat"
 msgid "no-op (backward compatibility)"
 msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
 
-#: parse-options.h:309
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "sigues més detallat"
 
-#: parse-options.h:311
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "sigues més discret"
 
-#: parse-options.h:317
-#, fuzzy
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
-msgstr "usa <n> xifres per presentar els SHA-1"
+msgstr "usa <n> xifres per a mostrar els noms d'objecte"
 
-#: parse-options.h:336
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
-#: parse-options.h:337
-#, fuzzy
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "llegeix l'especificació del camí del fitxer"
 
-#: parse-options.h:338
-#, fuzzy
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL "
 "character"
 msgstr ""
 "amb --pathspec-from-file els elements d'especificació del camí estan "
-"separats amb caràcter NUL"
+"separats amb el caràcter NUL"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "clau"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "nom del camp en el qual ordenar"
 
@@ -25495,12 +25141,10 @@ msgid "List, create, or delete branches"
 msgstr "Llista, crea o suprimeix branques"
 
 #: command-list.h:59
-#, fuzzy
 msgid "Collect information for user to file a bug report"
-msgstr "Recopila la informació per a l'usuari per enviar un informe d'error"
+msgstr "Recopila la informació per a l'usuari per a enviar un informe d'error"
 
 #: command-list.h:60
-#, fuzzy
 msgid "Move objects and refs by archive"
 msgstr "Mou els objectes i les referències per arxiu"
 
@@ -25519,22 +25163,21 @@ msgid "Debug gitignore / exclude files"
 msgstr "Depura gitignore / fitxers d'exclusió"
 
 #: command-list.h:64
-#, fuzzy
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Mostra els noms canònics i les adreces electròniques dels contactes"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Assegura que un nom de referència està ben format"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Copia fitxers des de l'índex a l'arbre de treball"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Assegura que un nom de referència està ben format"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Troba les comissions que encara s'han d'aplicar a la font"
@@ -25576,33 +25219,29 @@ msgid "Get and set repository or global options"
 msgstr "Obté o estableix opcions de repositori o globals"
 
 #: command-list.h:78
-#, fuzzy
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Compta el nombre d'objectes desempaquetats i el seu consum de disc"
 
 #: command-list.h:79
-#, fuzzy
 msgid "Retrieve and store user credentials"
 msgstr "Recupera i desa les credencials d'usuari"
 
 #: command-list.h:80
-#, fuzzy
 msgid "Helper to temporarily store passwords in memory"
-msgstr "Ajudant per emmagatzemar temporalment les contrasenyes a la memòria"
+msgstr "Ajudant per a emmagatzemar temporalment les contrasenyes en memòria"
 
 #: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Ajudant per a emmagatzemar credencials a disc"
 
 #: command-list.h:82
-#, fuzzy
 msgid "Export a single commit to a CVS checkout"
-msgstr "Exporta una sola entrega a una versió de CVS"
+msgstr "Exporta en una sola comissió a CVS checkout"
 
 #: command-list.h:83
-#, fuzzy
 msgid "Salvage your data out of another SCM people love to hate"
-msgstr "Estalvia les teves dades d'una altra gent de SCM que li agrada odiar"
+msgstr ""
+"Salveu les vostres dades d'un altre SMC al que la gent li agrada odiar"
 
 #: command-list.h:84
 msgid "A CVS server emulator for Git"
@@ -25615,7 +25254,7 @@ msgstr "Un servidor realment senzill per a repositoris Git"
 #: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
-"Dona un nom llegible per humans basant-se en les referències disponibles"
+"Dona un nom llegible per a humans basant-se en les referències disponibles"
 
 #: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
@@ -25631,7 +25270,6 @@ msgid "Compare a tree to the working tree or index"
 msgstr "Compara un arbre amb l'arbre de treball o l'índex"
 
 #: command-list.h:90
-#, fuzzy
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "Compara el contingut i el mode dels blobs trobats a través de dos objectes "
@@ -25643,7 +25281,7 @@ msgstr "Mostra els canvis usant eines diff comunes"
 
 #: command-list.h:92
 msgid "Git data exporter"
-msgstr "Explorador de dades del Git"
+msgstr "Exportador de dades del Git"
 
 #: command-list.h:93
 msgid "Backend for fast Git data importers"
@@ -25670,9 +25308,8 @@ msgid "Output information on each ref"
 msgstr "Mostra la informació en cada referència"
 
 #: command-list.h:99
-#, fuzzy
 msgid "Run a Git command on a list of repositories"
-msgstr "executa les tasques basades en l'estat del repositori"
+msgstr "Executa una ordre Git en una llista de repositoris"
 
 #: command-list.h:100
 msgid "Prepare patches for e-mail submission"
@@ -25687,7 +25324,6 @@ msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Neteja els fitxers innecessaris i optimitza el repositori local"
 
 #: command-list.h:103
-#, fuzzy
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Extreu l'ID de la comissió d'un arxiu creat amb el git-archive"
 
@@ -25716,19 +25352,16 @@ msgid "Download from a remote Git repository via HTTP"
 msgstr "Baixa des d'un repositori Git remot via HTTP"
 
 #: command-list.h:110
-#, fuzzy
 msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Empeny objectes sobre HTTP/DAV a un altre repositori"
+msgstr "Pujar objectes sobre HTTP/DAV a un altre repositori"
 
 #: command-list.h:111
-#, fuzzy
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 "Envia una col·lecció de pedaços des de l'entrada estàndard a una carpeta "
 "IMAP"
 
 #: command-list.h:112
-#, fuzzy
 msgid "Build pack index file for an existing packed archive"
 msgstr ""
 "Construeix el fitxer d'índex del paquet per a un arxiu empaquetat existent"
@@ -25738,447 +25371,430 @@ msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repositori de Git buit o reinicialitza un existent"
 
 #: command-list.h:114
-#, fuzzy
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Navegueu instantàniament pel vostre repositori de treball a gitweb"
 
 #: command-list.h:115
-#, fuzzy
 msgid "Add or parse structured information in commit messages"
-msgstr "Afegir o analitzar informació estructurada en missatges de publicació"
+msgstr ""
+"Afegeix o analitza la informació estructurada en els missatges de comissió"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "El navegador de repositoris Git"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Mostra els registres de comissió"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "Mostra informació sobre els fitxers a l'índex i a l'arbre de treball"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Mostra les referències d'un repositori remot"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Mostra els continguts d'un objecte de l'arbre"
 
-#: command-list.h:121
-#, fuzzy
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
-msgstr "Extreu pedaç i autoria d'un sol missatge de correu electrònic"
+msgstr "Extreu el pedaç i l'autoria d'un sol missatge de correu electrònic"
 
-#: command-list.h:122
-#, fuzzy
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
-msgstr "Programa de divisor mbox simple per a UNIX"
+msgstr "Programa de divisió mbox simple per a UNIX"
 
-#: command-list.h:123
-#, fuzzy
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
-msgstr "Executa les tasques per optimitzar les dades del repositori Git"
+msgstr "Executa tasques per a optimitzar les dades del repositori Git"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "Uneix dues o més històries de desenvolupament"
 
-#: command-list.h:125
-#, fuzzy
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Troba els millors avantpassats comuns possibles per a una fusió"
 
-#: command-list.h:126
-#, fuzzy
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Executa una fusió de fitxers de tres vies"
 
-#: command-list.h:127
-#, fuzzy
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Executa una fusió per als fitxers que cal fusionar"
 
-#: command-list.h:128
-#, fuzzy
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "El programa d'ajuda estàndard a utilitzar amb git-merge-index"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Mostra la fusió de tres vies sense tocar l'índex"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Executa eines de resolució de conflictes per a resoldre conflictes de fusió"
 
 #: command-list.h:130
-#, fuzzy
-msgid "Show three-way merge without touching index"
-msgstr "Mostra la fusió de tres vies sense l'índex tàctil"
+msgid "Creates a tag object with extra validation"
+msgstr "Crea un objecte etiqueta amb validació addicional"
 
 #: command-list.h:131
-#, fuzzy
-msgid "Write and verify multi-pack-indexes"
-msgstr "Escriu i verifica els multi-índexs"
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Construeix un objecte en arbre a partir de text formatat amb ls-tree"
 
 #: command-list.h:132
-#, fuzzy
-msgid "Creates a tag object with extra validation"
-msgstr "Crea un objecte etiqueta"
+msgid "Write and verify multi-pack-indexes"
+msgstr "Escriu i verifica els índexs dels paquets multipaquet"
 
 #: command-list.h:133
-#, fuzzy
-msgid "Build a tree-object from ls-tree formatted text"
-msgstr "Construeix un objecte en arbre a partir de text formatat amb ls-tree"
-
-#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Mou o canvia de nom a un fitxer, directori o enllaç simbòlic"
 
-#: command-list.h:135
-#, fuzzy
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Cerca noms simbòlics per a les revisions donades"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Afegeix o inspecciona notes de l'objecte"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importa des de i envia a repositoris Perforce"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Crea un arxiu empaquetat d'objectes"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Troba fitxers empaquetats redundants"
 
-#: command-list.h:140
-#, fuzzy
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr ""
 "Empaqueta els caps i les etiquetes per a un accés eficient al repositori"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Calcula un identificador únic per a cada pedaç"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "Poda tots els objectes no accessibles de la base de dades d'objectes"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Elimina els objectes extres que ja estan en fitxers empaquetats"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Obtén i integra amb un altre repositori o una branca local"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr ""
 "Actualitza les referències remotes juntament amb els objectes associats"
 
-#: command-list.h:146
-#, fuzzy
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
-msgstr "Aplica un conjunt de pedaços cobert a la branca actual"
+msgstr "Aplica un conjunt de pedaços a la branca actual"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Compara dos rangs de comissions (p. ex. dues versions d'una branca)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Llegeix la informació de l'arbre a l'índex"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Torna a aplicar les comissions sobre un altre punt de basament"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Rep el que s'envia al repositori"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Gestiona la informació del registre de referències"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Gestiona el conjunt de repositoris seguits"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaqueta els objectes desempaquetats en un repositori"
 
-#: command-list.h:154
-#, fuzzy
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
-msgstr "Crea una llista suprimeix les referències per substituir els objectes"
+msgstr "Crea, llista i esborra referències per a substituir objectes"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "Genera un resum dels canvis pendents"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Reutilitza la resolució registrada dels conflictes de fusió"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "Restableix la HEAD actual a l'estat especificat"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Restaura els fitxers de l'arbre de treball"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Reverteix comissions existents"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Mostra les comissions en ordre topològic invers"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Trieu i personalitzeu els paràmetres"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Reverteix comissions existents"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Elimina fitxers de l'arbre de treball i de l'índex"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Envia una col·lecció de pedaços com a correus electrònics"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Puja objectes sobre el protocol Git a un altre repositori"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr ""
+"Codi de configuració i18n del Git per als scripts de l'intèrpret d'ordres"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Codi de scripts de configuració comuns pel Git shell"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Resumeix la sortida «git log»"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Mostra diversos tipus d'objectes"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Mostra les branques i les seves comissions"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Mostra l'índex d'arxius empaquetat"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Llista les referències en un repositori local"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr ""
-"Codi de configuració i18n del Git per als scripts de l'intèrpret d'ordres"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Codi de scripts de configuració comuns pel Git shell"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Inicialitza i modifica el «sparse-checkout»"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Afegeix el contingut del fitxer a l'àrea de «staging»"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Fes «stash» dels canvis en un directori de treball brut"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Afegeix el contingut del fitxer a l'àrea de «staging»"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Mostra l'estat de l'arbre de treball"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Elimina l'espai en blanc innecessari"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicialitza, actualitza o inspecciona submòduls"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operació bidireccional entre un repositori a Subversion i Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Commuta entre branques"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "Llegeix, modifica i suprimeix referències simbòliques"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un fitxer temporal amb els continguts dels blobs"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objectes d'un arxiu empaquetat"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra els continguts del fitxer en l'arbre de treball a l'índex"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Actualitza el nom de l'objecte emmagatzemat en una referència de forma "
 "segura"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Actualitza el fitxer d'informació auxiliar per a ajudar als servidors "
 "ximples"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Envia l'arxiu de tornada al git-archive"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Mostra una variable lògica del Git"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "Verifica la signatura GPG de les comissions"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Valida els fitxers d'arxius Git empaquetats"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la signatura GPG de les etiquetes"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interfície web del Git (interfície web pels repositoris Git)"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Mostra registres amb la diferència introduïda per cada comissió"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Gestiona múltiples arbres de treball"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Crea un objecte arbre des de l'índex actual"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "La definició d'atributs per camí"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Interfície i convencions de la línia d'ordres del Git"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial bàsic del Git per a desenvolupadors"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Proporcionar noms d'usuari i contrasenyes a Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git per a usuaris del CVS"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "Ajustament de la sortida de diferències"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un conjunt mínim útil d'ordres diàries del Git"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Preguntes freqüents sobre l'ús del Git"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Un glossari de Git"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Lligams utilitzats pel Git"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
 
-#: command-list.h:209
-#, fuzzy
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "El navegador de repositoris Git"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
-msgstr "Assigna noms d'autor/comitè i/o adreces de correu electrònic"
+msgstr "Assigna noms d'autor i comitent i/o adreces de correu electrònic"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "La definició de les propietats de submòduls"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Espais de noms del Git"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Programes d'ajuda per a interactuar amb repositoris remots"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Disposició del repositori del Git"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "L'especificació de revisions i rangs per al Git"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Muntant un repositori dins un altre"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Un tutorial d'introducció al Git"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial d'introducció al Git: segona part"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Un tutorial d'introducció al Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfície web del Git (interfície web pels repositoris Git)"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -26189,8 +25805,8 @@ msgid ""
 "Error: Your local changes to the following files would be overwritten by "
 "merge"
 msgstr ""
-"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per"
-" fusionar"
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
+"a fusionar"
 
 #: git-merge-octopus.sh:61
 msgid "Automated merge did not work."
@@ -26198,7 +25814,7 @@ msgstr "La fusió automàtica no ha funcionat."
 
 #: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
-msgstr "No s'ha de fer un pop."
+msgstr "No s'ha de fer un «octopus»."
 
 #: git-merge-octopus.sh:73
 #, sh-format
@@ -26257,42 +25873,42 @@ msgstr ""
 msgid "usage: $dashless $USAGE"
 msgstr "ús: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "No es pot canviar de directori a $cdup, el nivell superior de l'arbre de "
 "treball"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "fatal: no es pot usar $program_name sense un arbre de treball."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "No es pot $action: Teniu canvis «unstaged»."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "No es pot $action: El vostre índex conté canvis sense cometre."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Addicionalment, el vostre índex conté canvis sense cometre."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball."
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "No s'ha pogut determinar el camí absolut del directori de git"
 
@@ -26340,7 +25956,7 @@ msgid ""
 "marked for applying."
 msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
-"per aplicar-se."
+"per a aplicar-se."
 
 #: git-add--interactive.perl:1068 git-add--interactive.perl:1071
 #: git-add--interactive.perl:1077
@@ -26349,7 +25965,7 @@ msgid ""
 "marked for discarding."
 msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
-"per descartar-se."
+"per a descartar-se."
 
 #: git-add--interactive.perl:1114
 #, perl-format
@@ -26374,7 +25990,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26388,7 +26004,7 @@ msgstr ""
 "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26402,7 +26018,7 @@ msgstr ""
 "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26416,7 +26032,7 @@ msgstr ""
 "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
 "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26430,7 +26046,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26444,7 +26060,7 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26458,7 +26074,7 @@ msgstr ""
 "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26472,7 +26088,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26486,7 +26102,7 @@ msgstr ""
 "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
 "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26508,90 +26124,90 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Els trossos seleccionats no apliquen a l'índex\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "s'està ignorant %s no fusionat\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "No hi ha altres trossos on anar-hi\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número no vàlid: «%s»\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Només %d tros disponible.\n"
 msgstr[1] "Només %d trossos disponibles.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "No hi ha cap altre tros a cercar\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Expressió regular de cerca mal formada %s: %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Sense tros previ\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "No hi ha tros següent\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "No es pot dividir aquest tros\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Divideix en %d tros.\n"
 msgstr[1] "Divideix en %d trossos.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "No es pot editar aquest tros\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26607,110 +26223,108 @@ msgstr ""
 "diff          - mostra la diferència entre HEAD i l'índex\n"
 "add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "manca --"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "desconegut --patch mode: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument %s no vàlid, s'esperava --"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 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:214
-#, fuzzy, perl-format
+#: git-send-email.perl:244
+#, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: l'ordre «%s» ha mort amb el codi de sortida %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor no ha sortit correctament, avortant-ho tot"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, 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"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "«%s.final» conté el correu redactat.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases és incompatible amb altres opcions\n"
 
-#: git-send-email.perl:525
-#, fuzzy
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
 "Set sendemail.forbidSendmailVariables to false to disable this check.\n"
 msgstr ""
-"fatal s'han trobat les opcions de configuració per a git-send-email es "
-"configura amb les opcions sendemail.* -noteu la 'e'. Establiu "
-"sendemail.forbidSendmailVariables a false per desactivar aquesta "
-"comprovació."
+"fatal: s'han trobat opcions de configuració per a «sendmail»\n"
+"git-send-email està configurat amb les opcions sendemail.* - fixeu-vos en\n"
+"la «e». Establiu sendemail.forbidSendmailVariables a false per a desactivar\n"
+"la comprovació.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "No es pot executar git format-patch des de fora del repositori\n"
 
-#: git-send-email.perl:533
-#, fuzzy
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
-"`batch-size` i `relogin` s'han d'especificar junts (a través de la línia "
-"d'ordres o l'opció de configuració)"
+"«batch-size» i «relogin» s'han d'especificar junts (a través de la línia "
+"d'ordres o l'opció de configuració)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Camp --suppress-cc desconegut: «%s»\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paràmetre --confirm desconegut: «%s»\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "avís: no s'admet l'àlies de sendmail amb cometes: %s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "avís: «:include:» no s'admet: %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "avís: les redireccions «/file» ni «|pipe» no s'admeten: %s\n"
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, 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:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26720,17 +26334,17 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 "El fitxer «%s» existeix, però també pot ser un rang de comissions\n"
-"per produir pedaços. Desambigüeu-ho...\n"
+"per a produir pedaços. Desambigüeu-ho...\n"
 "\n"
 "    * Dient «./%s» si volíeu especificar un fitxer; o\n"
 "    * Proporcionant l'opció «--format-patch» si volíeu especificar un rang.\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "S'ha produït un error en obrir el directori %s: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26740,17 +26354,17 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, 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:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26764,27 +26378,27 @@ msgstr ""
 "\n"
 "Esborreu el contingut del cos si no voleu enviar cap resum.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "S'ha produït un error en obrir %s: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, 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:886
+#: git-send-email.perl:922
 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:935
+#: git-send-email.perl:971
 #, 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:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26792,11 +26406,11 @@ msgstr ""
 "Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26807,23 +26421,23 @@ msgstr ""
 "\t%s\n"
 "perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si realment voleu enviar-ho.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 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:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, 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"
@@ -26831,16 +26445,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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "el camí CA «%s» no existeix"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26860,737 +26474,153 @@ msgstr ""
 "    sendemail.confirm.\n"
 "\n"
 "    Per a informació addicional, executeu «git send-email --help».\n"
-"    Per mantenir el comportament actual, però silenciar aquest\n"
+"    Per a mantenir el comportament actual, però silenciar aquest\n"
 "    missatge, executeu «git config --global sendemail.confirm auto».\n"
 "\n"
 
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[e]dita|[q]surt|[a]tot): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Requereix resposta en enviar el correu"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP requerit no està correctament definit."
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "El servidor no admet STARTTLS! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS ha fallat! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 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:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "S'ha produït un error en enviar %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "no es pot obrir el fitxer %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no s'ha pogut executar «%s»"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "no es pot enviar el missatge en 7 bits"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència no vàlida"
 
-#: git-send-email.perl:2059
-#, fuzzy, perl-format
+#: git-send-email.perl:2095
+#, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
 "%s\n"
 "warning: no patches were sent\n"
 msgstr ""
-"fatal: %s: %s\n"
-"avís: no s'han enviat pedaços\n"
+"fatal: %s: rebutjat pel lligam sendemail-validate\n"
+"%s\n"
+"avís: no s'ha enviat cap pedaç\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: git-send-email.perl:2072
-#, fuzzy, perl-format
+#: git-send-email.perl:2108
+#, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
 "warning: no patches were sent\n"
 msgstr ""
-"fatal: %s: %s\n"
-"avís: no s'han enviat pedaços\n"
+"fatal: %s:%d té més de 998 caràcters\n"
+"avís: no s'ha enviat cap pedaç\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
-
-#, fuzzy, c-format
-#~ msgid ""
-#~ "The following pathspecs didn't match any eligible path, but they do match index\n"
-#~ "entries outside the current sparse checkout:\n"
-#~ msgstr ""
-#~ "Les següents especificacions de camí no coincideixen amb cap camí elegible, però sí que tenen índex de coincidències\n"
-#~ "entrades fora de l'actual pagament dispers:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Disable or modify the sparsity rules if you intend to update such entries."
-#~ msgstr ""
-#~ "Desactiva o modifica les regles d'esparsitat si teniu la intenció "
-#~ "d'actualitzar aquestes entrades."
-
-#, c-format
-#~ msgid "could not set GIT_DIR to '%s'"
-#~ msgstr "no s'ha pogut establir GIT_DIR a «%s»"
-
-#, c-format
-#~ msgid "unable to unpack %s header with --allow-unknown-type"
-#~ msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type"
-
-#, c-format
-#~ msgid "unable to parse %s header with --allow-unknown-type"
-#~ msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type"
-
-#~ msgid "open /dev/null failed"
-#~ msgstr "s'ha produït un error en obrir /dev/null"
-
-#~ 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 ""
-#~ "després de resoldre els conflictes, marqueu els camins\n"
-#~ "corregits amb «git add <camins>» o «git rm <camins>»\n"
-#~ "i cometeu el resultat amb «git commit»"
-
-#~ msgid "open /dev/null or dup failed"
-#~ msgstr "s'ha produït un error en obrir /dev/null o dup"
-
-#, fuzzy
-#~ msgid "attempting to use sparse-index without cone mode"
-#~ msgstr "s'està intentant utilitzar l'índex de dispersió sense el mode de con"
-
-#, fuzzy
-#~ msgid "unable to update cache-tree, staying full"
-#~ msgstr "no s'ha pogut actualitzar l'arbre cau"
-
-#, c-format
-#~ msgid "Could not open '%s' for writing."
-#~ msgstr "No s'ha pogut obrir «%s» per a escriptura."
-
-#, c-format
-#~ msgid "could not create archive file '%s'"
-#~ msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
-
-#~ msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-
-#, fuzzy
-#~ msgid "--bisect-next-check requires 2 or 3 arguments"
-#~ msgstr "--bisect-next-check requereix 2 o 3 arguments"
-
-#, c-format
-#~ msgid "couldn't create a new file at '%s'"
-#~ msgstr "no s'ha pogut crear el fitxer nou a «%s»"
-
-#, c-format
-#~ msgid "git commit-tree: failed to open '%s'"
-#~ msgstr "git commit-tree: ha fallat en obrir «%s»"
-
-#, c-format
-#~ msgid "cannot open packfile '%s'"
-#~ msgstr "no es pot obrir el fitxer de paquet «%s»"
-
-#~ msgid "cannot store pack file"
-#~ msgstr "no es pot emmagatzemar el fitxer empaquetat"
-
-#~ msgid "cannot store index file"
-#~ msgstr "no es pot emmagatzemar el fitxer d'índex"
-
-#~ msgid "exclude patterns are read from <file>"
-#~ msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-
-#, c-format
-#~ msgid "Unknown option for merge-recursive: -X%s"
-#~ msgstr "Opció desconeguda de merge-recursive: -X%s"
-
-#, c-format
-#~ msgid "unusable todo list: '%s'"
-#~ msgstr "llista per a fer inestable: «%s»"
-
-#~ msgid "git rebase--interactive [<options>]"
-#~ msgstr "git rebase--interactive [<opcions>]"
-
-#~ msgid "rebase merge commits"
-#~ msgstr "fes «rebase» de les comissions de fusió"
-
-#, fuzzy
-#~ msgid "keep original branch points of cousins"
-#~ msgstr "mantén els punts de branca originals dels cosins"
-
-#, fuzzy
-#~ msgid "move commits that begin with squash!/fixup!"
-#~ msgstr "mou les comissions que comencen amb squash!/fixup!"
-
-#~ msgid "sign commits"
-#~ msgstr "signa les comissions"
-
-#~ msgid "continue rebase"
-#~ msgstr "continua el «rebase»"
-
-#~ msgid "skip commit"
-#~ msgstr "omet la comissió"
-
-#~ msgid "edit the todo list"
-#~ msgstr "edita la llista a fer"
-
-#~ msgid "show the current patch"
-#~ msgstr "mostra el pedaç actual"
-
-#~ msgid "shorten commit ids in the todo list"
-#~ msgstr "escurça els ids de les comissions en la llista per a fer"
-
-#~ msgid "expand commit ids in the todo list"
-#~ msgstr "expandeix els ids de les comissions en la llista per a fer"
-
-#~ msgid "check the todo list"
-#~ msgstr "comprova la llista a fer"
-
-#~ msgid "rearrange fixup/squash lines"
-#~ msgstr "reorganitza les línies «fixup/pick»"
-
-#~ msgid "insert exec commands in todo list"
-#~ msgstr "expandeix les ordres exec en la llista per a fer"
-
-#, fuzzy
-#~ msgid "onto"
-#~ msgstr "sobre"
-
-#, fuzzy
-#~ msgid "restrict-revision"
-#~ msgstr "revisió restringida"
-
-#, fuzzy
-#~ msgid "restrict revision"
-#~ msgstr "restringeix la revisió"
-
-#, fuzzy
-#~ msgid "squash-onto"
-#~ msgstr "squash-onto"
-
-#, fuzzy
-#~ msgid "squash onto"
-#~ msgstr "carabassa a"
-
-#, fuzzy
-#~ msgid "the upstream commit"
-#~ msgstr "la comissió principal"
-
-#, fuzzy
-#~ msgid "head-name"
-#~ msgstr "nom-cap"
-
-#, fuzzy
-#~ msgid "head name"
-#~ msgstr "nom del cap"
-
-#, fuzzy
-#~ msgid "rebase strategy"
-#~ msgstr "estratègia de rebase"
-
-#, fuzzy
-#~ msgid "strategy-opts"
-#~ msgstr "opcions estratègiques"
-
-#, fuzzy
-#~ msgid "strategy options"
-#~ msgstr "opcions d'estratègia"
-
-#, fuzzy
-#~ msgid "switch-to"
-#~ msgstr "canvia a"
-
-#, fuzzy
-#~ msgid "the branch or commit to checkout"
-#~ msgstr "la branca o entrega a agafar"
-
-#, fuzzy
-#~ msgid "onto-name"
-#~ msgstr "ont-name"
-
-#, fuzzy
-#~ msgid "onto name"
-#~ msgstr "al nom"
-
-#, fuzzy
-#~ msgid "cmd"
-#~ msgstr "cmd"
-
-#~ msgid "the command to run"
-#~ msgstr "l'ordre a executar"
-
-#, fuzzy
-#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-#~ msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges"
-
-#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-
-#~ msgid ""
-#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-#~ msgstr ""
-#~ "error: no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
-
-#, fuzzy
-#~ msgid ""
-#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
-#~ "--name <name>"
-#~ msgstr "git submodule--helper init [<opcions>] [<camí>]"
-
-#, c-format
-#~ msgid "failed to create file %s"
-#~ msgstr "s'ha produït un error en crear el fitxer %s"
-
-#~ msgid "exit immediately after initial ref advertisement"
-#~ msgstr "surt immediatament després de l'anunci inicial de referència"
-
-#, fuzzy, c-format
-#~ msgid "socket/pipe already in use: '%s'"
-#~ msgstr "el sòcol/pipe ja s'està utilitzant: «%s»"
-
-#, fuzzy, c-format
-#~ msgid "could not start server on: '%s'"
-#~ msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-
-#, fuzzy
-#~ msgid "could not spawn daemon in the background"
-#~ msgstr "no s'ha pogut crear el dimoni en segon pla"
-
-#, fuzzy
-#~ msgid "waitpid failed"
-#~ msgstr "«setsid» ha fallat"
-
-#, fuzzy
-#~ msgid "daemon not online yet"
-#~ msgstr "El dimoni encara no està en línia"
-
-#, fuzzy
-#~ msgid "daemon failed to start"
-#~ msgstr "s'ha produït un error en fer stat a %s"
-
-#, fuzzy
-#~ msgid "waitpid is confused"
-#~ msgstr "waitpid està confós"
-
-#, fuzzy
-#~ msgid "daemon has not shutdown yet"
-#~ msgstr "El dimoni encara no s'ha apagat"
-
-#, fuzzy
-#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
-#~ msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4"
-
-#, sh-format
-#~ msgid "running $command"
-#~ msgstr "s'està executant $command"
-
-#, sh-format
-#~ msgid "'$sm_path' does not have a commit checked out"
-#~ msgstr "«$sm_path» no té una comissió agafada"
-
-#, sh-format
-#~ msgid "Submodule path '$displaypath': '$command $sha1'"
-#~ msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
-
-#~ msgid "Applied autostash."
-#~ msgstr "S'ha aplicat l'«autostash»."
-
-#, sh-format
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "No es pot emmagatzemar $stash_sha1"
-
-#~ 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 «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"
-
-#, sh-format
-#~ msgid "Rebasing ($new_count/$total)"
-#~ msgstr "S'està fent «rebase» ($new_count/$total)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Commands:\n"
-#~ "p, pick <commit> = use commit\n"
-#~ "r, reword <commit> = use commit, but edit the commit message\n"
-#~ "e, edit <commit> = use commit, but stop for amending\n"
-#~ "s, squash <commit> = use commit, but meld into previous commit\n"
-#~ "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
-#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
-#~ "d, drop <commit> = remove commit\n"
-#~ "l, label <label> = label current HEAD with a name\n"
-#~ "t, reset <label> = reset HEAD to a label\n"
-#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-#~ ".       create a merge commit using the original merge commit's\n"
-#~ ".       message (or the oneline, if no original merge commit was\n"
-#~ ".       specified). Use -c <commit> to reword the commit message.\n"
-#~ "\n"
-#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ordres:\n"
-#~ " p, pick <comissió> = usa la comissió\n"
-#~ " r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
-#~ " e, edit <comissió> = usa la comissió, però atura't per a esmenar\n"
-#~ " s, squash <comissió> = usa la comissió, però fusiona-la a la comissió prèvia\n"
-#~ " f, fixup <comissió> = com a «squash», però descarta el missatge de registre d'aquesta comissió\n"
-#~ "x, exec <comissió> = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n"
-#~ "d, drop <comissió> = elimina la comissió\n"
-#~ "l, label <etiqueta> = etiqueta la HEAD actual amb un nom\n"
-#~ "t, reset <etiqueta> = reinicia HEAD a una etiqueta    \n"
-#~ "m, merge [-C <comissió> | -c <comissió>] <etiqueta> [# <oneline>]\n"
-#~ ".       crea una comissió de fusió usant el missatge de la comissió\n"
-#~ ".       de fusió original (o línia única, si no hi ha cap comissió de fusió original\n"
-#~ ".       especificada). Useu -c <comissió> per a reescriure el missatge de publicació.\n"
-#~ "\n"
-#~ "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
-
-#, 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 ""
-#~ "Podeu esmenar la comissió ara, amb\n"
-#~ "\n"
-#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid "$sha1: not a commit that can be picked"
-#~ msgstr "$sha1: no és una comissió que es pugui triar"
-
-#, sh-format
-#~ msgid "Invalid commit name: $sha1"
-#~ msgstr "Nom de comissió no vàlid: $sha1"
-
-#~ msgid "Cannot write current commit's replacement sha1"
-#~ msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual"
-
-#, sh-format
-#~ msgid "Fast-forward to $sha1"
-#~ msgstr "Avanç ràpid a $sha1"
-
-#, sh-format
-#~ msgid "Cannot fast-forward to $sha1"
-#~ msgstr "No es pot avançar ràpidament a $sha1"
-
-#, sh-format
-#~ msgid "Cannot move HEAD to $first_parent"
-#~ msgstr "No es pot moure HEAD a $first_parent"
-
-#, sh-format
-#~ msgid "Refusing to squash a merge: $sha1"
-#~ msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-
-#, sh-format
-#~ msgid "Error redoing merge $sha1"
-#~ msgstr "Error en refer la fusió $sha1"
-
-#, sh-format
-#~ msgid "Could not pick $sha1"
-#~ msgstr "No s'ha pogut triar $sha1"
-
-#, sh-format
-#~ msgid "This is the commit message #${n}:"
-#~ msgstr "Aquest és el missatge de comissió núm. ${n}:"
-
-#, sh-format
-#~ msgid "The commit message #${n} will be skipped:"
-#~ msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-
-#, 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ó d'$count comissió."
-#~ msgstr[1] "Això és una combinació de $count comissions."
-
-#, sh-format
-#~ msgid "Cannot write $fixup_msg"
-#~ msgstr "No es pot escriure $fixup_msg"
-
-#~ msgid "This is a combination of 2 commits."
-#~ msgstr "Això és una combinació de 2 comissions."
-
-#, sh-format
-#~ msgid "Could not apply $sha1... $rest"
-#~ msgstr "No s'ha pogut aplicar $sha1... $rest"
-
-#, 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 s'ha pogut esmenar la comissió després de triar correctament $sha1... $rest\n"
-#~ "Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n"
-#~ "precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n"
-#~ "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n"
-#~ "comissió."
-
-#, sh-format
-#~ msgid "Stopped at $sha1_abbrev... $rest"
-#~ msgstr "S'ha aturat a $sha1_abbrev... $rest"
-
-#, sh-format
-#~ msgid "Cannot '$squash_style' without a previous commit"
-#~ msgstr "No es pot fer «$squash_style» sense una comissió prèvia"
-
-#, sh-format
-#~ msgid "Executing: $rest"
-#~ msgstr "S'està executant: $rest"
-
-#, sh-format
-#~ msgid "Execution failed: $rest"
-#~ msgstr "L'execució ha fallat: $rest"
-
-#~ 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"
-
-#~ msgid ""
-#~ "You can fix the problem, and then run\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-#~ msgstr ""
-#~ "Podeu arreglar el problema, i llavors executeu\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, 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 ""
-#~ "L'execució ha tingut èxit: $rest\n"
-#~ "però ha deixat canvis a l'índex o l'arbre de treball\n"
-#~ "Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid "Unknown command: $command $sha1 $rest"
-#~ msgstr "Ordre desconeguda: $command $sha1 $rest"
-
-#~ msgid "Please fix this using 'git rebase --edit-todo'."
-#~ msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-
-#, sh-format
-#~ msgid "Successfully rebased and updated $head_name."
-#~ msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-
-#~ msgid "Could not remove CHERRY_PICK_HEAD"
-#~ msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-
-#, 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 ""
-#~ "Teniu canvis «stage» en el vostre arbre de treball.\n"
-#~ "Si aquests canvis són per fer «squash»\n"
-#~ "a la comissió prèvia, executeu:\n"
-#~ "\n"
-#~ "  git commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "Si són per a formar una comissió nova, executeu:\n"
-#~ "\n"
-#~ "  git commit $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "En ambdós casos, quan hàgiu terminat, continueu amb:\n"
-#~ "\n"
-#~ "  git rebase --continue\n"
-
-#~ 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ó"
-
-#~ msgid ""
-#~ "You have uncommitted changes in your working tree. Please commit them\n"
-#~ "first and then run 'git rebase --continue' again."
-#~ msgstr ""
-#~ "Teniu canvis no comesos en el vostre arbre de treball. \n"
-#~ "Primer cometeu-los i després executeu «git rebase --continue» de nou."
-
-#~ msgid "Could not commit staged changes."
-#~ msgstr "No s'han pogut cometre els canvis «staged»."
-
-#~ msgid "Could not execute editor"
-#~ msgstr "No s'ha pogut executar l'editor"
-
-#, sh-format
-#~ msgid "Could not checkout $switch_to"
-#~ msgstr "No s'ha pogut agafar $switch_to"
-
-#~ msgid "No HEAD?"
-#~ msgstr "No hi ha cap HEAD?"
-
-#, sh-format
-#~ msgid "Could not create temporary $state_dir"
-#~ msgstr "No s'ha pogut crear el $state_dir temporal"
-
-#~ msgid "Could not mark as interactive"
-#~ msgstr "No s'ha pogut marcar com a interactiu"
-
-#, sh-format
-#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
-#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
-#~ msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)"
-#~ msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)"
-
-#~ msgid "Note that empty commits are commented out"
-#~ msgstr "Tingueu en compte que les comissions buides estan comentades"
-
-#~ msgid "Could not init rewritten commits"
-#~ msgstr "No s'han pogut iniciar les comissions reescrites"
-
-#~ msgid "Cannot rebase: You have unstaged changes."
-#~ msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-
-#~ msgid "Cannot pull with rebase: You have unstaged changes."
-#~ msgstr "No es pot baixar fent «rebase»: Teniu canvis «unstaged»."
-
-#~ msgid "Cannot rebase: Your index contains uncommitted changes."
-#~ msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre."
-
-#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-#~ msgstr ""
-#~ "No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre."
-
-#~ msgid "unable to write stateless separator packet"
-#~ msgstr "no s'ha pogut escriure el paquet de separació sense estat"
-
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "remote server sent stateless separator"
-#~ msgstr "el servidor remot ha enviat un separador sense estat"
diff --git a/po/de.po b/po/de.po
index f00c21d896..19ffd9a5ad 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-07 19:48+0100\n"
+"POT-Creation-Date: 2022-01-17 08:31+0800\n"
+"PO-Revision-Date: 2022-01-15 18:20+0100\n"
 "Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
 "Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
 "Language: de\n"
@@ -17,15 +17,15 @@ 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.4.3\n"
+"X-Generator: Poedit 3.0\n"
 
 #: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Wie bitte (%s)?"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "Index konnte nicht gelesen werden"
@@ -54,7 +54,7 @@ msgstr "Aktualisieren"
 msgid "could not stage '%s'"
 msgstr "Konnte '%s' nicht zum Commit vormerken."
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "konnte Index nicht schreiben"
 
@@ -70,8 +70,8 @@ msgstr[1] "%d Pfade aktualisiert\n"
 msgid "note: %s is untracked now.\n"
 msgstr "Hinweis: %s ist nun unversioniert.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
@@ -112,21 +112,21 @@ msgstr[1] "%d Pfade hinzugefügt\n"
 msgid "ignoring unmerged: %s"
 msgstr "Ignoriere nicht zusammengeführte Datei: %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Nur Binärdateien geändert.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Keine Änderungen.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Patch Aktualisierung"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Diff überprüfen"
 
@@ -194,11 +194,11 @@ msgstr "Ein nummeriertes Element auswählen"
 msgid "(empty) select nothing"
 msgstr "(leer) nichts auswählen"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Befehle ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Was nun"
 
@@ -210,13 +210,13 @@ msgstr "zur Staging-Area hinzugefügt"
 msgid "unstaged"
 msgstr "aus Staging-Area entfernt"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "Pfad"
@@ -225,27 +225,27 @@ msgstr "Pfad"
 msgid "could not refresh index"
 msgstr "Index konnte nicht aktualisiert werden"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Tschüss.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
@@ -274,22 +274,22 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung stashen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
@@ -316,22 +316,22 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
@@ -361,22 +361,22 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-"
 "Area entfernen\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung auf Index anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
@@ -406,26 +406,26 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
@@ -455,23 +455,23 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -492,23 +492,23 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -652,7 +652,7 @@ msgstr "'git apply --cached' schlug fehl."
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -664,11 +664,11 @@ msgid "The selected hunks do not apply to the index!"
 msgstr ""
 "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Nichts angewendet.\n"
 
@@ -708,11 +708,11 @@ msgstr "Kein folgender Patch-Block"
 msgid "No other hunks to goto"
 msgstr "Keine anderen Patch-Blöcke verbleibend"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "zu welchem Patch-Block springen? "
 
@@ -732,7 +732,7 @@ msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar."
 msgid "No other hunks to search"
 msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "Suche nach regulärem Ausdruck? "
 
@@ -820,7 +820,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelöstem Konflikt."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
@@ -919,21 +919,33 @@ msgstr "Nicht erkannte Whitespace-Option: '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way kann nicht außerhalb eines Repositories verwendet werden"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index kann nicht außerhalb eines Repositories verwendet werden"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached kann nicht außerhalb eines Repositories verwendet werden"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' außerhalb eines Repositories"
 
 #: apply.c:800
 #, c-format
@@ -1153,8 +1165,8 @@ msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "Fehler beim Lesen von %s"
@@ -1164,395 +1176,393 @@ msgstr "Fehler beim Lesen von %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 "Dem Repository fehlt der notwendige Blob, um einen 3-Wege-Merge "
 "durchzuführen."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Führe 3-Wege-Merge durch...\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Fehler beim Durchführen des 3-Wege-Merges...\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Ausweichen auf direkte Anwendung...\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "Ungültiger Pfad '%s'"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3998
+#: apply.c:4000
 #, 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:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prüfe Patch %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, 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:4141
+#: apply.c:4143
 #, 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:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "konnte %s nicht zum temporären Index hinzufügen"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporären Index nicht nach %s schreiben"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4349
+#: apply.c:4351
 #, 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:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "Fehler beim Schreiben nach '%s'"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "nicht erkannte Eingabe"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Keine gültigen Patches in der Eingabe (erlauben mit \"--allow-empty\")"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht öffnen: %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, 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:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, 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:4973
+#: apply.c:4977
 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "statt den Patch anzuwenden, den \"diffstat\" für die Eingabe ausgegeben"
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 "statt den Patch anzuwenden, eine Zusammenfassung für die Eingabe ausgeben"
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 "statt den Patch anzuwenden, anzeigen ob der Patch angewendet werden kann"
 
-#: apply.c:5038
+#: apply.c:5042
 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:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "neue Dateien mit `git add --intent-to-add` markieren"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "versuche 3-Wege-Merge, weiche auf normalen Patch aus, wenn dies fehlschlägt"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporären Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "Aktion"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "erweiterte Ausgaben"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "keinen Fehler für leere Patches zurückgeben"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1563,16 +1573,16 @@ msgstr "Kann Blob %s nicht streamen."
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "Konnte '%s' Filter nicht starten."
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "Konnte Descriptor nicht umleiten."
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' Filter meldete Fehler."
@@ -1616,19 +1626,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "Kann %s nicht lesen."
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
+msgid "cannot read '%s'"
+msgstr "kann '%s' nicht lesen"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
@@ -1670,7 +1674,7 @@ msgstr "Format"
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "Präfix"
 
@@ -1680,9 +1684,9 @@ msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "Datei"
@@ -1712,7 +1716,7 @@ msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "Repository"
 
@@ -1720,7 +1724,7 @@ msgstr "Repository"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "Programm"
@@ -1733,19 +1737,20 @@ msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
 msgid "Unexpected option --remote"
 msgstr "Unerwartete Option --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "die Option '%s' erfordert '%s'"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Unerwartete Option --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-"Die Optionen --add-file und --remote können nicht gemeinsam verwendet werden"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1854,7 +1859,7 @@ msgstr "ein %s Commit wird benötigt"
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
@@ -1910,10 +1915,10 @@ msgstr ""
 "endgültigen\n"
 "Commits"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1936,103 +1941,95 @@ msgstr "Pfad %s nicht in %s gefunden"
 msgid "cannot read blob %s for path %s"
 msgstr "kann Blob %s für Pfad '%s' nicht lesen"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
-"die Tracking-Informationen mit\n"
-"\"git branch --set-upstream-to=%s%s%s\"\n"
-"erneut setzen."
+"Upstream-Tracking-Konfiguration von mehreren Referenzen kann nicht vererbt "
+"werden, wenn ein Rebase angefordert wird"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "Branch %s nicht als sein eigener Upstream-Branch gesetzt"
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s' durch Rebase."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "Branch '%s' folgt nun '%s' durch Rebase."
 
-#: branch.c:94
+#: branch.c:145
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s'."
+msgid "branch '%s' set up to track '%s'."
+msgstr "Branch '%s' folgt nun '%s'."
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "Branch '%s' folgt nun lokalem Branch '%s' durch Rebase."
+msgid "branch '%s' set up to track:"
+msgstr "Branch '%s' folgt nun:"
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "Branch '%s' folgt nun lokalem Branch '%s'."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "konnte Konfiguration zu Upstream-Branch nicht schreiben"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"Nachdem Sie die Fehlerursache behoben haben, können Sie\n"
+"die Tracking-Informationen erneut setzen mit:"
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "Branch '%s' folgt nun Remote-Referenz '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"Vererbung des Tracking von '%s' angefragt, aber es ist kein Remote-"
+"Repository gesetzt"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr ""
+"Vererbung des Tracking von '%s' angefragt, aber es ist keine Merge-"
+"Konfiguration gesetzt"
 
-#: branch.c:110
+#: branch.c:252
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "Branch '%s' folgt nun lokaler Referenz '%s'."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben."
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "kein Tracking: mehrdeutige Informationen für Referenz %s"
 
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr ""
-"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
-"mehrdeutig."
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' ist kein gültiger Branchname"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' ist kein gültiger Branchname."
+msgid "a branch named '%s' already exists"
+msgstr "Branch '%s' existiert bereits"
 
-#: branch.c:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Branch '%s' existiert bereits."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"kann Aktualisierung des Branches '%s' nicht erzwingen, ausgecheckt in '%s'"
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
-"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
-"Branch."
+"kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein Branch"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2053,27 +2050,28 @@ msgstr ""
 "\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
 "zu konfigurieren."
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Ungültiger Objekt-Name: '%s'"
+msgid "not a valid object name: '%s'"
+msgstr "kein gültiger Objektname: '%s'"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "ambiguous object name: '%s'"
 msgstr "mehrdeutiger Objekt-Name: '%s'"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Ungültiger Branchpunkt: '%s'"
+msgid "not a valid branch point: '%s'"
+msgstr "ungültiger Branchpunkt: '%s'"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ist bereits in '%s' ausgecheckt"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
@@ -2098,7 +2096,7 @@ msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2157,7 +2155,7 @@ msgstr "nicht unterstützte Paket-Version %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
@@ -2194,7 +2192,7 @@ msgstr "doppelte Chunk-ID %<PRIx32> gefunden"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Ungültiger Farbwert: %.*s"
@@ -2244,190 +2242,190 @@ msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
 msgid "unable to find all commit-graph files"
 msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "Konnte Commit %s nicht finden."
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "Commit-Graph erfordert Ãœberlaufgenerierungsdaten, aber hat keine"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Lade bekannte Commits in Commit-Graph"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Erweitere erreichbare Commits in Commit-Graph"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Lösche Commit-Markierungen in Commit-Graph"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Commit-Graph Generationsnummern berechnen"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Sammle referenzierte Commits"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
 msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "Fehler beim Hinzufügen von Paket %s."
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "Fehler beim Öffnen des Index für %s."
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Suche zusätzliche Ränder in Commit-Graph"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
 msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Durchsuche zusammengeführte Commits"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Zusammenführen von Commit-Graph"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist "
 "deaktiviert"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "zu viele Commits zum Schreiben des Graphen"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
 "beschädigt"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "konnte Commit %s von Commit-Graph nicht parsen"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Commit in Commit-Graph überprüfen"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2435,7 +2433,7 @@ msgstr ""
 "Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
 "null"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2443,19 +2441,19 @@ msgstr ""
 "Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
 "null"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "konnte %s nicht parsen"
@@ -2486,28 +2484,28 @@ msgstr ""
 "Sie können diese Meldung unterdrücken, indem Sie\n"
 "\"git config advice.graftFileDeprecated false\" ausführen."
 
-#: commit.c:1239
+#: commit.c:1241
 #, 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."
 
-#: commit.c:1243
+#: commit.c:1245
 #, 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."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Commit %s hat keine GPG-Signatur."
 
-#: commit.c:1249
+#: commit.c:1251
 #, 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"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2580,7 +2578,7 @@ msgstr "Schlüssel enthält keine Sektion: %s"
 msgid "key does not contain variable name: %s"
 msgstr "Schlüssel enthält keinen Variablennamen: %s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungültiger Schlüssel: %s"
@@ -2738,151 +2736,151 @@ msgstr "core.commentChar sollte nur ein Zeichen sein"
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "Ungültiger Wert für %s."
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "Muss einer von diesen sein: nothing, matching, simple, upstream, current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "Referenz '%s' zeigt auf keinen Blob."
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "Fehler beim Parsen von %s."
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungültiger %s: '%s'"
 
-#: config.c:2501
+#: config.c:2504
 #, 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:2547
+#: config.c:2550
 #, 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:2549
+#: config.c:2552
 #, 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:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "Ungültiger Sektionsname '%s'"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "Öffne %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "Ungültiges Muster: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "Ungültige Konfigurationsdatei %s"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "mmap für '%s'(%s) fehlgeschlagen"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod auf %s fehlgeschlagen"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "Konnte '%s' nicht aufheben."
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "Ungültiger Sektionsname: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "Fehlender Wert für '%s'"
@@ -3062,7 +3060,7 @@ msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
 msgid "unable to fork"
 msgstr "kann Prozess nicht starten"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Prüfe Konnektivität"
 
@@ -3368,18 +3366,18 @@ msgstr ""
 "Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
 "Arbeitsverzeichnisses zu vergleichen."
 
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3387,7 +3385,7 @@ msgstr ""
 "\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
 "'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3396,7 +3394,7 @@ msgstr ""
 "Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-"
 "change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3404,12 +3402,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
 "Whitespace-Modi kombiniert werden."
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.submodule': '%s'"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3418,51 +3416,55 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
 msgstr ""
-"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
+"die Optionen '%s', '%s', '%s' und '%s' können nicht gemeinsam verwendet "
+"werden"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr ""
-"-G und --pickaxe-regex schließen sich gegenseitig aus. Benutzen Sie\n"
-"--pickaxe-regex mit -S."
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s'"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
-"--pickaxe-all und --find-object schließen sich gegenseitig aus. Benutzen\n"
-"Sie --pickaxe-all mit -G und -S."
+"die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen "
+"Sie '%s' mit '%s' und '%s'"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "Ungültiger --stat Wert: %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s erwartet einen numerischen Wert."
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3471,42 +3473,42 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "konnte '%s' nicht auflösen"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s erwartet die Form <n>/<m>"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s erwartet ein Zeichen, '%s' bekommen"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "ungültiges --color-moved Argument: %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ungültiger Modus '%s' in --color-moved-ws"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3514,157 +3516,157 @@ msgstr ""
 "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ungültiges Argument für %s"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "ungültiges --word-diff Argument: %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Diff-Optionen zu Ausgabeformaten"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "Patch erzeugen"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "Unterschiede im Rohformat erstellen"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "Synonym für '-p --raw'"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "Synonym für '-p --stat'"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "maschinenlesbare Ausgabe von --stat"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "nur die letzte Zeile von --stat ausgeben"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<Parameter1,Parameter2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "die Verteilung des relativen Umfangs der Änderungen für jedes "
 "Unterverzeichnis ausgeben"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "Synonym für --dirstat=cumulative"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
 "Änderungen der Datei-Rechte"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "nur Dateinamen der geänderten Dateien anzeigen"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "Zusammenfassung der Unterschiede erzeugen"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<Breite>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<Anzahl>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "farbige Unterschiede anzeigen"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<Art>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3672,7 +3674,7 @@ msgstr ""
 "Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
 "Unterschieden hervorheben"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3680,91 +3682,91 @@ msgstr ""
 "die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
 "Ausgabefeldern bei --raw oder --numstat nutzen"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<Präfix>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen "
 "anzeigen"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<Zeichen>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Diff-Optionen zur Umbenennung"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
 "\"erstellen\""
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "Umbenennungen erkennen"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "Preimage für Löschungen weglassen"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "Kopien erkennen"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "Erkennung von Umbenennungen deaktivieren"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3772,164 +3774,164 @@ msgstr ""
 "Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
 "für Umbenennungen und Kopien das gegebene Limit überschreitet"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Diff Algorithmus-Optionen"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "die kleinstmöglichen Änderungen erzeugen"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "Änderungen in leeren Zeilen ignorieren"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<Regex>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr ""
 "Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
 "verschieben"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<Algorithmus>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "einen Algorithmus für Änderungen wählen"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<Text>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<Modus>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "verschobene Codezeilen sind andersfarbig"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "wie Whitespaces in --color-moved ignoriert werden"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Andere Diff-Optionen"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
 "zeige relative Pfade an"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "alle Dateien als Text behandeln"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 "mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "alle Ausgaben vom Programm deaktivieren"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
 "werden"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<wann>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<Format>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "'git add -N' Einträge vom Index verstecken"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "'git add -N' Einträge im Index als echt behandeln"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<Zeichenkette>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3937,7 +3939,7 @@ msgstr ""
 "nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
 "Zeichenkette verändern"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3945,37 +3947,37 @@ msgstr ""
 "nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
 "regulären Ausdrucks verändern"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr ""
 "die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<Pfad>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<Objekt-ID>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3983,33 +3985,33 @@ msgstr ""
 "nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
 "Objektes verändern"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "Dateien anhand der Art der Änderung wählen"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<Datei>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Ausgabe zu einer bestimmten Datei"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 "genaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
 "übersprungen."
 
-#: diff.c:6309
+#: diff.c:6260
 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:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4053,31 +4055,31 @@ msgstr ""
 "Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
 "Muster '%s' wiederholt sich."
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "deaktiviere Cone-Muster-Ãœbereinstimmung"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "kann %s nicht als exclude-Filter benutzen"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "konnte Verzeichnis '%s' nicht öffnen"
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2890
+#: dir.c:2844
 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:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4085,36 +4087,36 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "Index-Datei in Repository %s beschädigt"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "Filtere Inhalt"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "konnte Datei '%s' nicht lesen"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ungültiger Git-Namespace-Pfad \"%s\""
@@ -4124,274 +4126,270 @@ msgstr "ungültiger Git-Namespace-Pfad \"%s\""
 msgid "too many args to run %s"
 msgstr "zu viele Argumente angegeben, um %s auszuführen"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "konnte nicht zum Remote schreiben"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc benötigt multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ungültige shallow-Zeile: %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ungültige unshallow-Zeile: %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow erwartet, %s bekommen"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "ungültiger Commit %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "gebe auf"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "fertig"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollständig"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungültiger Pack-Header"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: ungültige index-pack Ausgabe"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Server unterstützt %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Server unterstützt keine shallow-Clients"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstützt kein --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstützt kein --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Server unterstützt kein --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow), Klonen "
 "zurückgewiesen."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "der Server unterstützt Algorithmus '%s' nicht"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Server unterstützt keine shallow-Anfragen"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Server unterstützt Filter"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "konnte Anfrage nicht zum Remote schreiben"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "Fehler beim Lesen von Sektionskopf '%s'."
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' erwartet, '%s' empfangen"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "Fehler beim Verarbeiten von ACKS: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "Erwartete Versand einer Packdatei nach 'ready'."
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref erwartet, '%s' bekommen"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "unerwartetes wanted-ref: '%s'"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: Antwort-Endpaket erwartet"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "kein übereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "unerwartetes 'ready' von Remote-Repository"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "Remote-Referenz %s nicht gefunden"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "konnte temporäre Datei nicht erstellen"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4399,7 +4397,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile muss konfiguriert sein und für die Überprüfung "
 "der SSH-Signatur vorhanden sein"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4407,59 +4405,59 @@ msgstr ""
 "ssh-keygen -Y find-principals/verify wird für die Verifizierung der SSH-"
 "Signatur benötigt (verfügbar in openssh Version 8.2p1+)"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "SSH-Signatursperrdatei konfiguriert, aber nicht gefunden: %s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "fehlerhafte/inkompatible Signatur '%s'"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "konnte SSH-Fingerabdruck für Schlüssel '%s' nicht bekommen"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 "entweder user.signingkey oder gpg.ssh.defaultKeyCommand muss konfiguriert "
 "sein"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
 "gpg.ssh.defaultKeyCommand war erfolgreich, gab aber keine Schlüssel zurück: "
 "%s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg beim Signieren der Daten fehlgeschlagen"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "user.signingkey muss für die SSH-Signatur gesetzt sein"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "Fehler beim Schreiben des SSH-Signaturschlüssels nach '%s'"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "Fehler beim Schreiben des SSH-Signaturschlüsselpuffers nach '%s'"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4467,7 +4465,7 @@ msgstr ""
 "\"ssh-keygen -Y sign\" wird für die SSH-Signatur benötigt (verfügbar in "
 "openssh Version 8.2p1+)"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "Fehler beim Lesen des SSH-Signaturdatenpuffers von '%s'"
@@ -4477,7 +4475,7 @@ msgstr "Fehler beim Lesen des SSH-Signaturdatenpuffers von '%s'"
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "ungültige Farbe '%.*s' in log.graphColors ignoriert"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4485,18 +4483,18 @@ msgstr ""
 "Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
 "Punter PCRE v2 unterstützt."
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "Konnte '%s' nicht lesen"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
@@ -4620,8 +4618,8 @@ msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Stattdessen '%s' ausführen? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Stattdessen '%s' ausführen (y/N)? "
 
 #: help.c:654
 #, c-format
@@ -4848,7 +4846,7 @@ msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
 msgid "quoted CRLF detected"
 msgstr "angeführtes CRLF entdeckt"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "ungültige Aktion '%s' für '%s'"
@@ -4978,7 +4976,7 @@ msgid ""
 "moving it to %s."
 msgstr ""
 "Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
-"umbenannt wurde in %s; Verschiebe es nach %s."
+"umbenannt wurde in %s; verschiebe es nach %s."
 
 #: merge-ort.c:2407 merge-recursive.c:3268
 #, c-format
@@ -4987,7 +4985,7 @@ msgid ""
 "%s; moving it to %s."
 msgstr ""
 "Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
+"Verzeichnisses, das umbenannt wurde in %s; verschiebe es nach %s."
 
 #: merge-ort.c:2420 merge-recursive.c:3264
 #, c-format
@@ -5087,7 +5085,7 @@ msgstr "Submodul"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5096,7 +5094,7 @@ msgstr ""
 "KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s "
 "von %s wurde im Arbeitsbereich gelassen."
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5108,7 +5106,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
@@ -5124,7 +5122,7 @@ msgstr ""
 "überschrieben werden:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Bereits aktuell."
 
@@ -5416,7 +5414,7 @@ msgstr "Merge hat keinen Commit zurückgegeben"
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
@@ -5425,8 +5423,8 @@ msgstr "Konnte Index nicht schreiben."
 msgid "failed to read the cache"
 msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
@@ -5435,160 +5433,160 @@ msgstr "Konnte neue Index-Datei nicht schreiben."
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "multi-pack-index OID fanout hat die falsche Größe"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-index-Datei %s ist zu klein."
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 "multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index-Version %d nicht erkannt."
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "multi-pack-index Hash-Version %u stimmt nicht mit Version %u überein"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "Fehler beim Öffnen von pack-index '%s'"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "kann Reverse-Index-Datei nicht speichern"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "Zeile konnte nicht geparst werden: %s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "fehlerhafte Zeile: %s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr ""
 "ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht überein"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "Paket konnte nicht geladen werden"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "konnte Index für %s nicht öffnen"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Packdateien zum multi-pack-index hinzufügen"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "unbekanntes bevorzugtes Paket: '%s'"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "bevorzugtes Paket %s ohne Objekte kann nicht ausgewählt werden"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "bevorzugtes Paket '%s' ist abgelaufen"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "keine Packdateien zum Indizieren."
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "Multipack-Bitmap konnte nicht geschrieben werden"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "Multi-Pack-Index konnte nicht geschrieben werden"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "Fehler beim Löschen von %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "Fehler beim Löschen des multi-pack-index bei %s"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "Prüfsumme nicht korrekt"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Suche nach referenzierten Pack-Dateien"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5596,55 +5594,55 @@ msgstr ""
 "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
 "fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "das midx enthält keine oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Sortiere Objekte nach Pack-Datei"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Überprüfe Objekt-Offsets"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Referenzierte Objekte zählen"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "Konnte 'pack-objects' nicht ausführen"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "Konnte 'pack-objects' nicht beenden"
 
@@ -5708,265 +5706,265 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Ungültiger %s Wert: '%s'"
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "Konnte \"alternates\"-Datei nicht lesen."
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "Pfad '%s' existiert nicht"
 
-#: object-file.c:722
+#: object-file.c:762
 #, 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."
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
 "eingehängt."
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap fehlgeschlagen%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "Objektdatei %s ist leer."
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "Fehlerhaftes loses Objekt '%s'."
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "Konnte %s Kopfbereich nicht parsen."
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "ungültiger Objekt-Typ"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "Konnte %s Kopfbereich nicht entpacken."
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "Header für %s zu lang, überschreitet %d Bytes"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "Ersetzung %s für %s nicht gefunden."
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "Konnte Datei %s nicht schreiben."
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "Fehler beim Schreiben einer Datei."
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "Fehler beim Schließen der Datei für lose Objekte."
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
 "Datenbank %s"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "Konnte temporäre Datei nicht erstellen."
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "Fehler beim Schreiben der Datei für lose Objekte."
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "Fehler wegen instabilen Objektquelldaten für %s"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "Fehler beim Aufruf von utime() auf '%s'."
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "Kann Objekt für %s nicht lesen."
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "fehlerhafter Commit"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "fehlerhaftes Tag"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "Lesefehler beim Indizieren von '%s'."
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "read() zu kurz beim Indizieren von '%s'."
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: Fehler beim Einfügen in die Datenbank"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: nicht unterstützte Dateiart"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s ist kein gültiges Objekt"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s ist kein gültiges '%s' Objekt"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "kann %s nicht öffnen"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "Konnte mmap nicht auf %s ausführen."
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "Konnte Kopfbereich von %s nicht entpacken."
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "Konnte Kopfbereich von %s nicht parsen."
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "Konnte Inhalt von %s nicht entpacken."
@@ -6098,25 +6096,25 @@ msgstr "Konnte Objekt '%s' nicht parsen."
 msgid "hash mismatch %s"
 msgstr "Hash stimmt nicht mit %s überein."
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "Multipack-Bitmap fehlt erforderlicher Reverse-Index"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index: Paket konnte nicht geöffnet werden"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "Konnte Größe von %s nicht bestimmen."
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "konnte %s nicht in Paket %s bei Offset %<PRIuMAX> finden"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "konnte Festplattennutzung von %s nicht bekommen"
@@ -6166,45 +6164,50 @@ msgstr "Fehler beim lesbar machen von %s"
 msgid "could not write '%s' promisor file"
 msgstr "konnte Promisor-Datei '%s' nicht schreiben"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "Packdatei %s kann nicht gemappt werden%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, 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:1927
+#: packfile.c:1928
 #, 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-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "Option `%s' erwartet einen numerischen Wert."
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "Fehlerhaftes Ablaufdatum '%s'"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "fehlerhafter Objekt-Name '%s'"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "Option `%s' erwartet \"%s\" oder \"%s\""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6242,36 +6245,36 @@ msgstr ""
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "Alias für --%s"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "Unbekannte Option: `%s'"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "Unbekannter Schalter `%c'"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
@@ -6279,7 +6282,7 @@ msgstr "Verwendung: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
@@ -6303,17 +6306,17 @@ msgstr "      oder: %s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -6445,17 +6448,17 @@ msgstr "Lesefehler"
 msgid "the remote end hung up unexpectedly"
 msgstr "Die Gegenseite hat unerwartet abgebrochen."
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "Protokollfehler: ungültige Zeilenlänge %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "Fehler am anderen Ende: %s"
@@ -6508,7 +6511,7 @@ msgstr "Konnte `log` nicht starten."
 msgid "could not read `log` output"
 msgstr "Konnte Ausgabe von `log` nicht lesen."
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "Konnte Commit '%s' nicht parsen."
@@ -6531,62 +6534,58 @@ msgstr "Konnte Git-Header '%.*s' nicht parsen."
 msgid "failed to generate diff"
 msgstr "Fehler beim Generieren des Diffs."
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only und --right-only schließen sich gegenseitig aus"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "Konnte Log für '%s' nicht parsen."
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 "Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)."
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse "
 "hinzufügen."
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' hat keinen Commit ausgecheckt"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "Konnte Datei '%s' nicht indizieren."
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "Konnte '%s' nicht dem Index hinzufügen."
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "konnte '%s' nicht lesen"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Aktualisiere Index"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6595,7 +6594,7 @@ msgstr ""
 "index.version gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6604,143 +6603,143 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "Ungültige Signatur 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "Ungültige Index-Version %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "Ungültige SHA1-Signatur der Index-Datei."
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "Ignoriere Erweiterung %.4s"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'."
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "Ungeordnete Stage-Einträge im Index."
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "Ungeordnete Stage-Einträge für '%s'."
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "Index-Datei beschädigt"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: Kann geöffneten Index nicht lesen."
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: Index-Datei ist kleiner als erwartet."
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s: Konnte Index-Datei nicht mappen%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "Konnte '%s' nicht schließen."
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: Kann nicht auf Stufe #0 wechseln."
@@ -6811,7 +6810,7 @@ msgstr ""
 ".       spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n"
 ".       Commit-Beschreibung.\n"
 "\n"
-"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
+"Diese Zeilen können umsortiert werden; sie werden von oben nach unten\n"
 "ausgeführt.\n"
 
 #: rebase-interactive.c:66
@@ -6862,8 +6861,8 @@ msgstr ""
 "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6905,7 +6904,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s: 'preserve' wurde durch 'merges' ersetzt"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "entfernt"
 
@@ -6944,7 +6943,8 @@ msgstr "Positiver Wert erwartet refname:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Positiver Wert erwartet refname:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "nicht erkanntes %%(%s) Argument: %s"
@@ -6954,11 +6954,6 @@ msgstr "nicht erkanntes %%(%s) Argument: %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) akzeptiert keine Argumente"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6969,11 +6964,6 @@ msgstr "%%(deltabase) akzeptiert keine Argumente"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) akzeptiert keine Argumente"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "nicht erkanntes %%(subject) Argument: %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6989,26 +6979,11 @@ msgstr "unbekanntes %%(trailers) Argument: %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "Positiver Wert erwartet contents:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "nicht erkanntes %%(contents) Argument: %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "nicht erkanntes %%(raw) Argument: %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "positiver Wert erwartet '%s' in %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "nicht erkanntes Argument '%s' in %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -7029,21 +7004,11 @@ msgstr "nicht erkannte Position:%s"
 msgid "unrecognized width:%s"
 msgstr "nicht erkannte Breite:%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "nicht erkanntes %%(align) Argument: %s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "Positive Breitenangabe für %%(align) erwartet"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "nicht erkanntes %%(if) Argument: %s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -7066,15 +7031,10 @@ msgid ""
 msgstr ""
 "Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
 
-#: ref-filter.c:844
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
-
-#: ref-filter.c:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: %%(%s) Atom ohne ein %%(%s) Atom verwendet"
 
 #: ref-filter.c:912
 #, c-format
@@ -7086,16 +7046,6 @@ msgstr "format: %%(then) Atom mehr als einmal verwendet"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: %%(then) Atom nach %%(else) verwendet"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7170,22 +7120,22 @@ msgstr "fehlerhaftes Objekt bei '%s'"
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "Ignoriere fehlerhafte Referenz %s"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "missgebildeter Objektname %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "die Option `%s' muss auf einen Commit zeigen"
@@ -7232,73 +7182,73 @@ msgstr "konnte `%s` nicht abrufen"
 msgid "invalid branch name: %s = %s"
 msgstr "ungültiger Branchname: %s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "Log für Referenz %s hat eine Lücke nach %s."
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "Log für Referenz %s unerwartet bei %s beendet."
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "Log für %s ist leer."
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
 "verboten"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existiert; kann '%s' nicht erstellen"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "konnte Referenz %s nicht löschen"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "konnte Referenz %s nicht entfernen: %s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "konnte Referenzen nicht entfernen: %s"
@@ -7308,52 +7258,52 @@ msgstr "konnte Referenzen nicht entfernen: %s"
 msgid "invalid refspec '%s'"
 msgstr "ungültige Refspec '%s'"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' "
 "beginnen: %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
 
-#: remote.c:590
+#: remote.c:699
 #, 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:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt üblicherweise %s, nicht %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "Schlüssel '%s' des Musters hatte kein '*'."
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "Wert '%s' des Musters hat kein '*'."
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "Src-Refspec %s entspricht keiner Referenz."
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
@@ -7362,7 +7312,7 @@ msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7389,7 +7339,7 @@ msgstr ""
 "Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
 "Referenz mit vollqualifizierten Namen angeben."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7400,7 +7350,7 @@ msgstr ""
 "Meinten Sie, einen neuen Branch mittels Push nach\n"
 "'%s:refs/heads/%s' zu erstellen?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7411,7 +7361,7 @@ msgstr ""
 "Meinten Sie, einen neuen Tag mittels Push nach\n"
 "'%s:refs/tags/%s' zu erstellen?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7422,7 +7372,7 @@ msgstr ""
 "Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
 "mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7433,117 +7383,117 @@ msgstr ""
 "Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
 "mittels Push nach '%s:refs/tags/%s' zu erstellen?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s kann nicht zu Branch aufgelöst werden."
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "Branch nicht gefunden: '%s'"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
 
-#: remote.c:1742
+#: remote.c:1852
 #, 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:1757
+#: remote.c:1867
 #, 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:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "Konnte Remote-Referenz %s nicht finden."
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (benutzen Sie \"%s\" für Details)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
 msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7553,12 +7503,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7573,13 +7523,13 @@ msgstr[1] ""
 "Ihr Branch und '%s' sind divergiert,\n"
 "und haben jeweils %d und %d unterschiedliche Commits.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
 "zusammenzuführen)\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
@@ -7612,7 +7562,7 @@ msgstr "Konnte Rerere-Eintrag nicht schreiben."
 msgid "there were errors while writing '%s' (%s)"
 msgstr "Fehler beim Schreiben von '%s' (%s)."
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "Flush bei '%s' fehlgeschlagen."
@@ -7657,8 +7607,8 @@ msgstr "Kann '%s' nicht löschen."
 msgid "Recorded preimage for '%s'"
 msgstr "Preimage für '%s' aufgezeichnet."
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
@@ -7696,37 +7646,29 @@ msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
 msgid "could not determine HEAD revision"
 msgstr "Konnte HEAD-Commit nicht bestimmen."
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input ist nicht kompatibel mit --no-walk"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk ist nicht kompatibel mit --unsorted-input"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "Konnte Thread für async nicht erzeugen: %s"
@@ -7793,8 +7735,8 @@ msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
 msgid "could not delete '%s'"
 msgstr "Konnte '%s' nicht löschen."
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "Konnte '%s' nicht löschen"
@@ -7858,13 +7800,13 @@ msgstr ""
 "Um abzubrechen und zurück zum Zustand vor \"git revert\" zu gelangen,\n"
 "führen Sie \"git revert --abort\" aus."
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "Konnte nicht nach '%s' schreiben."
@@ -7874,12 +7816,18 @@ msgstr "Konnte nicht nach '%s' schreiben."
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "Fehler beim Fertigstellen von '%s'."
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "Konnte '%s' nicht lesen"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7895,7 +7843,7 @@ msgstr ""
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
@@ -7926,8 +7874,8 @@ msgstr "Kein Schlüssel in '%.*s' vorhanden."
 msgid "unable to dequote value of '%s'"
 msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "Konnte '%s' nicht zum Lesen öffnen."
@@ -7992,11 +7940,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8024,7 +7972,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8050,350 +7998,351 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "Konnte neu erstellten Commit nicht analysieren."
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "losgelöster HEAD"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (Root-Commit)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "Konnte HEAD nicht parsen."
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s ist kein Commit!"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "Konnte Commit von HEAD nicht analysieren."
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "Konnte Commit-Autor nicht parsen."
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "ungültige Autor-Identität '%s'"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "Fehler beim Schreiben des Commit-Objektes."
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "Konnte %s nicht aktualisieren."
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "Konnte Commit %s nicht parsen."
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "Konnte Eltern-Commit %s nicht parsen."
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Das ist die erste Commit-Beschreibung:"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Das ist Commit-Beschreibung #%d:"
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Die erste Commit-Beschreibung wird übersprungen:"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kann '%s' nicht schreiben"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "benötige HEAD für fixup"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengeführt."
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "kann fixup nicht auf Root-Commit anwenden"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, 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:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "Commit %s hat keinen Eltern-Commit %d"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s akzeptiert keine Argumente: '%s'"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "Fehlende Argumente für %s."
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "Konnte '%s' nicht parsen."
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungültige Zeile %d: %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "Konnte '%s' nicht lesen."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "Abbrechen eines laufenden \"cherry-pick\""
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "Abbrechen eines laufenden \"revert\""
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "ungültiger Wert für %s: %s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "unbenutzbares squash-onto"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits übergeben"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "\"revert\" ist bereits im Gange"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "\"cherry-pick\" wird bereits durchgeführt"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "konnte HEAD nicht sperren"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflösen"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 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:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht öffnen"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kann '%s' nicht lesen: %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "unerwartetes Dateiende"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, 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:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "kein Revert im Gange"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "kein \"cherry-pick\" im Gange"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "Ãœberspringen des Commits fehlgeschlagen"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "nichts zum Ãœberspringen vorhanden"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8402,16 +8351,16 @@ msgstr ""
 "Haben Sie bereits committet?\n"
 "Versuchen Sie \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "kann HEAD nicht lesen"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "konnte '%s' nicht nach '%s' kopieren"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8430,27 +8379,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Konnte %s... (%.*s) nicht anwenden"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Konnte \"%.*s\" nicht zusammenführen"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "konnte '%s' nicht nach '%s' kopieren"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Führe aus: %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8466,11 +8415,11 @@ msgstr ""
 "\n"
 "ausführen.\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 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:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8488,91 +8437,91 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "unerlaubter Beschriftungsname: '%.*s'"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "unechten Root-Commit schreiben"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "squash-onto schreiben"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "konnte '%s' nicht auflösen"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "kann nicht ohne einen aktuellen Commit mergen"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "konnte '%.*s' nicht parsen"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nichts zum Zusammenführen: '%.*s'"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 "Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "merge: Konnte neue Index-Datei nicht schreiben."
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Kann automatischen Stash nicht erzeugen"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Unerwartete 'stash'-Antwort: '%s'"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Automatischen Stash erzeugt: %s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "konnte 'reset --hard' nicht ausführen"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8583,29 +8532,29 @@ msgstr ""
 "Ihre Änderungen sind im Stash sicher.\n"
 "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "konnte HEAD nicht loslösen"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Angehalten bei HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Angehalten bei %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8627,60 +8576,60 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Rebase (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungültige Datei: '%s'"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungültige Inhalte: '%s'"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8691,69 +8640,69 @@ msgstr ""
 "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "Konnte Datei nicht schreiben: '%s'"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "zuvor angewendeten Commit %s übersprungen"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr ""
 "verwenden Sie --reapply-cherry-picks, um übersprungene Commits einzubeziehen"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: unbehandelte Optionen"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: Fehler beim Vorbereiten der Commits"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "Nichts zu tun."
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "Das Script wurde bereits umgeordnet."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "'%s' liegt außerhalb des Repositories von '%s'"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8763,7 +8712,7 @@ msgstr ""
 "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
 "nicht existieren."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8775,13 +8724,13 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
-"Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
+"die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8792,101 +8741,101 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden."
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "Unbekannte Repository-Erweiterung gefunden:"
 msgstr[1] "Unbekannte Repository-Erweiterungen gefunden:"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "Repository-Version ist 0, aber Erweiterung nur für v1 gefunden:"
 msgstr[1] "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "Fehler beim Öffnen von '%s'."
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von '%s'."
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "Ungültiges gitfile-Format: %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "Kein Pfad in gitfile: %s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "Kein Git-Repository: %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' zu groß"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "Kein Git-Repository: '%s'"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "Kann nicht in Verzeichnis '%s' wechseln."
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "Konnte '%*s%s%s' nicht lesen."
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s"
 
-#: setup.c:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8896,7 +8845,7 @@ msgstr ""
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8905,15 +8854,15 @@ msgstr ""
 "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
 "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "fork fehlgeschlagen"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid fehlgeschlagen"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
@@ -8970,13 +8919,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u Byte/s"
 msgstr[1] "%u Bytes/s"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "Konnte '%s' nicht editieren."
@@ -9070,7 +9019,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "Prozess für Submodul '%s' fehlgeschlagen"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
 
@@ -9277,12 +9226,12 @@ msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
-"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
-"wahrscheinlich eine neuere Version von Git."
+"unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
+"wahrscheinlich eine neuere Version von Git"
 
 #: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
-msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren."
+msgstr "dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren"
 
 #: transport-helper.c:287 transport-helper.c:429
 #, c-format
@@ -9300,7 +9249,7 @@ msgstr "konnte \"fast-import\" nicht ausführen"
 
 #: transport-helper.c:520
 msgid "error while running fast-import"
-msgstr "Fehler beim Ausführen von 'fast-import'."
+msgstr "Fehler beim Ausführen von 'fast-import'"
 
 #: transport-helper.c:549 transport-helper.c:1251
 #, c-format
@@ -9321,7 +9270,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr "ungültiger Remote-Service Pfad."
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "die Operation wird von dem Protokoll nicht unterstützt"
 
@@ -9542,7 +9491,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "Abbruch."
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "Fehler beim Versand aller erforderlichen Submodule."
 
@@ -9562,7 +9511,7 @@ msgstr "leerer Dateiname in Tree-Eintrag"
 msgid "too-short tree file"
 msgstr "zu kurze Tree-Datei"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9573,7 +9522,7 @@ msgstr ""
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
 "wechseln."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9583,7 +9532,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9593,7 +9542,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9603,7 +9552,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9613,7 +9562,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9622,7 +9571,7 @@ msgstr ""
 "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9632,7 +9581,16 @@ msgstr ""
 "Dateien in diesen Verzeichnissen verloren gehen:\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Löschen des aktuellen Arbeitsverzeichnisses verweigert:\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9642,7 +9600,7 @@ msgstr ""
 "den Checkout entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9653,7 +9611,7 @@ msgstr ""
 "Checkout entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9663,7 +9621,7 @@ msgstr ""
 "den Merge entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9674,7 +9632,7 @@ msgstr ""
 "Merge entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9684,7 +9642,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9694,7 +9652,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9705,7 +9663,7 @@ msgstr ""
 "den Checkout überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9717,7 +9675,7 @@ msgstr ""
 "Checkout überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9727,7 +9685,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9737,7 +9695,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9747,7 +9705,7 @@ msgstr ""
 "den %s überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9758,12 +9716,12 @@ msgstr ""
 "%s überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9772,7 +9730,7 @@ msgstr ""
 "Kann Submodul nicht aktualisieren:\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9783,7 +9741,7 @@ msgstr ""
 "übrig gelassen:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9793,7 +9751,7 @@ msgstr ""
 "partieller Muster übrig gelassen:\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9804,12 +9762,12 @@ msgstr ""
 "partieller Muster nicht aktualisiert:\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "Abbruch\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9818,11 +9776,11 @@ msgstr ""
 "Nachdem die obigen Pfade behoben sind, können Sie `git sparse-checkout "
 "reapply` ausführen.\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "Aktualisiere Dateien"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9832,17 +9790,17 @@ msgstr ""
 "auf einem case-insensitiven Dateisystem) und nur einer von der\n"
 "selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Aktualisiere Index-Markierungen"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "Arbeitsverzeichnis und unversionierter Commit haben doppelte Einträge: %s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "erwartete Flush nach Abrufen der Argumente"
 
@@ -9879,100 +9837,100 @@ msgstr "ungültiges '..' Pfadsegment"
 msgid "Fetching objects"
 msgstr "Anfordern der Objekte"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' existiert nicht."
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' zeigt nicht zurück auf '%s'"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "kein Verzeichnis"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git ist keine Datei"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git-Datei kaputt"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git-Datei fehlerhaft"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "kein gültiger Pfad"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
-msgstr "Konnte Repository nicht finden; .git ist keine Datei"
+msgstr "konnte Repository nicht finden; .git ist keine Datei"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
 "konnte Repository nicht finden; .git-Datei referenziert kein Repository"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir nicht lesbar"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir fehlerhaft"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "kein gültiges Verzeichnis"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir-Datei existiert nicht"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "konnte gitdir-Datei nicht lesen (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "ungültige gitdir-Datei"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
 
@@ -10039,11 +9997,11 @@ msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Zum Commit vorgemerkte Änderungen:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
@@ -10151,22 +10109,22 @@ msgstr "geänderter Inhalt, "
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, 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:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10174,7 +10132,7 @@ msgstr ""
 "Ändern oder entfernen Sie nicht die obige Zeile.\n"
 "Alles unterhalb von ihr wird ignoriert."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10186,114 +10144,121 @@ msgstr ""
 "berechnen.\n"
 "Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
 
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 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:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (benutzen Sie \"git am --allow-empty\", um den aktuellen Patch als leeren "
+"Commit zu speichern)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (benutzen Sie \"git am --abort\", um den ursprünglichen Branch "
 "wiederherzustellen)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo fehlt."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Keine Befehle ausgeführt."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
 msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (mehr Informationen in Datei %s)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Keine Befehle verbleibend."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
 msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Sie sind gerade beim Rebase."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" "
 "aus)"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch "
 "auszuchecken)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10301,174 +10266,174 @@ msgstr ""
 "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
 "'%s' im Gange ist."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --"
 "continue\" aus)"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf "
 "'%s'."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "Sie editieren gerade einen Commit während eines Rebase."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
 "nachzubessern)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen "
 "abgeschlossen sind)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick zurzeit im Gange."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue"
 "\" aus)"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr ""
 "  (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
 "abzubrechen)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Revert zurzeit im Gange."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Sie sind gerade beim Revert von Commit '%s'."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 "  (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
 "aus)"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (Führen Sie \"git revert --continue\", um weiterzumachen)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Sie sind gerade bei einer binären Suche."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
 "zurückzukehren)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Sie befinden sich in einem partiellen Checkout."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 "Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten "
 "Dateien."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD losgelöst bei "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD losgelöst von "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Noch keine Commits"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10479,32 +10444,32 @@ msgstr ""
 "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
 "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine Änderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10513,86 +10478,86 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 "(benutzen Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
 "Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
 "anzuzeigen)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Noch keine Commits in "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "unterschiedlich"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "voraus "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "konnte IPC-Befehl nicht senden"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "konnte IPC-Antwort nicht lesen"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "konnte accept_thread nicht für '%s' starten"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "konnte worker[0] nicht für '%s' starten"
@@ -10630,116 +10595,122 @@ msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 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:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "Probelauf"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "erweiterte Ausgaben"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
 "-u)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 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:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 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:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufügen, nur den Index aktualisieren"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 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:388
+#: builtin/add.c:385
 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:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr ""
 "erlaube das Aktualisieren von Einträgen außerhalb des partiellen Checkouts "
 "im Cone-Modus"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "Backend für `git stash -p`"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10773,12 +10744,12 @@ msgstr ""
 "\n"
 "Siehe \"git help submodule\" für weitere Informationen."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "Füge eingebettetes Repository hinzu: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10788,52 +10759,28 @@ msgstr ""
 "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "Hinzufügen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run und --interactive/--patch sind inkompatibel"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file und --interactive/--patch sind inkompatibel"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file und --edit sind inkompatibel"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A und -u sind zueinander inkompatibel"
-
-#: builtin/add.c:547
-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:551
+#: builtin/add.c:548
 #, 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:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul benötigt --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr ""
+"'%s' und Pfadspezifikation-Argumente können nicht gemeinsam verwendet werden"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10843,116 +10790,124 @@ msgstr ""
 "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Ungültiger Wert für --empty: %s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "konnte Autor-Skript nicht parsen"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "konnte Patch '%s' nicht parsen"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 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:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "ungültiger Zeitstempel"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "Ungültige \"Date\"-Zeile"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "Ungültiger Offset in der Zeitzone"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, 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:1128
+#: builtin/am.c:1154
 #, 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:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Um den leeren Patch als einen leeren Commit zu speichern, führen Sie \"%s --"
+"allow-empty\" aus."
+
+#: builtin/am.c:1161
 #, 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:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte "
 "verloren gehen."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Patch ist leer."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "Autor-Zeile fehlt in Commit %s"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 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:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen..."
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10960,24 +10915,24 @@ msgstr ""
 "Haben Sie den Patch per Hand editiert?\n"
 "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 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:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -10985,41 +10940,59 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 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:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Ãœberspringe: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Erzeuge leeren Commit: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Patch ist leer."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "Benutzen Sie 'git am --show-current-patch=diff', um den\n"
 "fehlgeschlagenen Patch zu sehen"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Keine Änderungen - wurde als leerer Commit gespeichert."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11030,7 +11003,7 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11040,20 +11013,20 @@ msgstr ""
 "Sie haben noch immer nicht zusammengeführte Pfade in Ihrem Index.\n"
 "Sie sollten 'git add' für jede Datei mit aufgelösten Konflikten ausführen,\n"
 "um diese als solche zu markieren.\n"
-"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
+"Sie können `git rm` auf Dateien ausführen, um \"von denen gelöscht\" für\n"
 "diese zu akzeptieren."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11061,160 +11034,169 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungültiger Wert für --patch-format: %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Ungültiger Wert für --show-current-patch: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr ""
+"die Optionen '%s=%s' und '%s=%s' können nicht gemeinsam verwendet werden"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "eine Signed-off-by Zeile der Commit-Beschreibung hinzufügen"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 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:2292
+#: builtin/am.c:2348
 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:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "an git-mailinfo weitergeben"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "an git-apply übergeben"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "Anzahl"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "Format"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "den Patch, der gerade angewendet wird, anzeigen"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "leerer Patch als leeren Commit gespeichert"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "wie leere Patches behandelt werden sollen"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -11222,16 +11204,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, 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:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11240,11 +11222,11 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
 
@@ -11704,11 +11686,11 @@ msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
 msgid "show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "Fortschrittsanzeige erzwingen"
@@ -11760,7 +11742,7 @@ msgstr ""
 msgid "ignore whitespace differences"
 msgstr "Whitespace-Unterschiede ignorieren"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "Commit"
 
@@ -11815,7 +11797,7 @@ msgstr ""
 "nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
 "verarbeiten"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -11829,18 +11811,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "Datei %s hat nur %lu Zeile"
 msgstr[1] "Datei %s hat nur %lu Zeilen"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
@@ -11872,7 +11854,7 @@ msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<Optionen>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11881,7 +11863,7 @@ msgstr ""
 "entferne Branch '%s', der zusammengeführt wurde mit\n"
 "         '%s', aber noch nicht mit HEAD zusammengeführt wurde."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11890,12 +11872,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:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11905,7 +11887,7 @@ msgstr ""
 "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
 "%s' aus."
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
 
@@ -11917,106 +11899,106 @@ msgstr "kann -a nicht mit -d benutzen"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "Branch '%s' nicht gefunden."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "Konnte Formatierungsstring nicht parsen."
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "Konnte HEAD-Commit nicht auflösen."
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Branch %s wird auf %s umgesetzt"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Binäre Suche von Branch %s zu %s im Gange"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 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:516
+#: builtin/branch.c:520
 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:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Kopie des Branches fehlgeschlagen"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, 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:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
 "fehlgeschlagen."
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 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:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12027,181 +12009,177 @@ msgstr ""
 "  %s\n"
 "Zeilen, die mit '%c' beginnen, werden entfernt.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "Branch-Tracking-Konfiguration setzen"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "nicht verwenden"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "Upstream"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit enthalten"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "einen Branch und dessen Reflog kopieren"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
-msgstr "Zeige aktuellen Branch-Namen."
+msgstr "Zeige aktuellen Branchnamen."
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "Objekt"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "für die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column und --verbose sind inkompatibel"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "zu viele Branches für eine Kopieroperation angegeben"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12209,34 +12187,34 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr ""
 "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
 "entfernen"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 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:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -12245,7 +12223,7 @@ msgstr ""
 "verwendet werden.\n"
 "Wollten Sie -a|-r --list <Muster> benutzen?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12521,8 +12499,8 @@ 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:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
@@ -12580,10 +12558,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<Optionen>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "Zeichenkette"
 
@@ -12650,99 +12628,94 @@ msgstr "git switch [<Optionen>] [<Branch>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "Pfad '%s' hat nicht unsere Version."
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "Pfad '%s' hat nicht deren Version."
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "Pfad '%s': kann nicht zusammenführen"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d Merge-Konflikt wieder erstellt"
 msgstr[1] "%d Merge-Konflikte wieder erstellt"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d Pfad von %s aktualisiert"
 msgstr[1] "%d Pfade von %s aktualisiert"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d Pfad vom Index aktualisiert"
 msgstr[1] "%d Pfade vom Index aktualisiert"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' kann nicht mit '%s' verwendet werden"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln"
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "Weder '%s' noch '%s' ist angegeben"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt."
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 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:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12751,50 +12724,50 @@ msgstr ""
 "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, 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:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12817,7 +12790,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12844,19 +12817,19 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12866,7 +12839,7 @@ msgstr ""
 "Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
 "eindeutig voneinander zu unterscheiden."
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12889,51 +12862,51 @@ msgstr ""
 "bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
 "checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "nur eine Referenz erwartet"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "nur eine Referenz erwartet, %d gegeben."
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "Ein Branch wird erwartet, '%s' bekommen"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12941,7 +12914,7 @@ msgstr ""
 "Der Branch kann nicht während eines Merges gewechselt werden.\n"
 "Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12950,7 +12923,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12959,7 +12932,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12968,7 +12941,7 @@ msgstr ""
 "gewechselt werden.\n"
 "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12977,140 +12950,129 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "Sie wechseln den Branch während einer binären Suche"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' kann nicht <Startpunkt> bekommen"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "Branch- oder Commit-Argument fehlt"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "Konfliktstil (merge oder diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "Konfliktstil (merge, diff3 oder zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 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:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p und --overlay schließen sich gegenseitig aus"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr ""
+"die Optionen '-%c', '-%c' und '%s' können nicht gemeinsam verwendet werden"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track benötigt ein Branchname"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "kein Branchname; versuchen Sie -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "konnte %s nicht auflösen"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, 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:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file und --detach sind inkompatibel"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file und --patch sind inkompatibel"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13118,71 +13080,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
 "Sie aus dem Index auschecken."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "Branch"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "benutze Overlay-Modus (Standard)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "einen neuen Branch erzeugen und dahin wechseln"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "lokale Änderungen verwerfen"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "Index wiederherstellen"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignoriere nicht zusammengeführte Einträge"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "benutze Overlay-Modus"
 
@@ -13217,7 +13179,15 @@ msgstr "Würde Repository %s überspringen\n"
 msgid "could not lstat %s\n"
 msgstr "Konnte 'lstat' nicht für %s ausführen\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Das aktuelle Arbeitsverzeichnis zu löschen wird verweigert\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Das aktuelle Arbeitsverzeichnis zu löschen würde verweigert werden\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13230,7 +13200,7 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Präfix auswählen\n"
 "           - (leer) nichts auswählen\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13251,33 +13221,33 @@ msgstr ""
 "*          - alle Elemente auswählen\n"
 "           - (leer) Auswahl beenden\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Wie bitte (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 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:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13295,52 +13265,52 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 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:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Löschen, beende."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelöschten Dateien ausgeben"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "Muster"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien löschen"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien löschen"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13348,7 +13318,7 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13356,7 +13326,7 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x und -X können nicht gemeinsam verwendet werden"
 
@@ -13412,19 +13382,20 @@ msgstr "Vorlagenverzeichnis"
 msgid "directory from which templates will be used"
 msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "Repository referenzieren"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "Name"
@@ -13441,7 +13412,7 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "Tiefe"
@@ -13451,7 +13422,7 @@ msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "Zeit"
@@ -13463,19 +13434,19 @@ msgstr ""
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "Commit"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 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:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
@@ -13503,22 +13474,22 @@ msgstr "Schlüssel=Wert"
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "serverspezifisch"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "Option übertragen"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
@@ -13614,29 +13585,25 @@ msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare und --origin %s sind inkompatibel."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare und --separate-git-dir sind inkompatibel."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "die Optionen '%s' und '%s %s' können nicht gemeinsam verwendet werden"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "Repository '%s' existiert nicht"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
@@ -13657,8 +13624,8 @@ msgstr ""
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
@@ -13787,7 +13754,7 @@ msgstr ""
 "split[=<Strategie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <Anzahl>] [--[no-]progress] <Split-Optionen>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "Verzeichnis"
 
@@ -13874,7 +13841,7 @@ msgstr ""
 msgid "Collecting commits from input"
 msgstr "Sammle Commits von der Standard-Eingabe"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "Nicht erkannter Unterbefehl: %s"
@@ -13892,7 +13859,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "doppelter Vorgänger %s ignoriert"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "Kein gültiger Objektname: %s"
@@ -13915,13 +13882,13 @@ msgstr "Eltern-Commit"
 msgid "id of a parent commit object"
 msgstr "ID eines Eltern-Commit-Objektes."
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "Beschreibung"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
@@ -13929,7 +13896,7 @@ msgstr "Commit-Beschreibung"
 msgid "read commit log message from file"
 msgstr "Commit-Beschreibung von Datei lesen"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Commit mit GPG signieren"
@@ -14009,10 +13976,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll."
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll."
@@ -14101,8 +14064,8 @@ msgstr "Konnte Log-Datei '%s' nicht lesen"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "-m kann nicht mit --fixup:%s kombiniert werden"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "die Optionen '%s' und '%s:%s' können nicht gemeinsam verwendet werden"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -14213,7 +14176,7 @@ msgstr "konnte Anhänge nicht an --trailers weitergeben"
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
@@ -14231,15 +14194,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Ungültiger ignored-Modus '%s'."
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long und -z sind inkompatibel"
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Ein Merge ist im Gange -- kann Umformulierung nicht durchführen."
@@ -14250,118 +14209,117 @@ msgstr "\"cherry-pick\" ist im Gange -- kann Umformulierung nicht durchführen."
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
-"Option für Umformulierung bei --fixup kann nicht mit Pfad '%s' kombiniert "
-"werden"
+"Umformulierungsoption von '%s' und Pfad '%s' können nicht gemeinsam "
+"verwendet werden"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr ""
-"Umformulierungsoption von --fixup und --patch/--interactive/--all/--"
-"include/--only schließen sich gegenseitig aus"
+"Umformulierungsoption von '%s' und '%s' können nicht gemeinsam verwendet "
+"werden"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "--reset-author und --author können nicht gemeinsam verwendet werden"
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Sie haben nichts zum Nachbessern."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Ein Merge ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "\"cherry-pick\" ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Ein Rebase ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
-"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden"
+"die Optionen --squash und --fixup können nicht gemeinsam verwendet werden"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 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:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr "--reset-author kann nur mit -C, -c oder --amend verwendet werden"
+msgstr "--reset-author kann nur mit -C, -c oder --amend verwendet werden."
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 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:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "unbekannte Option: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "voraus/hinterher-Werte berechnen"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "Modus"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 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:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14369,11 +14327,11 @@ msgstr ""
 "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
 "(Standard: traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14381,195 +14339,195 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "keine Umbenennungen ermitteln"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]Commit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "eine autosquash-formatierte Beschreibung zum Nachbessern/Umformulieren des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "eine autosquash-formatierte Beschreibung beim \"squash\" des angegebenen "
 "Commits verwenden"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 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:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "Anhang"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "benutzerdefinierte Anhänge hinzufügen"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "eine Signed-off-by Zeile hinzufügen"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, 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:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Commit aufgrund leerer Commit-Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -15086,7 +15044,7 @@ msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
@@ -15105,25 +15063,14 @@ msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long und --abbrev=0 sind inkompatibel"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty kann nicht mit Commits verwendet werden"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken kann nicht mit Commits verwendet werden"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin und --merge-base schließen sich gegenseitig aus"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "Option '%s' und Commit-Angaben können nicht gemeinsam verwendet werden"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -15144,26 +15091,26 @@ msgstr "Ungültige Option: %s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: keine Merge-Basis"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Kein Git-Repository"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "Objekt '%s' ist ungültig."
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "Mehr als zwei Blobs angegeben: '%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "unbehandeltes Objekt '%s' angegeben"
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: mehrere Merge-Basen, nutze %s"
@@ -15172,22 +15119,22 @@ msgstr "%s...%s: mehrere Merge-Basen, nutze %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, 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:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15195,59 +15142,59 @@ msgstr ""
 "kombinierte Diff-Formate ('-c' und '--cc') werden im Verzeichnis-\n"
 "Diff-Modus ('-d' und '--dir-diff') nicht unterstützt."
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geändert: '%s' und '%s'."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporäre Dateien in '%s'."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "Sie könnten diese aufräumen oder wiederherstellen."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "fehlgeschlagen: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "`diff.guitool` statt `diff.tool` benutzen"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "Diff über ganzes Verzeichnis ausführen"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "Tool"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 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:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15255,31 +15202,23 @@ msgstr ""
 "'git-difftool' beenden, wenn das aufgerufene Diff-Tool mit einem Exit-Code "
 "ungleich 0 ausgeführt wurde"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
-msgstr "an 'diff' übergeben"
+msgstr "an `diff` übergeben"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> für --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 
@@ -15303,7 +15242,7 @@ msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden"
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
-"Option `--default' erwartet einen booleschen Wert bei `--type=bool', nicht `"
+"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht `"
 "%s`"
 
 #: builtin/env--helper.c:82
@@ -15319,130 +15258,120 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Fehler: Verschachtelte Tags können nicht exportiert werden, außer --mark-"
 "tags wurde angegeben."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "Token für --anonymize-map kann nicht leer sein"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wählen"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "Markierungen in diese Datei schreiben"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "Markierungen von dieser Datei importieren"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "Ausgabe von Blob-Daten überspringen"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "von:nach"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
 "referenzieren"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "Tags mit Markierungs-IDs beschriften"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"--import-marks und --import-marks-if-exists können nicht zusammen "
-"weitergegeben werden"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Fehlende 'from'-Markierungen für Submodul '%s'"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Fehlende 'to'-Markierungen für Submodul '%s'"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "'mark' Befehl erwartet, '%s' bekommen"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "'to' Befehl erwartet, '%s' bekommen"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
@@ -15452,126 +15381,126 @@ msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
 msgid "Lockfile created but not reported: %s"
 msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kann nicht negativ sein"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "Upstream für \"git pull/fetch\" setzen"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "das Ãœberschreiben einer lokalen Referenz erzwingen"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "Refspec verändern, damit alle Referenzen unter refs/prefetch/ platziert "
 "werden"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 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:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
 "und geänderte Tags aktualisieren"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 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:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15579,147 +15508,151 @@ msgstr ""
 "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 "ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar "
 "sind"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "keine Packdatei anfordern; stattdessen die Vorgänger der Verhandlungstipps "
 "anzeigen"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "Schreibe den Commit-Graph nach \"fetch\""
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "akzeptiere Refspecs von der Standard-Eingabe"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Konnte Remote-Referenz von HEAD nicht finden."
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "konnte Remote-Referenz von HEAD nicht finden"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "in einem anderen Arbeitsverzeichnis ausgecheckt"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "würde bestehende Tags verändern"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
 "Normalerweise zeigt 'fetch' welche Branches eine erzwungene Aktualisierung\n"
 "hatten, aber diese Überprüfung wurde deaktiviert. Um diese wieder zu\n"
 "aktivieren, nutzen Sie die Option '--show-forced-updates' oder führen\n"
 "Sie 'git config fetch.showForcedUpdates true' aus."
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
 "Es brauchte %.2f Sekunden, um erzwungene Aktualisierungen zu überprüfen.\n"
 "Sie können die Option '--no-show-forced-updates' benutzen oder\n"
 "'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
 "zu umgehen.\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 "%s zurückgewiesen, da Root-Commits von Repositories mit unvollständiger\n"
 "Historie (shallow) nicht aktualisiert werden dürfen."
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15728,148 +15661,147 @@ 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:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, 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."
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "Anfordern in Branch '%s' verweigert, ausgecheckt in '%s'"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+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:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
 msgstr "Option \"%s\" wird ignoriert für %s\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "das Objekt %s ist nicht vorhanden"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
-msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
+msgstr "mehrere Branches erkannt, inkompatibel mit --set-upstream"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"konnte keinen Upstream-Branch von HEAD auf '%s' von '%s' setzen, da dieser "
+"auf keinen Branch zeigt."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
-msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch."
+msgstr "setze keinen Upstream für einen entfernten Remote-Tracking-Branch"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
-msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories."
+msgstr "setze keinen Upstream für einen Tag eines Remote-Repositories"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
-msgstr "Unbekannter Branch-Typ"
+msgstr "unbekannter Branch-Typ"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
-"Keinen Quell-Branch gefunden.\n"
-"Sie müssen bei der Option --set-upstream genau einen Branch angeben."
+"kein Quell-Branch gefunden;\n"
+"Sie müssen bei der Option --set-upstream genau einen Branch angeben"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
-msgstr "Konnte nicht von %s anfordern"
+msgid "could not fetch %s"
+msgstr "konnte %s nicht anfordern"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
-"Kein Remote-Repository angegeben. Bitte geben Sie entweder eine URL\n"
+"kein Remote-Repository angegeben; bitte geben Sie entweder eine URL\n"
 "oder den Namen des Remote-Repositories an, von welchem neue\n"
-"Commits angefordert werden sollen."
+"Commits angefordert werden sollen"
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Sie müssen den Namen des Tags angeben."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "Sie müssen den Namen des Tags angeben"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only benötigt einen oder mehrere --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen und --depth schließen sich gegenseitig aus"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "negative Tiefe wird von --deepen nicht unterstützt"
 
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 "--unshallow kann nicht in einem Repository mit vollständiger Historie "
 "verwendet werden"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kann nicht mit Refspecs verwendet werden"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
 msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2081
+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"
-"von Refspecs verwendet werden."
+"das Abrufen einer Gruppe und die Angabe einer Pfadspezifikation ist nicht "
+"sinnvoll"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "Remote wird benötigt, wenn --negotiate-only benutzt wird"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokoll unterstützt --negotiate-only nicht, beende."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "Protokoll unterstützt --negotiate-only nicht, beende"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15877,13 +15809,13 @@ msgstr ""
 "--filter kann nur mit den Remote-Repositories verwendet werden,\n"
 "die in extensions.partialclone konfiguriert sind"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 "--atomic kann nur verwendet werden, wenn nur von einem Remote-Repository "
 "abgefragt wird"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 "--stdin kann nur verwendet werden, wenn nur von einem Remote-Repository "
@@ -15896,23 +15828,27 @@ msgstr ""
 "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
 "<Datei>]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 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:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "Alias für --log (veraltet)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "Text"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "<Text> als Beschreibungsanfang verwenden"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "<Name> statt echten Ziel-Branch verwenden"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "Datei zum Einlesen"
 
@@ -15932,47 +15868,47 @@ msgstr "git for-each-ref [--merged [<Commit>]] [--no-merged [<Commit>]]"
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<Objekt>]] [--no-contains [<Commit>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "Platzhalter als Shell-String formatieren"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "Platzhalter als Perl-String formatieren"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "Platzhalter als Python-String formatieren"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "Platzhalter als Tcl-String formatieren"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "nur <n> passende Referenzen anzeigen"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "Formatfarben beachten"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "nur zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "nur nicht zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
@@ -16123,124 +16059,124 @@ msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: Objekt hat einen unbekannten Typ '%s': %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: Objekt konnte nicht geparst werden: %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "Ungültige SHA1-Datei: %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Prüfe Objekt-Verzeichnis"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Prüfe %s Verknüpfung"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s zeigt auf etwas seltsames (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: losgelöster HEAD zeigt auf nichts"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Prüfe Cache-Verzeichnis"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-tree in Cache-Verzeichnis"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: Objekt nicht vorhanden"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
@@ -16259,17 +16195,12 @@ msgstr "Konnte '%s' nicht lesen: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "Kann '%s' nicht lesen"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "kann '%s' nicht lesen"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16285,58 +16216,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "unreferenzierte Objekte entfernen"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 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:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, 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:609
+#: builtin/gc.c:610
 #, 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:610
+#: builtin/gc.c:611
 #, 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:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16344,216 +16275,216 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
 "diese zu löschen."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule ist nicht erlaubt"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "nicht erkanntes --schedule Argument '%s'"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "Fehler beim Schreiben des Commit-Graph"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "Vorabruf der Remote-Repositories fehlgeschlagen"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "konnte 'git pack-objects' Prozess nicht starten"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "konnte 'git pack-objects' Prozess nicht beenden"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "Fehler beim Schreiben des multi-pack-index"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "Ãœberspringen der Aufgabe 'incremental-repack', weil core.multiPackIndex "
 "deaktiviert ist"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "Aufgabe '%s' fehlgeschlagen"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' ist keine gültige Aufgabe"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "Häufigkeit"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "Aufgabe"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "eine bestimmte Aufgabe ausführen"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr ""
 "nutzen Sie höchstens eine der Optionen --auto oder --schedule=<Häufigkeit>"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "Fehler beim Ausführen von 'git config'"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "Fehler beim Erweitern des Pfades '%s'"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "konnte launchctl nicht starten"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "Fehler beim Laden des Services %s"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "Fehler beim Erstellen der temporären XML-Datei"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "Fehler beim Starten von schtasks"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "Fehler beim Ausführen von 'crontab -l'; Ihr System unterstützt eventuell "
 "'cron' nicht"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "Fehler beim Ausführen von 'crontab'; Ihr System unterstützt eventuell 'cron' "
 "nicht"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' abgebrochen"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "Fehler beim Starten von systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "Fehler beim Ausführen von systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "Fehler beim Löschen von '%s'"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "nicht erkanntes --scheduler Argument '%s'"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "weder Timer von systemd, noch crontab ist verfügbar"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s Scheduler ist nicht verfügbar"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "ein anderer Prozess plant die Hintergrundwartung"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<Scheduler>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "Scheduler"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "Scheduler, um \"git maintenance run\" auzuführen"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <Unterbefehl> [<Optionen>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "ungültiger Unterbefehl: %s"
@@ -16595,7 +16526,7 @@ msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
 #: builtin/grep.c:752
 #, c-format
 msgid "switch `%c' expects a numerical value"
-msgstr "Schalter '%c' erwartet einen numerischen Wert"
+msgstr "Schalter `%c' erwartet einen numerischen Wert"
 
 #: builtin/grep.c:851
 msgid "search in index instead of in the work tree"
@@ -16931,25 +16862,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "nicht erkanntes Hilfeformat: %s"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Konnte emacsclient nicht starten."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Konnte Version des emacsclient nicht parsen."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "Fehler beim Ausführen von '%s'"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16958,7 +16889,7 @@ msgstr ""
 "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16967,39 +16898,39 @@ msgstr ""
 "'%s': Programm für unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': unbekannter Handbuch-Betrachter."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
-msgstr "Für '%s' wurde der Alias '%s' angelegt."
+msgstr "'%s' ist ein Alias für '%s'"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "Ungültiger alias.%s String: %s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "diese Option akzeptiert keine anderen Argumente"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' für weitere Informationen"
 
@@ -17267,18 +17198,10 @@ msgstr "%s ist ungültig"
 msgid "unknown hash algorithm '%s'"
 msgstr "unbekannter Hash-Algorithmus '%s'"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kann nicht ohne --stdin verwendet werden"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kann nicht mit --stdin verwendet werden"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
@@ -17404,10 +17327,6 @@ msgstr "Hash"
 msgid "specify the hash algorithm to use"
 msgstr "den zu verwendenen Hash-Algorithmus angeben"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir und --bare schließen sich gegenseitig aus"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17541,86 +17460,86 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<Bereich>:<Datei> kann nicht mit Pfadspezifikation verwendet werden"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr ""
 "%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -17631,295 +17550,278 @@ 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:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "<Dateiendung> statt '.patch' verwenden"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "die Nummerierung der Patches bei <n> statt bei 1 beginnen"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "Reroll-Anzahl"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "maximale Länge des Dateinamens für die Ausgabe"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "[RFC PATCH] statt [PATCH] verwenden"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "nutze [<Präfix>] statt [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 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:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 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:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "Forschrittsanzeige während der Erzeugung der Patches"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n und -k schließen sich gegenseitig aus"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only kann nicht verwendet werden"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status kann nicht verwendet werden"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check kann nicht verwendet werden"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"--stdout, --output und --output-directory schließen sich gegenseitig aus"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff gegen v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor erfordert --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-Diff:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-Diff gegen v%d:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Erzeuge Patches"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17927,123 +17829,127 @@ msgstr ""
 "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
 "manuell an.\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<Optionen>] [<Datei>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "Pfade durch NUL-Zeichen trennen"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "den Dateistatus mit Tags anzeigen"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "entfernte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "geänderte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "sonstige Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "ignorierte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 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:636
+#: builtin/ls-files.c:639
 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:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "Zeilenenden von Dateien anzeigen"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "keine leeren Verzeichnisse anzeigen"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' Informationen anzeigen"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "Dateien auslassen, die einem Muster entsprechen"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "Ausschlussmuster aus <Datei> lesen"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "Ausgabe relativ zum Projektverzeichnis"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "Rekursion in Submodulen durchführen"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 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:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "Commit-Referenz"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 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:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "Ausgaben zur Fehlersuche anzeigen"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "doppelte Einträge unterdrücken"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "zeige partielle Verzeichnisse, wenn ein partieller Index vorhanden ist"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -18241,26 +18147,30 @@ msgid "use a diff3 based merge"
 msgstr "einen diff3 basierten Merge verwenden"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "einen eifrigen diff3 basierten Merge verwenden"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "bei Konflikten unsere Variante verwenden"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "bei Konflikten ihre Variante verwenden"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "bei Konflikten eine gemeinsame Variante verwenden"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "keine Warnung bei Konflikten"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
 
@@ -18299,182 +18209,186 @@ msgstr "Führe %s mit %s zusammen\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<Optionen>] [<Commit>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
-msgstr "Schalter 'm' erfordert einen Wert."
+msgstr "Schalter `m' erfordert einen Wert."
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "Option `%s' erfordert einen Wert."
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 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:260 builtin/pull.c:137
+#: builtin/merge.c:261 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:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 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:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "einen einzelnen Commit erzeugen statt einen Merge durchzuführen"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 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:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "Strategie"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 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:291
+msgid "use <name> instead of the real target"
+msgstr "<Name> statt echtem Ziel verwenden"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "Hooks pre-merge-commit und commit-msg umgehen"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Bereits auf dem neuesten Stand. (nichts für Squash-Merge vorhanden)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "unbekannte Strategie-Option: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, 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:829
+#: builtin/merge.c:831
 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"
@@ -18485,11 +18399,11 @@ msgstr ""
 "Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18498,75 +18412,75 @@ msgstr ""
 "Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
 "und eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, 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:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 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:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, 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:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit erwartet keine Argumente"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18574,7 +18488,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:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18582,87 +18496,79 @@ 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:1386
+#: builtin/merge.c:1389
 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:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Sie können --squash nicht mit --commit kombinieren."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 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:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 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:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "verweigere den Merge von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "Benutze die Strategie %s, um die Auflösung per Hand vorzubereiten.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18706,7 +18612,7 @@ msgstr ""
 msgid "tag on stdin did not refer to a valid object"
 msgstr "Tag von der Standard-Eingabe verweiste nicht auf gültiges Objekt"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "konnte Tag-Datei nicht schreiben"
 
@@ -18772,7 +18678,7 @@ msgstr "Multipack-Index schreiben, der nur die gegebenen Indexe enthält"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "Referenzen-Snapshot, um Bitmap-Commits auszuwählen"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18874,52 +18780,52 @@ msgstr "%s, Quelle=%s, Ziel=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<Optionen>] <Commit>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<Optionen>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<Optionen>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "nur Tags verwenden, um die Commits zu benennen"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "ignoriere Referenzen die <Muster> entsprechen"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "von der Standard-Eingabe lesen"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
 
@@ -19039,26 +18945,26 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "konnte 'show' für Objekt '%s' nicht starten"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "Konnte Ausgabe von 'show' nicht lesen."
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "konnte 'show' für Objekt '%s' nicht abschließen"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 "Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F."
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "Konnte Notiz-Objekt nicht schreiben"
 
@@ -19067,7 +18973,7 @@ 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:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
@@ -19111,8 +19017,8 @@ msgstr ""
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "Zu viele Argumente."
 
@@ -19159,7 +19065,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Überschreibe existierende Notizen für Objekt %s\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Entferne Notiz für Objekt %s\n"
@@ -19285,18 +19191,18 @@ msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
 msgid "unknown -s/--strategy: %s"
 msgstr "Unbekannter Wert für -s/--strategy: %s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, 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:874
+#: builtin/notes.c:878
 #, 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:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19308,41 +19214,41 @@ msgstr ""
 "commit',\n"
 "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objekt %s hat keine Notiz\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 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:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "gelöschte Notizen melden"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "Notiz-Referenz"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
@@ -19759,10 +19665,6 @@ msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 "--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "Kann --filter nicht ohne --stdout benutzen."
@@ -19780,7 +19682,7 @@ msgstr ""
 msgid "Enumerating objects"
 msgstr "Objekte aufzählen"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19824,21 +19726,21 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "gelöschte Objekte melden"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "Objekte älter als <Zeit> verfallen lassen"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 "Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten "
 "Remote-Repositories einschränken"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 
@@ -19871,7 +19773,7 @@ msgstr "Vorspulen erlauben"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "Benutzung der pre-merge-commit und commit-msg Hooks kontrollieren"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "automatischer Stash/Stash-Pop davor und danach"
 
@@ -19951,6 +19853,7 @@ msgid "<remote>"
 msgstr "<Remote-Repository>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<Branch>"
 
@@ -19985,13 +19888,13 @@ msgstr "Konnte nicht auf Commit '%s' zugreifen."
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -20006,7 +19909,7 @@ msgstr ""
 "Sie können dies tun, indem Sie einen der folgenden Befehle vor dem\n"
 "nächsten Pull ausführen:\n"
 "\n"
-"  git config pull.rebase false  # Merge (Standard-Strategie)\n"
+"  git config pull.rebase false  # Merge\n"
 "  git config pull.rebase true   # Rebase\n"
 "  git config pull.ff only       # ausschließlich Vorspulen\n"
 "\n"
@@ -20015,21 +19918,21 @@ msgstr ""
 "Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n"
 "um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 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:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20039,7 +19942,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20056,25 +19959,25 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Kann nicht zu mehreren Branches vorspulen."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr ""
 "Es muss angegeben werden, wie mit abweichenden Branches umgegangen werden "
 "sollen."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -20265,7 +20168,7 @@ msgstr "Push nach %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "Repository"
 
@@ -20338,10 +20241,6 @@ msgstr "signiert \"push\" mit GPG"
 msgid "request atomic transaction on remote side"
 msgstr "Referenzen atomar versenden"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kann nur mit Referenzen verwendet werden"
@@ -20373,26 +20272,14 @@ msgstr ""
 "\n"
 "    git push <Name>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all und --tags sind inkompatibel"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror und --tags sind inkompatibel"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all und --mirror sind inkompatibel"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
@@ -20624,7 +20511,7 @@ msgid ""
 "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
 "\"."
 msgstr ""
-"nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und "
+"nicht erkannter leerer Typ '%s'; gültige Werte sind \"drop\", \"keep\", und "
 "\"ask\"."
 
 #: builtin/rebase.c:943
@@ -20824,18 +20711,6 @@ msgstr "'git am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges wurde durch --rebase-merges ersetzt"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
@@ -20902,10 +20777,10 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy erfordert --merge oder --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
 msgstr ""
-"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert "
-"werden."
+"Optionen für \"am\" und Optionen für \"merge\" können nicht gemeinsam "
+"verwendet werden"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20946,7 +20821,7 @@ msgid "no such branch/commit '%s'"
 msgstr "Branch/Commit '%s' nicht gefunden"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
@@ -21016,7 +20891,7 @@ msgstr "Spule %s vor zu %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -21048,7 +20923,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -21069,13 +20944,13 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Sie müssen ein Repository angeben."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "Sie müssen ein Verzeichnis angeben"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -21099,41 +20974,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <Referenz>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markiere nicht erreichbare Objekte..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s zeigt auf nichts!"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "Kein Reflog zum Löschen angegeben."
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "Kein Reflog: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "Kein Reflog für '%s'."
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "Ungültiges Format für Referenzen: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -21224,6 +21099,11 @@ msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
 msgid "Updating %s"
 msgstr "Aktualisiere %s"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Konnte nicht von %s anfordern"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21684,155 +21564,147 @@ msgstr ""
 "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
 "Remote-Repositories nicht starten."
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
 "Remote-Repositories nicht abschließen."
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "konnte Index für %s nicht öffnen"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr ""
 "Paket %s zu groß, um es bei der geometrischen Progression zu berücksichtigen"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "Paket %s zu groß zum Aufrollen"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "konnte temporäre Datei '%s' nicht zum Schreiben öffnen"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "konnte temporäre Referenzen-Snapshot-Datei nicht schließen"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "--no-reuse-delta an git-pack-objects übergeben"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "--no-reuse-object an git-pack-objects übergeben"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausführen"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects übergeben"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands an git-pack-objects übergeben"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "Datumsangabe"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "Größe des Fensters für die Delta-Kompression"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "gleiches wie oben, aber die Speichergröße statt der Anzahl der Einträge "
 "limitieren"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "maximale Anzahl von Threads limitieren"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "maximale Größe für jede Paketdatei"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "dieses Paket nicht neu packen"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "eine geometrische Progression mit Faktor <N> finden"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "ein Multipack-Index des resultierenden Pakets schreiben"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable und -A sind inkompatibel"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric ist inkompatibel mit -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Nichts Neues zum Packen."
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "benötigte Datei fehlt: %s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "konnte nicht löschen: %s"
@@ -21916,67 +21788,61 @@ msgstr "cat-file meldete Fehler"
 msgid "unable to open %s for reading"
 msgstr "konnte '%s' nicht zum Lesen öffnen"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "konnte mktree nicht ausführen"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "konnte nicht von mktree lesen"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree meldete Fehler"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree lieferte keinen Objektnamen zurück"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "kann fstat auf %s nicht ausführen"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "konnte Objekt nicht in Datenbank schreiben"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "kein gültiger Objektname: '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "konnte Objektart von %s nicht bestimmten"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "bearbeiten von Objektdatei fehlgeschlagen"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "neues Objekt ist dasselbe wie das alte: '%s'"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "konnte %s nicht als Commit parsen"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ungültiger Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "fehlerhafter Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21985,31 +21851,31 @@ msgstr ""
 "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
 "wird; benutzen Sie --edit statt --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "der originale Commit '%s' hat eine GPG-Signatur"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "die Signatur wird in dem Ersetzungs-Commit entfernt!"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "konnte Ersetzungs-Commit für '%s' nicht schreiben"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "neuer Commit ist derselbe wie der alte: '%s'"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -22018,71 +21884,71 @@ msgstr ""
 "konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "ersetzende Referenzen auflisten"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "ersetzende Referenzen löschen"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "existierendes Objekt bearbeiten"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "Eltern-Commits eines Commits ändern"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "die Referenz ersetzen, wenn sie existiert"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "das angegebene Format benutzen"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format kann nicht beim Auflisten verwendet werden"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw macht nur mit --edit Sinn"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d benötigt mindestens ein Argument"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "Ungültige Anzahl von Argumenten"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e benötigt genau ein Argument"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g benötigt mindestens ein Argument"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file erwartet keine Argumente"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "Mit -l kann nur ein Muster angegeben werden"
 
@@ -22103,134 +21969,126 @@ msgstr "'git rerere forget' ohne Pfade ist veraltet"
 msgid "unable to generate diff for '%s'"
 msgstr "konnte kein Diff für '%s' generieren"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<Commit-"
 "Referenz>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "zusammenführen"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gültigen HEAD."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, 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:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, nur Fehler melden"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 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:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, 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:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 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:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, 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:398
-msgid "-N can only be used with --mixed"
-msgstr "-N kann nur mit --mixed benutzt werden"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -22244,20 +22102,15 @@ msgstr ""
 "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
 "auf \"true\", um das zum Standard zu machen.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-"--exclude-promisor-objects und --missing können nicht kombiniert werden."
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "Das Filtern von Objekten erfordert --objects."
@@ -22267,8 +22120,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list unterstützt keine Anzeige von Notizen"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "markiertes Zählen ist inkompatibel mit der Option --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "markiertes Zählen und '%s' können nicht gemeinsam verwendet werden"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22717,13 +22571,6 @@ msgstr "<n>[,<Basis>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-"
-"base"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "keine Branches angegeben, und HEAD ist ungültig"
@@ -22744,19 +22591,19 @@ msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden."
 msgid "no such ref %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "Kann nicht mehr als %d Commit behandeln."
 msgstr[1] "Kann nicht mehr als %d Commits behandeln."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' ist keine gültige Referenz."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "kann Commit %s (%s) nicht finden"
@@ -22825,13 +22672,17 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "dieses Arbeitsverzeichnis ist nicht partiell"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout "
 "existiert eventuell nicht)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22840,79 +22691,104 @@ msgstr ""
 "Verzeichnis '%s' enthält unversionierte Dateien, aber ist nicht innerhalb "
 "des partiellen Checkouts im Cone-Modus"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "Fehler beim Löschen des Verzeichnisses '%s'"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr ""
 "Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen "
 "Checkouts"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 "Repository-Format konnte nicht erweitert werden, um worktreeConfig zu "
 "aktivieren"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "initialisiere den partiellen Checkout im Cone-Modus"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "die Nutzung des Sparse-Index umschalten"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "Verändern der Konfiguration für Sparse-Index fehlgeschlagen"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "Fehler beim Öffnen von '%s'"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "konnte Pfad '%s' nicht normalisieren"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"existierenden Muster des partiellen Checkouts benutzen nicht den Cone-Modus"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <Muster>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "Muster von der Standard-Eingabe lesen"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "kein partieller Checkout zum Hinzufügen"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<Muster>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"muss sich in einem partiellen Checkout befinden, um Sparsity-Muster erneut "
+"anwenden zu können"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
 
@@ -22938,22 +22814,26 @@ msgstr "git stash branch <Branch> [<Stash>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
 "          [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
 "          [--] [<Pfadspezifikation>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<Nachricht>]"
 
 #: builtin/stash.c:55
@@ -23047,143 +22927,160 @@ msgstr "Führe %s mit %s zusammen"
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "Versuche Index wiederherzustellen."
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) gelöscht"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Konnte Stash-Eintrag nicht löschen"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' ist keine Stash-Referenz"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
 "benötigen."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "Parsen der Tree-Objekte fehlgeschlagen"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "Entpacken der Tree-Objekte fehlgeschlagen"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "nur unversionierte Dateien im Stash anzeigen"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kann nicht %s mit %s aktualisieren."
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "Stash-Beschreibung"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" erwartet ein Argument <Commit>"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Keine Änderungen im Index"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "Keine Änderungen ausgewählt"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Kann den aktuellen Zustand des Index nicht speichern"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 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"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Kann nicht gleichzeitig --staged und --include-untracked oder --all verwenden"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Haben Sie vielleicht 'git add' vergessen?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Keine lokalen Änderungen zum Speichern"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "behalte Index"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "nur Änderungen stashen, die zum Commit vorgemerkt sind"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "Stash in Patch-Modus"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "weniger Ausgaben"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "ignorierte Dateien einbeziehen"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -23209,7 +23106,7 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollständiger Referenzname erwartet, %s erhalten"
@@ -23232,7 +23129,7 @@ msgstr ""
 "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
 "Repository sein eigenes verbindliches Upstream-Repository ist."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
@@ -23331,7 +23228,7 @@ msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen."
 msgid "failed to recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul '%s'."
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "Ausgabe des Submodul-Status unterdrücken"
 
@@ -23401,10 +23298,6 @@ msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
 msgid "could not fetch a revision for HEAD"
 msgstr "konnte keinen Commit für HEAD holen"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached und --files schließen sich gegenseitig aus"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -23433,17 +23326,16 @@ msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis\n"
-"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
-"löschen möchten)"
+"Arbeitsverzeichnis von Submodul in '%s' enthält ein .git-Verzeichnis. Durch "
+"die Nutzung von \"absorbgitdirs\" wird dieses durch eine .git-Datei ersetzt."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23452,49 +23344,49 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
 "verwenden Sie '-f', um diese zu verwerfen."
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Verzeichnis '%s' bereinigt.\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen."
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
 "vorliegen"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "alle Submodule austragen"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n"
 "möchten."
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -23507,69 +23399,69 @@ msgstr ""
 "submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
 "'--reference-if-able' statt '--reference'."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, 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:1746
+#: builtin/submodule--helper.c:1747
 #, 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:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 "Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n"
 "verweigert."
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "Verzeichnis ist nicht leer: '%s'"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "Fortschrittsanzeige beim Klonen erzwingen"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23579,94 +23471,94 @@ msgstr ""
 "<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
 "<URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'."
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert."
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Überspringe nicht zusammengeführtes Submodul %s"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ãœberspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Konnte '%s' nicht im Submodul-Pfad '%s' auschecken"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Rebase von '%s' in Submodul-Pfad '%s' nicht möglich"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Merge von '%s' in Submodul-Pfad '%s' nicht möglich"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "Ausführung von '%s %s' in Submodul-Pfad '%s' fehlgeschlagen"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Submodul-Pfad '%s': '%s' ausgecheckt\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Submodul-Pfad '%s': Rebase in '%s'\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Submodul-Pfad '%s': zusammengeführt in '%s'\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Submodul-Pfad '%s': '%s %s'\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
-"Konnte \"fetch\" in Submodul-Pfad '%s' nicht ausführen. Versuche %s direkt "
+"Konnte \"fetch\" in Submodul-Pfad '%s' nicht ausführen; versuche %s direkt "
 "anzufordern:"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23675,91 +23567,91 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '%s' ausgeführt, aber enthielt nicht %s. Direktes "
 "Anfordern dieses Commits ist fehlgeschlagen."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "Pfad zum Arbeitsverzeichnis"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout oder none"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten "
 "bei der angegebenen Anzahl von Commits"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "Parallele Ausführungen"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 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:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "Fehlerhafter Wert für update Parameter"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr "Ausgaben bei Aktualisierung durch Rebase oder Merge unterdrücken"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "Checkout-Aktualisierungen erzwingen"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "keine neuen Objekte von Remote abrufen"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr ""
 "überschreibt den Aktualisierungsmodus, falls es sich bei dem Repository um "
 "einen neuen Klon handelt"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "Tiefe des Abrufens mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "SHA1 vom übergeordneten Projekt erwartet"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "SHA1 vom HEAD des Submoduls"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<Optionen>] <Pfad>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23768,98 +23660,94 @@ 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten."
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchführen"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "Konfiguration in der .gitmodules-Datei entfernen"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <name> [<Wert>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <Name>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
 "Arbeitsverzeichnis befindet."
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "Standard-Tracking-Branch auf master setzen"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "Standard-Tracking-Branch setzen"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) [<Pfad>]"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <Branch> <Pfad>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "Option --branch oder --default erforderlich"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch und --default schließen sich gegenseitig aus"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "Füge existierendes Repository in '%s' dem Index hinzu\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' existiert bereits und ist kein gültiges Git-Repository"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr ""
 "Ein Git-Verzeichnis für '%s' wurde lokal gefunden mit den Remote-"
 "Repositories:\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23877,54 +23765,54 @@ msgstr ""
 "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
 "wählen Sie einen anderen Namen mit der Option '--name'."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '%s'\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "kann Submodul '%s' nicht auschecken"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Hinzufügen von Submodul '%s' fehlgeschlagen"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Fehler beim Registrieren von Submodul '%s'"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' existiert bereits im Index"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' existiert bereits im Index und ist kein Submodul"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "Branch des Repositories zum Hinzufügen als Submodul"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "das Hinzufügen eines andernfalls ignorierten Submodul-Pfads erlauben"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "nur Fehlermeldungen ausgeben"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "die Objekte von Referenz-Repositories ausleihen"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
@@ -23932,32 +23820,32 @@ msgstr ""
 "legt den Namen des Submoduls auf die angegebene Zeichenkette fest, statt "
 "standardmäßig dessen Pfad zu nehmen"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<Optionen>] [--] <Repository> [<Pfad>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
 "benutzt werden."
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "repo URL: '%s' muss absolut sein oder mit ./|../ beginnen"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' ist kein gültiger Submodul-Name"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstützt kein --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -24057,11 +23945,11 @@ msgstr ""
 "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
 "selbst entfernen wenn Sie möchten.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "konnte Tag nicht signieren"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24075,15 +23963,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "ungültiger Objekt-Typ"
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
@@ -24164,45 +24052,22 @@ msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column und -n sind inkompatibel"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "die Option -n ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at ist nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged und --no-merged sind nur im Listenmodus erlaubt"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "nur eine -F oder -m Option ist erlaubt."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "die Option '%s' ist nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -24632,8 +24497,8 @@ msgid ""
 "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' ist ein fehlendes, aber gesperrtes Arbeitsverzeichnis;\n"
-"Benutzen Sie '%s -f -f' zum Ãœberschreiben, oder 'unlock' und 'prune'\n"
-"oder 'remove' zum Löschen."
+"benutzen Sie '%s -f -f' zum Ãœberschreiben, oder 'unlock' und 'prune'\n"
+"oder 'remove' zum Löschen"
 
 #: builtin/worktree.c:236
 #, c-format
@@ -24642,8 +24507,8 @@ msgid ""
 "use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' ist ein fehlendes, aber bereits registriertes Arbeitsverzeichnis;\n"
-"Benutzen Sie '%s -f' zum Ãœberschreiben, oder 'prune' oder 'remove' zum\n"
-"Löschen."
+"benutzen Sie '%s -f' zum Ãœberschreiben, oder 'prune' oder 'remove' zum\n"
+"Löschen"
 
 #: builtin/worktree.c:287
 #, c-format
@@ -24654,192 +24519,180 @@ msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 msgid "initializing"
 msgstr "initialisiere"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 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:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "Sperrgrund"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
-"versuchen, eine Ãœbereinstimmung des Branch-Namens mit einem\n"
+"versuchen, eine Ãœbereinstimmung des Branchnamens mit einem\n"
 "Remote-Tracking-Branch herzustellen"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason benötigt --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "mit --lock hinzugefügt"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "'prunable'-Anmerkung zu Arbeitsverzeichnissen älter als <Zeit> hinzufügen"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose und --porcelain schließen sich gegenseitig aus"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' ist kein Arbeitsverzeichnis"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
 "entfernt werden."
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
 "gesperrt ist"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
-msgstr "Konnte Zielname aus '%s' nicht bestimmen."
+msgstr "konnte Zielname aus '%s' nicht bestimmen"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 "Kann kein gesperrtes Arbeitsverzeichnis verschieben, Sperrgrund: %s\n"
-"Benutzen Sie 'move -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
-"das Arbeitsverzeichnis."
+"benutzen Sie 'move -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
+"das Arbeitsverzeichnis"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
-"Kann kein gesperrtes Arbeitsverzeichnis verschieben.\n"
-"Benutzen Sie 'move -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
-"das Arbeitsverzeichnis."
+"kann kein gesperrtes Arbeitsverzeichnis verschieben;\n"
+"benutzen Sie 'move -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
+"das Arbeitsverzeichnis"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "Fehler beim Verschieben von '%s' nach '%s'"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force "
 "zum Löschen"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
 "ist"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24849,26 +24702,26 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
-"Kann kein gesperrtes Arbeitsverzeichnis löschen.\n"
-"Benutzen Sie 'remove -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
-"das Arbeitsverzeichnis."
+"kann kein gesperrtes Arbeitsverzeichnis löschen;\n"
+"benutzen Sie 'remove -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
+"das Arbeitsverzeichnis"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "repariere: %s: %s"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "Fehler: %s: %s"
@@ -24920,21 +24773,16 @@ msgstr ""
 "Konzept zu erfahren.\n"
 "Benutzen Sie 'git help git' für einen Überblick des Systems."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
+msgid "no directory given for '%s' option\n"
+msgstr "kein Verzeichnis für Option '%s' angegeben\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "Kein Namespace für --namespace angegeben.\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24950,11 +24798,6 @@ msgstr "-c erwartet einen Konfigurationsstring.\n"
 msgid "no config key given for --config-env\n"
 msgstr "kein Konfigurationsschlüssel für --config-env angegeben\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "Kein Verzeichnis für -C angegeben.\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -24984,29 +24827,29 @@ msgstr "leerer Alias für %s"
 msgid "recursive alias: %s"
 msgstr "rekursiver Alias: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "Fehler beim Schließen der Standard-Ausgabe."
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "Kann %s nicht als eingebauten Befehl behandeln."
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -25015,33 +24858,25 @@ msgstr ""
 "Verwendung: %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "kein Git-Repository"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile benötigt --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args kann nur mit --packfile benutzt werden"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "unbehandelte Optionen"
@@ -25261,17 +25096,17 @@ msgstr "RPC fehlgeschlagen; %s"
 
 #: remote-curl.c:873
 msgid "cannot handle pushes this big"
-msgstr "Kann solche großen Übertragungen nicht verarbeiten."
+msgstr "kann solche großen Übertragungen nicht verarbeiten"
 
 #: remote-curl.c:986
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
-msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
+msgstr "kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
 
 #: remote-curl.c:990
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
-msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
+msgstr "kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
 
 #: remote-curl.c:1040
 #, c-format
@@ -25293,7 +25128,7 @@ msgstr "\"fetch\" fehlgeschlagen."
 
 #: remote-curl.c:1192
 msgid "cannot fetch by sha1 over smart http"
-msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
+msgstr "kann SHA-1 nicht über Smart-HTTP anfordern"
 
 #: remote-curl.c:1236 remote-curl.c:1242
 #, c-format
@@ -25326,6 +25161,177 @@ msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "Arbeitsverzeichnis benötigt"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "konnte Root-Verzeichnis für Eintragungen nicht finden"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "konnte nicht zu '%s' wechseln"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "konnte %s=%s nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "konnte log.excludeDecoration nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Skalare Eintragungen erfordern ein Arbeitsverzeichnis"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "externer HEAD ist kein Branch: '%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"Fehler beim Abfragen des Standard-Branchnamens vom Remote-Repository; nutze "
+"lokalen Standardwert"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "Fehler beim Abfragen des Standard-Branchnamens"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "Fehler beim Austragen des Repositories"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "Fehler beim Löschen des Eintragungs-Verzeichnisses"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "Branch, der nach dem Klonen ausgecheckt werden soll"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "vollständiges Arbeitsverzeichnis beim Klonen erstellen"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "lade nur Metadaten des Branches herunter, der ausgecheckt wird"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "konnte Name für Arbeitsverzeichnis nicht von '%s' ableiten"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "Verzeichnis '%s' existiert bereits"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "Fehler beim Abfragen des Default-Branches für '%s'"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "konnte Remote-Repository in '%s' nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "konnte '%s' nicht konfigurieren"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "partielles Klonen fehlgeschlagen; versuche vollständiges Klonen"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "konnte nicht für vollständiges Klonen konfigurieren"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` akzeptiert keine Argumente"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<Eintragung>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "alle registrierten Eintragungen neu konfigurieren"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <Eintragung>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all oder <Eintragung>, aber nicht beides"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "Git-Repository entfernt in '%s'"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <Aufgabe> [<Eintragung>]\n"
+"Aufgaben:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "Aufgabe nicht gefunden: '%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<Eintragung>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <Eintragung>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "Löschen des aktuellen Arbeitsverzeichnisses wurde verweigert"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "Git-Version einbeziehen"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "Build-Optionen von Git einbeziehen"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <Befehl> [<Optionen>]\n"
+"\n"
+"Befehle:\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "keine Compiler-Information verfügbar\n"
@@ -25350,38 +25356,38 @@ msgstr "Verfallsdatum"
 msgid "no-op (backward compatibility)"
 msgstr "Kein Effekt (Rückwärtskompatibilität)"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "erweiterte Ausgaben"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "weniger Ausgaben"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "Pfadspezifikation aus einer Datei lesen"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 "Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "Schüssel"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
@@ -25458,17 +25464,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "Name und E-Mail-Adresse von Kontakten anzeigen"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr ""
@@ -25675,425 +25681,425 @@ msgstr ""
 "Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "der Git-Repository-Browser"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Commit-Historie anzeigen"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr ""
 "Informationen über Dateien in dem Index und im Arbeitsverzeichnis anzeigen"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Referenzen in einem Remote-Repository auflisten"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Inhalte eines Tree-Objektes auflisten"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 "Patch und Urheberschaft von einer einzelnen E-Mail-Nachricht extrahieren"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "einfaches UNIX mbox Splitter-Programm"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Aufgaben ausführen, um Git-Repository-Daten zu optimieren"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "zwei oder mehr Entwicklungszweige zusammenführen"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "möglichst besten gemeinsamen Vorgänger-Commit für einen Merge finden"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "einen 3-Wege-Datei-Merge ausführen"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "einen Merge für zusammenzuführende Dateien ausführen"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "das Standard-Hilfsprogramm für die Verwendung mit git-merge-index"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "multi-pack-indexes schreiben und überprüfen"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "Erstellt ein Tag-Objekt mit zusätzlicher Validierung"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "multi-pack-indexes schreiben und überprüfen"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr ""
 "eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben "
 "oder umbenennen"
 
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "symbolische Namen für die gegebenen Commits finden"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Objekt-Notizen hinzufügen oder überprüfen"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "von Perforce Repositories importieren und nach diese senden"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "ein gepacktes Archiv von Objekten erstellen"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "redundante Paketdateien finden"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "eindeutige ID für einen Patch berechnen"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "alle nicht erreichbaren Objekte von der Objektdatenbank entfernen"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr ""
 "zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 "Objekte von einem externen Repository anfordern und sie mit einem anderen "
 "Repository oder einem lokalen Branch zusammenführen"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Patches aus quilt auf aktuellen Branch anwenden"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "zwei Commit-Bereiche vergleichen (zwei Versionen eines Branches)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Verzeichnisinformationen in den Index einlesen"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Empfangen was in das Repository übertragen wurde"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Reflog Informationen verwalten"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Menge von hinterlegten Repositories verwalten"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "ungepackte Objekte in einem Repository packen"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "eine Übersicht über ausstehende Änderungen generieren"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "aufgezeichnete Auflösung von Merge-Konflikten wiederverwenden"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "einige bestehende Commits rückgängig machen"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Parameter herauspicken und ändern"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "einige bestehende Commits rückgängig machen"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "eine Sammlung von Patches als E-Mails versenden"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Gits i18n-Konfigurationscode für Shell-Skripte"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Ausgabe von 'git log' zusammenfassen"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "verschiedene Arten von Objekten anzeigen"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Branches und ihre Commits ausgeben"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "gepackten Archiv-Index anzeigen"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Referenzen in einem lokales Repository auflisten"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Gits i18n-Konfigurationscode für Shell-Skripte"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Initialisiere und verändere den partiellen Checkout"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Dateiinhalte der Staging-Area hinzufügen"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Dateiinhalte der Staging-Area hinzufügen"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "nicht erforderlichen Whitespace entfernen"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 "Bidirektionale Operationen zwischen einem Subversion Repository und Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Branches wechseln"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "symbolische Referenzen lesen, ändern und löschen"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder "
 "verifizieren."
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Objekte von einem gepackten Archiv entpacken"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Archiv zurück zu git-archive senden"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Objekte gepackt zurück an git-fetch-pack senden"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "eine logische Variable von Git anzeigen"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "die GPG-Signatur von Commits prüfen"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "gepackte Git-Archivdateien validieren"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "die GPG-Signatur von Tags prüfen"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "mehrere Arbeitsverzeichnisse verwalten"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Tree-Objekt vom aktuellen Index erstellen"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Definition von Attributen pro Pfad"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Git Kommandozeilenschnittstelle und Konventionen"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "eine Git Anleitung für Entwickler"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Bereitstellung von Benutzernamen und Passwörtern für Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git für CVS Benutzer"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "Diff-Ausgabe optimieren"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 "ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Häufig gestellte Fragen über die Nutzung von Git"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "ein Git-Glossar"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "von Git verwendete Hooks"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "der Git-Repository-Browser"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Definition von Submodul-Eigenschaften"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Git Namensbereiche"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Git Repository Aufbau"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spezifikation von Commits und Bereichen für Git"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Einbinden eines Repositories in ein anderes"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "eine einführende Anleitung zu Git"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "eine einführende Anleitung zu Git: Teil zwei"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "eine einführende Anleitung zu Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git Web Interface (Web-Frontend für Git-Repositories)"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -26169,51 +26175,51 @@ msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 msgid "usage: $dashless $USAGE"
 msgstr "Verwendung: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n"
 "Arbeitsverzeichnisses."
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 "fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum "
 "Commit\n"
 "vorgemerkt sind."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 "Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 "Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n"
 "Änderungen."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses "
 "ausführen."
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
 
@@ -26296,7 +26302,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26312,7 +26318,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26326,7 +26332,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26340,7 +26346,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26357,7 +26363,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26374,7 +26380,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26389,7 +26395,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26403,7 +26409,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26417,7 +26423,7 @@ msgstr ""
 "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
 "d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26441,92 +26447,92 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Keine anderen Patch-Blöcke verbleibend\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ungültige Nummer: '%s'\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
 msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Kein vorheriger Patch-Block\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Kein folgender Patch-Block\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "In %d Patch-Block aufgeteilt.\n"
 msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26545,58 +26551,58 @@ msgstr ""
 "diff          - Unterschiede zwischen HEAD und Index anzeigen\n"
 "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "-- fehlt"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Unbekannter --patch Modus: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ungültiges Argument %s, erwarte --"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 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:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: Befehl '%s' mit Exit-Code %d beendet"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "Der Editor wurde unsauber beendet, breche alles ab."
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, 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:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' enthält die verfasste E-Mail.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26608,52 +26614,52 @@ msgstr ""
 "Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prüfung "
 "zu deaktivieren.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 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:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
-"'batch-size' und 'relogin' müssen gemeinsam angegeben werden (über "
+"`batch-size` und `relogin` müssen gemeinsam angegeben werden (über "
 "Kommandozeile\n"
 "oder Konfigurationsoption)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, 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:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26670,12 +26676,12 @@ msgstr ""
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
 "meinen.\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26685,17 +26691,17 @@ msgstr ""
 "Keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26710,27 +26716,27 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Fehler beim Öffnen von %s.final: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 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:935
+#: git-send-email.perl:971
 #, 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:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26738,11 +26744,11 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26756,22 +26762,22 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 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:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -26779,18 +26785,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:1126
+#: git-send-email.perl:1162
 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:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26819,117 +26825,117 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle "
 "[a]): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Server unterstützt kein STARTTLS! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS fehlgeschlagen! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 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:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, 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:1762
+#: git-send-email.perl:1798
 #, 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:1819
+#: git-send-email.perl:1855
 #, 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:1854
+#: git-send-email.perl:1890
 #, 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:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "Kann Nachricht nicht als 7bit versenden."
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "Ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26940,12 +26946,12 @@ msgstr ""
 "%s\n"
 "Warnung: Es wurden keine Patches gesendet\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "konnte %s nicht öffnen: %s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26954,13 +26960,13 @@ msgstr ""
 "fatal: %s:%d ist länger als 998 Zeichen\n"
 "Warnung: Es wurden keine Patches gesendet\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, 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:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
diff --git a/po/fr.po b/po/fr.po
index e950f87add..fc004019a3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -77,8 +77,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-10 22:00+0100\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
+"PO-Revision-Date: 2022-01-12 21:11+0100\n"
 "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -86,15 +86,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
-"X-Generator: Poedit 2.4.2\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Hein (%s) ?"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "impossible de lire l'index"
@@ -123,7 +123,7 @@ msgstr "Mise à jour"
 msgid "could not stage '%s'"
 msgstr "impossible d'indexer '%s'"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "impossible d'écrire l'index"
 
@@ -139,8 +139,8 @@ msgstr[1] "%d chemins mis à jour\n"
 msgid "note: %s is untracked now.\n"
 msgstr "note : %s n'est plus suivi à présent.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "échec de make_cache_entry pour le chemin '%s'"
@@ -181,21 +181,21 @@ msgstr[1] "%d chemins ajoutés\n"
 msgid "ignoring unmerged: %s"
 msgstr "fichier non-fusionné ignoré : %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Seuls des fichiers binaires ont changé.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Aucune modification.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Mise à jour par patch"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Réviser la différence"
 
@@ -266,11 +266,11 @@ msgstr "sélectionner un élément par son numéro"
 msgid "(empty) select nothing"
 msgstr "(vide) ne rien sélectionner"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Commandes ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Et maintenant"
 
@@ -282,13 +282,13 @@ msgstr "indexé"
 msgid "unstaged"
 msgstr "non-indexé"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "chemin"
@@ -297,27 +297,27 @@ msgstr "chemin"
 msgid "could not refresh index"
 msgstr "impossible de rafraîchir l'index"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Au revoir.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
@@ -344,22 +344,22 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
@@ -386,22 +386,22 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
@@ -428,22 +428,22 @@ msgstr ""
 "a - désindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas désindexer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
@@ -470,26 +470,26 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
@@ -516,23 +516,23 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -552,27 +552,27 @@ msgstr ""
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas éliminer cette section ni les suivantes de ce fichier\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
 "%s,?] ? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
 "%s,?] ? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -712,7 +712,7 @@ msgstr "'git apply --cached' a échoué"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -723,11 +723,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Les sections sélectionnées ne s'applique pas à l'index !"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Les appliquer quand même à l'arbre de travail ? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Rien n'a été appliqué.\n"
 
@@ -765,11 +765,11 @@ msgstr "Pas de section suivante"
 msgid "No other hunks to goto"
 msgstr "Aucune autre section à atteindre"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "aller à quelle section (<ret> pour voir plus) ? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "aller à quelle section ? "
 
@@ -789,7 +789,7 @@ msgstr[1] "Désolé, Seulement %d sections disponibles."
 msgid "No other hunks to search"
 msgstr "Aucune autre section à rechercher"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "rechercher la regex ? "
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
@@ -971,21 +971,33 @@ msgstr "option d'espace non reconnue '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "option d'ignorance d'espace non reconnue '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way hors d'un dépôt"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index hors d'un dépôt"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached hors d'un dépôt"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' hors d'un dépôt"
 
 #: apply.c:800
 #, c-format
@@ -1206,8 +1218,8 @@ msgstr "le patch a échoué : %s:%ld"
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "échec de la lecture de %s"
@@ -1217,392 +1229,390 @@ msgstr "échec de la lecture de %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a été renommé/supprimé"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas à l'index"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 "le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Application d'une fusion à 3 points…\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossible de lire le contenu actuel de '%s'"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Échec de l'application de la fusion à 3 points…\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliqué avec des conflits.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliqué proprement.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Retour à une application directe…\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "chemin invalide '%s'"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: apply.c:3998
+#: apply.c:4000
 #, 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:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, 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:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, 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:4141
+#: apply.c:4143
 #, 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:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s à l'index temporaire"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'écrire l'index temporaire dans %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: apply.c:4349
+#: apply.c:4351
 #, 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:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'élément de cache %s impossible"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "échec de l'écriture dans '%s'"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traité."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "entrée non reconnue"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s' :%s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, 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:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, 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:4973
+#: apply.c:4977
 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "num"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: apply.c:5028
+#: apply.c:5032
 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:5032
+#: apply.c:5036
 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:5034
+#: apply.c:5038
 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:5036
+#: apply.c:5040
 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:5038
+#: apply.c:5042
 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:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"
 
-#: apply.c:5051
+#: apply.c:5055
 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:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "action"
 
-#: apply.c:5058
+#: apply.c:5062
 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:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre à au moins une ligne de contexte"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "mode verbeux"
-
-#: apply.c:5076
+#: apply.c:5080
 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:5079
+#: apply.c:5083
 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:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "racine"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "ne pas renvoyer d'erreur pour les rustines vides"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1613,16 +1623,16 @@ msgstr "impossible de transmettre le blob %s en flux"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "impossible de démarrer le filtre '%s'"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "impossible de rediriger un descripteur"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "le filtre '%s' a retourné une erreur"
@@ -1666,19 +1676,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr "impossible de lire %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "impossible de lire '%s'"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "le chemin '%s' ne correspond à aucun fichier"
@@ -1720,7 +1724,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "préfixe"
 
@@ -1730,9 +1734,9 @@ msgstr "préfixer chaque chemin de fichier dans l'archive"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "fichier"
@@ -1762,7 +1766,7 @@ msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "dépôt"
 
@@ -1770,7 +1774,7 @@ msgstr "dépôt"
 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:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "commande"
@@ -1783,19 +1787,20 @@ msgstr "chemin vers la commande distante git-upload-archive"
 msgid "Unexpected option --remote"
 msgstr "Option --remote inattendue"
 
-#: archive.c:580
-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:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "l'option '%s' requiert '%s'"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Option --output inattendue"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-"Les options --add-file et --remote ne peuvent pas être utilisées ensemble"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1904,7 +1909,7 @@ msgstr "une révision %s est nécessaire"
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
@@ -1958,10 +1963,10 @@ msgstr ""
 "--reverse et --first-parent ensemble nécessitent la spécification d'un "
 "dernier commit"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1984,110 +1989,94 @@ msgstr "pas de chemin %s dans %s"
 msgid "cannot read blob %s for path %s"
 msgstr "impossible de lire le blob %s  pour le chemin %s"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n"
-"l'information de suivi distant en invoquant\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"impossible d'hériter la configuration de suivi de référence amont depuis "
+"plusieurs références quand un rebasage est demandé"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "La branche %s ne peut pas être sa propre branche amont."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "la branche %s ne peut pas être sa propre branche amont"
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-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."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant."
 
-#: branch.c:94
+#: branch.c:145
 #, c-format
-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'."
+msgid "branch '%s' set up to track '%s'."
+msgstr "la branche '%s' est paramétrée pour suivre '%s'."
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-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."
+msgid "branch '%s' set up to track:"
+msgstr "la branche '%s' est paramétrée pour suivre :"
 
-#: 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'."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "échec de l'écriture de la configuration de branche amont"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
-"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
-"rebasant."
+"\n"
+"Après correction de la cause de l'erreur, vous pouvez essayer\n"
+"de corriger l'information de suivi distant en invoquant :"
 
-#: branch.c:105
+#: branch.c:203
 #, 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 "asked to inherit tracking from '%s', but no remote is set"
+msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
-"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
-"rebasant."
+"héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion "
+"renseignée"
 
-#: branch.c:110
+#: branch.c:252
 #, 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'."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Échec de l'écriture de la configuration de branche amont"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "pas de suivi : information ambiguë pour la référence %s"
 
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Pas de suivi : information ambiguë pour la référence %s"
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' n'est pas un nom de branche valide"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-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:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Une branche nommée '%s' existe déjà."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Impossible de forcer la mise à jour de la branche courante."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'"
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up 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."
+"Impossible de configurer le suivi de branche ; le point de départ '%s' n'est "
+"pas une branche"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "la branche amont demandée '%s' n'existe pas"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2107,27 +2096,28 @@ 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:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Nom d'objet invalide : '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "nom d'objet invalide : '%s'"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objet ambigu : '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "Nom d'objet ambigu : '%s'"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Point d'embranchement invalide : '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "point d'embranchement invalide : '%s'"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' est déjà extrait dans '%s'"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"
@@ -2152,7 +2142,7 @@ msgstr "'%s' ne semble pas être un fichier colis v2 our v3"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2211,7 +2201,7 @@ msgstr "version de colis non supportée %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
@@ -2248,7 +2238,7 @@ msgstr "ID de section dupliqué %<PRIx32>"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "la section finale a un id non nul %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valeur invalide de couleur : %.*s"
@@ -2302,200 +2292,200 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr "impossible de trouver tous les fichiers du graphe de commit"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "position de commit invalide. Le graphe de commit est vraisemblablement "
 "corrompu"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "impossible de trouver le commit %s"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 "le graphe de commits requiert des données de génération de débordement mais "
 "n'en contient pas"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "impossible d'obtenir le type de l'objet %s"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Lecture des commits connus dans un graphe de commit"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expansion des commits joignables dans un graphe de commit"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Suppression les marques de commit dans le graphe de commits"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Calcul des niveaux topologiques du graphe de commits"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Calcul des chiffres de génération du graphe de commits"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Collecte des commits référencés"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
 msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "erreur à l'ajout du packet %s"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "erreur à l'ouverture de l'index pour %s"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "Recherche de commits pour un graphe de commits parmi les objets empaquetés"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "impossible de créer les répertoires de premier niveau de %s"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "impossible de créer une couche de graphe temporaire"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "impossible de régler les droits partagés pour '%s'"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Écriture le graphe de commits en %d passe"
 msgstr[1] "Écriture le graphe de commits en %d passes"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "impossible d'ouvrir le fichier de graphe de commit"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "échec du renommage du fichier de graphe de commits"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "impossible de renommer le fichier temporaire de graphe de commits"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Analyse des commits de fusion"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Fusion du graphe de commits"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "trop de commits pour écrire un graphe"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "le graphe de commit a une somme de contrôle incorrecte et est "
 "vraisemblablement corrompu"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
 "%u != %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "échec de l'analyse le commit %s depuis le graphe de commits"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Verification des commits dans le graphe de commits"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "échec de l'analyse du commit %s depuis la base de données d'objets pour le "
 "graphe de commit"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
 "%s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 "la liste des parents du graphe de commit pour le commit %s est trop longue"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "le parent du graphe de commit pour %s est %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2503,7 +2493,7 @@ msgstr ""
 "le graphe de commit a un numéro de génération nul pour le commit %s, mais "
 "non-nul ailleurs"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2511,22 +2501,22 @@ msgstr ""
 "le graphe de commit a un numéro de génération non-nul pour le commit %s, "
 "mais nul ailleurs"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 "la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
 "%<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "la date de validation pour le commit %s dans le graphe de commit est "
 "%<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "impossible d'analyser %s"
@@ -2556,27 +2546,27 @@ msgstr ""
 "Supprimez ce message en lançant\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1239
+#: commit.c:1241
 #, 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."
 
-#: commit.c:1243
+#: commit.c:1245
 #, 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."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "La validation %s n'a pas de signature GPG."
 
-#: commit.c:1249
+#: commit.c:1251
 #, 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"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2647,7 +2637,7 @@ msgstr "la clé ne contient pas de section: %s"
 msgid "key does not contain variable name: %s"
 msgstr "la clé ne contient pas de nom de variable : %s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
@@ -2809,148 +2799,148 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère"
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "valeur mal formée pour %s"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valeur mal formée pour %s : %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "doit être parmi nothing, matching, simple, upstream ou current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "niveau de compression du paquet %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "impossible de charger l'objet blob de config '%s'"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "la référence '%s' ne pointe pas sur un blob"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "impossible de résoudre le blob de config '%s'"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "échec de l'analyse de %s"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:2501
+#: config.c:2504
 #, 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:2547
+#: config.c:2550
 #, 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:2549
+#: config.c:2552
 #, 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:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de section invalide '%s'"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "impossible d'écrire le fichier de configuration %s"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "impossible de verrouiller le fichier de configuration %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "ouverture de %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "motif invalide : %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "fichier de configuration invalide %s"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "échec de fstat sur %s"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "impossible de réaliser un mmap de '%s'%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "échec de chmod sur %s"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "impossible d'écrire le fichier de configuration %s"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de régler '%s' à '%s'"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossible de désinitialiser '%s'"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de section invalide : %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valeur manquante pour '%s'"
@@ -3130,7 +3120,7 @@ msgstr "chemin étrange '%s' bloqué"
 msgid "unable to fork"
 msgstr "fork impossible"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Vérification de la connectivité"
 
@@ -3438,18 +3428,18 @@ msgstr ""
 "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
 "arbre de travail"
 
-#: diff.c:157
+#: diff.c:158
 #, 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:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paramètre dirstat inconnu '%s'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3457,7 +3447,7 @@ msgstr ""
 "le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
 "'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3467,7 +3457,7 @@ msgstr ""
 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3475,13 +3465,13 @@ msgstr ""
 "color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
 "d'autres modes d'espace"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3490,50 +3480,53 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrêt à %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr ""
-"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "
-"avec -S"
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s'"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
-"--pickaxe-all et  --find-object sont mutuellement exclusifs, utilisez --"
-"pickaxe-all avec -G et -S"
+"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez "
+"'%s' avec '%s' et '%s'"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valeur invalide de --stat : %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s attend une valeur numérique"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3542,42 +3535,42 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe de modification inconnue '%c' dans --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valeur inconnue après ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossible de résoudre '%s'"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "forme <n>/<m> attendue par %s"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "caractère attendu par %s, '%s' trouvé"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mauvais argument --color-moved : %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode invalide '%s' dans --color-moved-ws"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3585,160 +3578,160 @@ msgstr ""
 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
 "\"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument invalide pour %s"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "regex invalide fournie à -I : '%s'"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mauvais argument pour --word-diff : %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Options de format de sortie de diff"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "générer la rustine"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "générer les diffs avec <n> lignes de contexte"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "générer le diff en format brut"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "synonyme de '-p --raw'"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "synonyme de '-p --stat'"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "--stat pour traitement automatique"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "afficher seulement la dernière ligne de --stat"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "afficher la distribution des quantités de modifications relatives pour "
 "chaque sous-répertoire"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonyme pour --dirstat=cumulative"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonyme pour --dirstat=files,param1,param2..."
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "avertir si les modifications introduisent des marqueurs de conflit ou des "
 "erreurs d'espace"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "résumé succinct tel que les créations, les renommages et les modifications "
 "de mode"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "n'afficher que les noms de fichiers modifiés"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "n'afficher que les noms et les status des fichiers modifiés"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "générer un diffstat"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<largeur>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "générer un diffstat avec la largeur indiquée"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "génerer un diffstat avec la largeur de nom indiquée"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "génerer un diffstat avec la largeur de graphe indiquée"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<compte>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "générer un diffstat avec des lignes limitées"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "générer une résumé compact dans le diffstat"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "produire un diff binaire qui peut être appliqué"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "afficher les noms complets des objets pre- et post-image sur les lignes "
 "\"index\""
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "afficher un diff coloré"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<sorte>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3746,7 +3739,7 @@ msgstr ""
 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
 "'nouveau' dans le diff"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3754,93 +3747,93 @@ msgstr ""
 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
 "champs dans --raw ou --numstat"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<préfixe>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "afficher le contexte entre les sections à concurrence du nombre de ligne "
 "indiqué"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<caractère>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Options de renommage de diff"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "casser les modifications d'une réécrire complète en paires de suppression et "
 "création"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "détecter les renommages"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "supprimer la pré-image pour les suppressions"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "détecter les copies"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr ""
 "utiliser les fichiers non-modifiés comme sources pour trouver des copies"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "désactiver la détection de renommage"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "utiliser des blobs vides comme source de renommage"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3848,165 +3841,165 @@ msgstr ""
 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
 "copie excède la limite indiquée"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Options de l'algorithme de diff"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "produire le diff le plus petit possible"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorer les espaces lors de la comparaison de ligne"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorer des modifications du nombre d'espaces"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorer des modifications d'espace en fin de ligne"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "ignore le retour chariot en fin de ligne"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorer les modifications dont les lignes sont vides"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "heuristique qui déplace les limites de sections de diff pour faciliter la "
 "lecture"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 "générer un diff en utilisant l'algorithme de différence \"histogramme\""
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algorithme>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "choisir un algorithme de différence"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<texte>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "afficher des différences par mot, en utilisant <mode> pour délimiter les "
 "mots modifiés"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "utiliser <regex> pour décider ce qu'est un mot"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "les lignes déplacées sont colorées différemment"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "comment les espaces sont ignorés dans --color-moved"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Autres options diff"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "
 "afficher les chemins relatifs"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "traiter les fichiers comme texte"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "échanger les entrées, inverser le diff"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "désactiver tous les affichages du programme"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "autoriser l'exécution d'un assistant externe de diff"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "lancer les filtres externes de conversion en texte lors de la comparaison de "
 "fichiers binaires"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<quand>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "ignorer les modifications dans les sous-modules lors de la génération de diff"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "spécifier comment les différences dans les sous-modules sont affichées"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "masquer les entrées 'git add -N' de l'index"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<chaîne>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -4014,7 +4007,7 @@ msgstr ""
 "rechercher les différences qui modifient le nombre d'occurrences de la "
 "chaîne spécifiée"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -4022,38 +4015,38 @@ msgstr ""
 "rechercher les différences qui modifient le nombre d'occurrences de la regex "
 "spécifiée"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 "afficher toutes les modifications dans l'ensemble de modifications avec -S "
 "ou -G"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<chemin>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "afficher la modification dans le chemin spécifié en premier"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "sauter la sortie pour le chemin spécifié"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<id-objet>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -4061,35 +4054,35 @@ msgstr ""
 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "
 "indiqué"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "sélectionner les fichiers par types de diff"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<fichier>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Sortie vers un fichier spécifié"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 "détection exhaustive de renommage annulée à cause d'un trop grand nombre de "
 "fichiers."
 
-#: diff.c:6309
+#: diff.c:6260
 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:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4134,29 +4127,29 @@ msgstr ""
 "votre fichier d'extraction partielle pourrait présenter des problèmes : le "
 "motif '%s' est répété"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "désactivation de la correspondance de motif de cone"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "impossible d'utiliser %s comme fichier d'exclusion"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "impossible d'ouvrir le répertoire '%s'"
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2890
+#: dir.c:2844
 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:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4164,38 +4157,38 @@ msgstr ""
 "Aucun nom de répertoire n'a pu être deviné\n"
 "Veuillez spécifier un répertoire dans la ligne de commande"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "fichier d'index corrompu dans le dépôt %s"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossible de créer les répertoires pour %s"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 "suggestion : en attente de la fermeture du fichier par votre éditeur de "
 "texte…%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "Filtrage du contenu"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "espaces de nom de Git \"%s\""
@@ -4205,273 +4198,269 @@ msgstr "espaces de nom de Git \"%s\""
 msgid "too many args to run %s"
 msgstr "trop d'arguments pour lancer %s"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : liste superficielle attendue"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 "git fetch-pack : paquet de vidage attendu après une liste superficielle"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "impossible d'écrire sur un distant"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc nécessite multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalide : %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ligne de fin de superficiel invalide : %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvé : %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "erreur dans l'objet : %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "pas de superficiel trouvé : %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "superficiel/non superficiel attendu, %s trouvé"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "réponse %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvé (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminé"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s déjà possédé (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocole : mauvais entête de paquet"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack : sortie d'index de pack invalide"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "échec de %s"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le démultiplexer latéral"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Le serveur supporte %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gère pas --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gère pas --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gère pas --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "le dépôt source est superficiel, clonage rejeté."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack : échec de le récupération."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "le serveur ne supporte pas l'algorithme '%s'"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Le serveur ne supporte pas les requêtes superficielles"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Le serveur supporte filter"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "impossible d'écrire la requête sur le distant"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "erreur à la lecture de l'entête de section '%s'"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' attendu, '%s' reçu"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "ligne d'acquittement inattendue : '%s'"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "erreur lors du traitement des acquittements : %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "fichier paquet attendu à envoyer après 'ready'"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "erreur lors du traitement de l'information de superficialité : %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref attendu, '%s' trouvé"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inattendu : '%s'"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "erreur lors du traitement des références voulues : %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack : paquet de fin de réponse attendu"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "'ready' inattendu depuis le distant"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "référence distante inconnue %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, 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é"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "impossible d'écrire la signature détachée dans '%s'"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4479,7 +4468,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile doit exister et être configuré pour la "
 "vérification de signature ssh"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4487,56 +4476,56 @@ msgstr ""
 "ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de "
 "signature ssh (disponible depuis openssh version 8.2p1+)"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "signature incompatible ou mauvaise '%s'"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
 "gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg n'a pas pu signer les données"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "user.signingkey doit être configuré pour pour signer avec ssh"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "impossible d'écrire la clé de signature ssh dans '%s'"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4544,7 +4533,7 @@ msgstr ""
 "ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible "
 "dans openssh version 8.2p1+)"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"
@@ -4554,7 +4543,7 @@ msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'"
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4562,18 +4551,18 @@ msgstr ""
 "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
 "supporté qu'avec -P avec PCRE v2"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "échec du stat de '%s'"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquée"
@@ -4698,8 +4687,8 @@ msgstr "Continuons en supposant que vous avez voulu dire '%s'."
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Lancer '%s' à la place ? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Lancer '%s' à la place [y/N] ? "
 
 #: help.c:654
 #, c-format
@@ -4928,7 +4917,7 @@ msgstr "vidage attendu après les arguments ls-refs"
 msgid "quoted CRLF detected"
 msgstr "CRLF citées détectées"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "action invalide '%s' pour '%s'"
@@ -5166,7 +5155,7 @@ msgstr "sous-module"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5175,7 +5164,7 @@ msgstr ""
 "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
 "Version %s de %s laissée dans l'arbre."
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5187,7 +5176,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
@@ -5202,7 +5191,7 @@ msgstr ""
 "fusion :\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Déjà à jour."
 
@@ -5483,7 +5472,7 @@ msgstr "la fusion n'a pas retourné de commit"
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
@@ -5492,8 +5481,8 @@ msgstr "Impossible d'écrire l'index."
 msgid "failed to read the cache"
 msgstr "impossible de lire le cache"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "impossible d'écrire le nouveau fichier d'index"
@@ -5502,164 +5491,164 @@ msgstr "impossible d'écrire le nouveau fichier d'index"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "le fichier d'index multi-paquet %s est trop petit"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
 "0x%08x"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "la version d'index multi-paquet %d n'est pas reconnue"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 "la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
 "version %u"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "index multi-paquet manque de tronçon de nom de paquet"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "index multi-paquet manque de tronçon de recherche OID requis"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "mauvais pack-int-id : %u (%u paquets au total)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "échec de l'ajout du fichier paquet '%s'"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "échec à l'ouverture du fichier paquet '%s'"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "échec de localisation de l'objet %d dans le fichier paquet"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "impossible de stocker le fichier d'index inversé"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "impossible d'analyser la ligne : %s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "ligne malformée : %s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr ""
 "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "impossible de charger le paquet"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "impossible d'ouvrir l'index pour %s"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Ajout de fichiers paquet à un index multi-paquet"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "paquet préféré inconnu : %s"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "fichier paquet à éliminer %s non trouvé"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "le paquet préféré '%s' est expiré"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "aucun fichier paquet à l'index."
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "impossible d'écrire le bitmap multi-paquet"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "échec de l'écriture de l'index de multi-paquet"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "échec de la suppression de %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "échec du nettoyage de l'index de multi-paquet à %s"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "somme de contrôle incorrecte"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Recherche de fichiers paquets référencés"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5667,55 +5656,55 @@ msgstr ""
 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
 "étalement[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "le midx ne contient aucun oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Classement des objets par fichier paquet"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Vérification des décalages des objets"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "impossible de lire le fichier paquet %s"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Comptage des objets référencés"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Recherche et effacement des fichiers paquets non-référencés"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "impossible de démarrer le groupement d'objets"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "impossible de finir le groupement d'objets"
 
@@ -5773,261 +5762,261 @@ 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-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "impossible de normaliser le répertoire d'objet : %s"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "lecture du fichier d'alternatives impossible"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "impossible de déplacer le nouveau fichier d'alternative"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "le chemin '%s' n'existe pas"
 
-#: object-file.c:722
+#: object-file.c:762
 #, 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é."
 
-#: object-file.c:728
+#: object-file.c:768
 #, 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."
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "le dépôt de référence '%s' est superficiel"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "le dépôt de référence '%s' est greffé"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "impossible de trouver le répertoire objet correspondant à %s"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "échec de mmap%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "le fichier objet %s est vide"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "objet libre corrompu '%s'"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "données incorrectes à la fin de l'objet libre '%s'"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "impossible d'analyser l'entête %s"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "type d'objet invalide"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "impossible de dépaqueter l'entête %s"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "entête de %s trop long, attendu %d octets"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "remplacement %s non trouvé pour %s"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'objet libre %s (stocké dans %s) est corrompu"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "impossible d'écrire le fichier %s"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "impossible de régler les droits de '%s'"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "erreur d'écriture d'un fichier"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "erreur en fermeture du fichier d'objet esseulé"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "impossible d'écrire le fichier d'objet esseulé"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "impossible de compresser le nouvel objet %s (%d)"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "échec de deflateEnd sur l'objet %s (%d)"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "données de source d'objet instable pour %s"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "échec de utime() sur %s"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "impossible de lire l'objet pour %s"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "commit corrompu"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "étiquette corrompue"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "erreur de lecture à l'indexation de %s"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lecture tronquée pendant l'indexation de %s"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s : échec de l'insertion dans la base de données"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s : type de fichier non supporté"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s n'est pas un objet valide"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s n'est pas un objet '%s' valide"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "incohérence de hachage pour %s (%s attendu)"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "impossible de mmap %s"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "impossible de dépaqueter l'entête de %s"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "impossible d'analyser l'entête de %s"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "impossible de dépaqueter le contenu de %s"
@@ -6158,25 +6147,25 @@ msgstr "impossible d'analyser l'objet : %s"
 msgid "hash mismatch %s"
 msgstr "incohérence de hachage %s"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "l'index inverse requis manque dans l'index multi-paquet"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index : impossible d'ouvrir le paquet"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "impossible de récupérer la taille de %s"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "impossible de trouver %s dans le paquet %s à l'offset %<PRIuMAX>"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "impossible de récupérer l'utilisation du disque de %s"
@@ -6225,46 +6214,51 @@ msgstr "échec de rendre %s lisible"
 msgid "could not write '%s' promisor file"
 msgstr "impossible d'écrire le fichier de prometteur '%s'"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "le fichier paquet %s ne peut être mmap%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, 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:1927
+#: packfile.c:1928
 #, 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-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "l'option '%s' attend une valeur numérique"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "date d'expiration malformée : '%s'"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "nom d'objet malformé '%s'"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "l'option '%s' attend \"%s\" ou \"%s\""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6300,36 +6294,36 @@ msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g"
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "alias pour --%s"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "option inconnue « %s »"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "bascule inconnue « %c »"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "option non-ascii inconnue dans la chaîne : '%s'"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
@@ -6337,7 +6331,7 @@ msgstr "usage : %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
@@ -6361,17 +6355,17 @@ msgstr "   ou : %s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-NUM"
 
@@ -6507,17 +6501,17 @@ msgstr "erreur de lecture"
 msgid "the remote end hung up unexpectedly"
 msgstr "l'hôte distant a fermé la connexion de manière inattendue"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "erreur de protocole : mauvaise longueur de ligne %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "erreur distante : %s"
@@ -6572,7 +6566,7 @@ msgstr "impossible de démarrer `log`"
 msgid "could not read `log` output"
 msgstr "impossible de lire la sortie de `log`"
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
@@ -6595,61 +6589,57 @@ msgstr "impossible d'analyser l'entête git '%.*s'"
 msgid "failed to generate diff"
 msgstr "échec de la génération de diff"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only et --right-only sont mutuellement exclusifs"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "impossible d'analyser le journal pour '%s'"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "impossible de créer un blob vide dans la base de donnée d'objets"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
 "répertoires git"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' n'a pas de commit extrait"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "indexation du fichier '%s' impossible"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "impossible d'ajouter '%s' à l'index"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "fstat de '%s' impossible"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' existe à la fois comme un fichier et un répertoire"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Rafraîchir l'index"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6658,7 +6648,7 @@ msgstr ""
 "index.version renseignée, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6667,143 +6657,143 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signature incorrecte 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "mauvaise version d'index %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "mauvaise signature sha1 d'index"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "extension %.4s ignorée"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "format d'entrée d'index inconnu 0x%08x"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "champ de nom malformé dans l'index, près du chemin '%s'"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "entrées de préparation non ordonnées dans l'index"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entrées de préparation non ordonnées pour '%s'"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "fichier d'index corrompu"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "impossible de créer le fil load_cache_entries : %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "impossible de joindre le fil load_cache_entries : %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s : l'ouverture du fichier d'index a échoué"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s : impossible de faire un stat sur l'index ouvert"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s : fichier d'index plus petit qu'attendu"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s : impossible de mapper le fichier d'index%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "impossible de créer le fil load_index_extensions : %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "impossible de joindre le fil load_index_extensions : %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "impossible de rafraîchir l'index partagé '%s'"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "index cassé, %s attendu dans %s, %s obtenu"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "échec de conversion d'un index clairsemé"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "impossible de stat '%s'"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossible d'ouvrir le répertoire git : %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "échec lors de l'unlink : %s"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "impossible de régler les bits de droit de '%s'"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s : impossible de revenir à l'étape 0"
@@ -6925,8 +6915,8 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6970,7 +6960,7 @@ msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s : 'preserve' a été remplacé par 'merges'"
 
 # à priori on parle d'une branche ici
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "disparue"
 
@@ -7009,7 +6999,8 @@ msgstr "Valeur entière attendue refname:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valeur entière attendue refname:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argument %%(%s) non reconnu : %s"
@@ -7019,11 +7010,6 @@ msgstr "argument %%(%s) non reconnu : %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) n'accepte pas d'argument"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "argument %%(objectsize) non reconnu : %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -7034,11 +7020,6 @@ msgstr "%%(deltabase) n'accepte pas d'argument"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) n'accepte pas d'argument"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "argument %%(subject) non reconnu : %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -7054,26 +7035,11 @@ msgstr "argument %%(trailers) inconnu : %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "valeur positive attendue contents:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "argument %%(contents) non reconnu : %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "argument %%(raw) non reconnu : %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "valeur positive attendue '%s' dans %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "argument '%s' non reconnu dans %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -7094,21 +7060,11 @@ msgstr "position non reconnue : %s"
 msgid "unrecognized width:%s"
 msgstr "largeur non reconnue : %s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "argument %%(align) non reconnu : %s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "valeur positive attendue avec l'atome %%(align)"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "argument %%(if) non reconnu : %s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -7131,15 +7087,10 @@ msgid ""
 msgstr ""
 "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
 
-#: ref-filter.c:844
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-
-#: ref-filter.c:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format : atome %%(%s) utilisé sans un atome %%(%s)"
 
 #: ref-filter.c:912
 #, c-format
@@ -7151,16 +7102,6 @@ msgstr "format : atome %%(then) utilisé plus d'une fois"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atome %%(then) utilisé après %%(else)"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7235,22 +7176,22 @@ msgstr "objet malformé à '%s'"
 msgid "ignoring ref with broken name %s"
 msgstr "réf avec un nom cassé %s ignoré"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "réf cassé %s ignoré"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'option '%s' doit pointer sur un commit"
@@ -7295,71 +7236,71 @@ msgstr "impossible de récupérer `%s`"
 msgid "invalid branch name: %s = %s"
 msgstr "nom de branche invalide : %s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "symref pendant %s ignoré"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "le journal pour la réf %s contient un trou après %s"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "le journal pour la réf %s est vide"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "refus de mettre à jour une réf avec un nom cassé '%s'"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "échec de update_ref pour la réf '%s' : %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "mises à jour multiples pour la réf '%s' non permises"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "mises à jour des références interdites en environnement de quarantaine"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "mises à jour des références annulées par le crochet"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' existe ; impossible de créer '%s'"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "impossible de traiter '%s' et '%s' en même temps"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "impossible de supprimer la référence %s"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "impossible de supprimer la référence %s : %s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "impossible de supprimer les références : %s"
@@ -7369,52 +7310,52 @@ msgstr "impossible de supprimer les références : %s"
 msgid "invalid refspec '%s'"
 msgstr "spécificateur de réference invalide : '%s'"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "un raccourci de configuration de distant ne peut pas commencer par '/' : %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "plus d'un receivepack fournis, utilisation du premier"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "plus d'un uploadpack fournis, utilisation du premier"
 
-#: remote.c:590
+#: remote.c:699
 #, 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:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit à la fois %s et %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "la clé '%s' du modèle n'a pas de '*'"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "la valeur '%s' du modèle n'a pas de '*'"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 "le spécificateur de référence source %s ne correspond à aucune référence"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -7424,7 +7365,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7448,7 +7389,7 @@ msgstr ""
 "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
 "totalement qualifiée."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7459,7 +7400,7 @@ msgstr ""
 "Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
 "'%s:refs/heads/%s' ?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7470,7 +7411,7 @@ msgstr ""
 "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
 "'%s:refs/tags/%s' ?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7481,7 +7422,7 @@ msgstr ""
 "Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
 "'%s:refs/tags/%s' ?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7492,119 +7433,119 @@ msgstr ""
 "Souhaitiez-vous créer un nouveau blob en poussant sur\n"
 "'%s:refs/tags/%s' ?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "'%s' ne peut pas être résolue comme une branche"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "suppression de '%s' impossible : la référence distante n'existe pas"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 "le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
 "références"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurée pour la branche '%s'"
 
-#: remote.c:1742
+#: remote.c:1852
 #, 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:1757
+#: remote.c:1867
 #, 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:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussée"
 
-#: remote.c:1779
+#: remote.c:1892
 #, 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:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de résoudre une poussée 'simple' pour une destination unique"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "impossible de trouver la référence distante %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Référence bizarre '%s' ignorée localement"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Votre branche est à jour avec '%s'.\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Votre branche et '%s' font référence à des commits différents.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (utilisez \"%s\" pour plus de détails)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
 msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7616,11 +7557,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
 "en avance rapide.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7635,12 +7576,12 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergé,\n"
 "et ont %d et %d commits différents chacune respectivement.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 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"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "impossible d'analyser le nom attendu d'objet '%s'"
@@ -7673,7 +7614,7 @@ msgstr "impossible d'écrire l'enregistrement rerere"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "échec du flush de '%s'"
@@ -7718,8 +7659,8 @@ msgstr "impossible de délier '%s' qui est errant"
 msgid "Recorded preimage for '%s'"
 msgstr "Pré-image enregistrée pour '%s'"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossible de créer le répertoire '%s'"
@@ -7757,37 +7698,29 @@ msgstr "impossible d'ouvrir le répertoire rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "impossible de déterminer la révision HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "impossible de trouver l'arbre de %s"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input est incompatible avec --no-walk"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<fichier-paquet> n'est plus géré"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk est incompatible avec --unsorted-input"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2693
+#: revision.c:2689
 #, 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:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "impossible de créer un fil asynchrone : %s"
@@ -7855,8 +7788,8 @@ msgstr "mode de nettoyage invalide de message de validation '%s'"
 msgid "could not delete '%s'"
 msgstr "impossible de supprimer '%s'"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "impossible de supprimer '%s'"
@@ -7918,13 +7851,13 @@ msgstr ""
 "Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n"
 "lancez \"git revert --abort\"."
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "impossible d'écrire dans '%s'"
@@ -7934,12 +7867,18 @@ msgstr "impossible d'écrire dans '%s'"
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "échec lors de la finalisation de '%s'"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7954,7 +7893,7 @@ msgstr "validez vos modifications ou les remiser pour continuer."
 msgid "%s: fast-forward"
 msgstr "%s : avance rapide"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
@@ -7985,8 +7924,8 @@ msgstr "aucune clé présente dans '%.*s'"
 msgid "unable to dequote value of '%s'"
 msgstr "impossible de décoter la valeur de '%s'"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossible d'ouvrir '%s' en lecture"
@@ -8049,11 +7988,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "échec du crochet 'prepare-commit-msg'"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8082,7 +8021,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -8108,349 +8047,350 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement créé"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement créé"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "impossible de résoudre HEAD après création du commit"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "HEAD détachée"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s n'est pas un commit !"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "impossible d'analyser le commit HEAD"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "impossible d'analyser l'auteur du commit"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "impossible de lire le message de validation de '%s'"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "identité d'auteur invalide '%s'"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "auteur corrompu : information de date manquante"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "échec de l'écriture de l'objet commit"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnue : %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Ceci est le premier message de validation :"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ceci est le message de validation numéro %d :"
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Le premier message de validation sera ignoré :"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Le message de validation %d sera ignoré :"
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossible d'écrire '%s'"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossible de lire le message de validation de %s"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionné."
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "impossible de réparer le commit racine"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, 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:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "le commit %s n'a pas de parent %d"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s n'accepte pas d'argument : '%s'"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument manquant pour %s"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "impossible d'analyser '%s'"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "impossible de lire '%s'."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "annulation d'un picorage en cours"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "annulation d'un retour en cours"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "\"écrase-sur\" inutilisable"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "un retour est déjà en cours"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "un picorage est déjà en cours"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, 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:3198
+#: sequencer.c:3200
 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:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "pas de retour en cours"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "aucun picorage en cours"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "échec du saut de commit"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "il n'y a rien à sauter"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8459,16 +8399,16 @@ msgstr ""
 "avez-vous déjà validé ?\n"
 "essayez \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8487,27 +8427,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Impossible d'appliquer %s... %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Impossible de fusionner %.*s"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Exécution : %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8522,11 +8462,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 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:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8543,91 +8483,91 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom de label illégal '%.*s'"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "écriture d'un commit racine bidon"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "écriture de 'écraser-sur'"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "impossible de résoudre '%s'"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "impossible de fusionner avec une révision courante"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "impossible d'analyser '%.*s'"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "rien à fusionner : '%.*s'"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "impossible de lire le message de validation de '%s'"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "impossible de seulement essayer de fusionner '%.*s'"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "fusion : Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Autoremisage impossible"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Réponse de remisage inattendue : '%s'"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Impossible de créer le répertoire pour '%s'"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Autoremisage créé : %s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "impossible de réinitialiser --hard"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8638,30 +8578,30 @@ 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:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "L'application du remisage automatique a créé des conflits."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 "Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "impossible de détacher HEAD"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Arrêt à HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Arrêté à %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8682,58 +8622,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Rebasage (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Arrêt à %s... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Rebasage et mise à jour de %s avec succès.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8743,68 +8683,68 @@ 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:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "impossible d'écrire le fichier : '%s'"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "le commit %s appliqué précédemment a été sauté"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script : options non gérées"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script : erreur lors de la préparation des révisions"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "rien à faire"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "impossible d'éviter les commandes de picorage non nécessaires"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "le script a déjà été réarrangé."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "'%s' est hors du dépôt à '%s'"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8814,7 +8754,7 @@ msgstr ""
 "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
 "n'existent pas localement."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8825,14 +8765,14 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "l'option '%s' doit être présente avant les arguments qui ne sont pas des "
 "options"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8843,28 +8783,28 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "impossible de mettre en place le répertoire de travail en utilisant une "
 "configuration invalide"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "cette opération doit être effectuée dans un arbre de travail"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Version attendue du dépôt git <= %d, %d trouvée"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "extension de dépôt inconnue trouvée :"
 msgstr[1] "extensions de dépôt inconnues trouvées :"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] ""
@@ -8872,75 +8812,75 @@ msgstr[0] ""
 msgstr[1] ""
 "la version du dépôt est 0, mais des extensions uniquement v1 trouvées :"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "erreur à l'ouverture de '%s'"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "trop gros pour être une fichier .git : '%s'"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "erreur à la lecture de %s"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format de fichier git invalide : %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "aucun chemin dans le fichier git : %s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "ce n'est pas un dépôt git : %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' trop gros"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "ce n'est pas un dépôt git : '%s'"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "impossible de revenir au répertoire de travail courant"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "échec du stat de '%*s%s%s'"
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accéder au répertoire de travail courant"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "impossible de modifier en '%s'"
 
-#: setup.c:1251
+#: setup.c:1315
 #, 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:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8951,7 +8891,7 @@ msgstr ""
 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "n'est pas défini)."
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8961,15 +8901,15 @@ msgstr ""
 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
 "écriture."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "échec de la bifurcation"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "échec du setsid"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
@@ -9026,13 +8966,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u octet/s"
 msgstr[1] "%u octets/s"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "impossible d'ouvrir '%s' en écriture"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "impossible d'éditer '%s'"
@@ -9127,7 +9067,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "le processus pour le sous-module '%s' a échoué"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Échec de résolution de HEAD comme référence valide."
 
@@ -9379,7 +9319,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr "chemin de service distant invalide"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "option non supportée par le protocole"
 
@@ -9602,7 +9542,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "Abandon."
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "échec de la poussée de tous les sous-modules nécessaires"
 
@@ -9622,7 +9562,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"
 msgid "too-short tree file"
 msgstr "fichier arbre trop court"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9633,7 +9573,7 @@ msgstr ""
 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "
 "branche."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9643,7 +9583,7 @@ msgstr ""
 "l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9653,7 +9593,7 @@ msgstr ""
 "fusion :\n"
 "%%sVeuillez valider ou remiser vos modifications avant la fusion."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9663,7 +9603,7 @@ msgstr ""
 "fusion :\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9672,7 +9612,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:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9681,7 +9621,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9691,7 +9631,16 @@ msgstr ""
 "contenus :\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"impossible de supprimer le répertoire de travail actuel :\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9701,7 +9650,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9710,7 +9659,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9720,7 +9669,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9729,7 +9678,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9739,7 +9688,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9748,7 +9697,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9759,7 +9708,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9769,7 +9718,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9779,7 +9728,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9788,7 +9737,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9798,7 +9747,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9807,12 +9756,12 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9821,7 +9770,7 @@ msgstr ""
 "Mise à jour impossible pour le sous-module :\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9832,7 +9781,7 @@ msgstr ""
 "clairsemés :\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9842,7 +9791,7 @@ msgstr ""
 "motifs clairsemés :\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9853,12 +9802,12 @@ msgstr ""
 "motifs clairsemés :\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "Abandon\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9867,11 +9816,11 @@ msgstr ""
 "Après correction des chemins ci-dessus, vous voulez peut-être lancer `git "
 "sparse-checkout reapply`.\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "Mise à jour des fichiers"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9881,17 +9830,17 @@ msgstr ""
 "sensibles à la casse dans une système de fichier insensible) et un\n"
 "seul du groupe en collision est dans l'arbre de travail :\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Mise à jour des drapeaux de l'index"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "vidage attendu après les arguments de récupération"
 
@@ -9928,104 +9877,104 @@ msgstr "segment de chemin '..' invalide"
 msgid "Fetching objects"
 msgstr "Récupération des objets"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "échec de la lecture de '%s'"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
 "de travail"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' n'existe pas"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ne pointe pas en retour sur '%s'"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "pas un répertoire"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git n'est pas un fichier"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "fichier .git cassé"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "fichier .git incorrect"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "pas un chemin valide"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
 "impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "impossible de localiser le dépôt ; fichier .git cassé"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir non lisible"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir incorrect"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "pas un répertoire valide"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "le fichier gitdir n'existe pas"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "impossible de lire le fichier gitdir (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr ""
 "lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "fichier gitdir invalide"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "le fichier gitdir pointe sur un endroit inexistant"
 
@@ -10086,11 +10035,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Modifications qui seront validées :"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
@@ -10195,22 +10144,22 @@ msgstr "contenu modifié, "
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, 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:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10218,7 +10167,7 @@ msgstr ""
 "Ne touchez pas à la ligne ci-dessus.\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10230,107 +10179,114 @@ msgstr ""
 "de la branche.\n"
 "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 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:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Vous êtes au milieu d'une session am."
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (utilisez \"git am --allow-empty\" pour enregistrer la rustine comme un "
+"commit vide)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo est manquant."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Aucune commande réalisée."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
 msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (voir plus dans le fichier %s)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Aucune commande restante."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Vous êtes en train de rebaser."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git rebase --continue\")"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (utilisez \"git rebase --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (utilisez \"git rebase --abort\" pour extraire la branche d'origine)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git rebase --continue\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10338,163 +10294,163 @@ msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
 "de la branche '%s' sur '%s'."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
 "branche '%s' sur '%s'."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (utilisez \"git commit --amend\" pour corriger le commit actuel)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos "
 "modifications)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Picorage en cours."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Vous êtes actuellement en train de picorer le commit %s."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (lancez \"git cherry-pick --continue\" pour continuer)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Rétablissement en cours."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Vous êtes actuellement en train de rétablir le commit %s."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git revert --continue\")"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (lancez \"git revert --continue\" pour continuer)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git revert --continue\")"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (utilisez \"git revert --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (utilisez \"git revert --abort\" pour annuler le rétablissement)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Vous êtes en cours de bissection."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Vous êtes dans une extraction clairsemée."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 "Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
 "présents."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD détachée sur "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD détachée depuis "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Aucun commit"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Fichiers ignorés"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10506,32 +10462,32 @@ msgstr ""
 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
 "status')."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichés%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutée à la validation\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10540,84 +10496,84 @@ msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents (utilisez \"git add\" pour les suivre)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
 "suivre)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien à valider\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "rien à valider, la copie de travail est propre\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Encore aucun commit sur "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "différent"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "derrière "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "devant "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "impossible de %s : vous avez des modifications non indexées."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "de plus, votre index contient des modifications non validées."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s impossible : votre index contient des modifications non validées."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "impossible de trouver le commit %"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "impossible de lire la réponse IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "impossible de démarrer accept_thread '%s'"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "impossible de démarrer worker[0] pour '%s'"
@@ -10654,113 +10610,119 @@ msgstr "suppression de '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Impossible d'écrire le patch"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "échec de l'édition du patch"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 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:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "simuler l'action"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "mode verbeux"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "édition du diff actuel et application"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorés"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "mettre à jour les fichiers suivis"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 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:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 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:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 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:388
+#: builtin/add.c:385
 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:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr ""
 "permettre la mise à jour des entrées hors du cone d'extraction clairsemée"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "outrepasser le bit exécutable pour les fichiers listés"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "avertir lors de l'ajout d'un dépôt embarqué"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "backend pour `git stash -p`"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10791,12 +10753,12 @@ msgstr ""
 "\n"
 "Référez-vous à \"git help submodule\" pour plus d'information."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dépôt git embarqué ajouté : %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10806,52 +10768,29 @@ msgstr ""
 "Éliminez ce message en lançant\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file est incompatible avec --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A et -u sont mutuellement incompatibles"
-
-#: builtin/add.c:547
-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:551
+#: builtin/add.c:548
 #, 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:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr ""
+"'%s' et les arguments de spécificateur de chemin ne peuvent pas être "
+"utilisés ensemble"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Rien de spécifié, rien n'a été ajouté.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10861,112 +10800,120 @@ msgstr ""
 "Éliminez ce message en lançant\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Valeur invalide pour --empty : %s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "impossible d'analyser l'auteur du script"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' a été effacé par le crochet applypatch-msg"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Ligne en entrée malformée : '%s'."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Impossible de copier les notes de '%s' vers '%s'"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "échec de fseek"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossible d'analyser le patch '%s'"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 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:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "décalage horaire invalide"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, 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:1128
+#: builtin/am.c:1154
 #, 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:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Pour enregistrer la rustine vide comme un commit vide, lancez \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1161
 #, 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:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent "
 "être perdus."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Le patch actuel est vide."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "ligne d'auteur manquante dans le commit %s"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 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:1541
+#: builtin/am.c:1568
 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:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10974,24 +10921,24 @@ msgstr ""
 "Avez-vous édité le patch à la main ?\n"
 "Il ne s'applique pas aux blobs enregistrés dans son index."
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -10999,40 +10946,58 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 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:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Ignoré : %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Création d'un commit vide : %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Le patch actuel est vide."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "l'application de la rustine a échoué à %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "aucune modification - enregistré comme un commit vide."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -11043,7 +11008,7 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -11056,17 +11021,17 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -11074,160 +11039,168 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Valeur invalide pour --show-current-patch : %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "les options '%s=%s' et '%s=%s' ne peuvent pas être utilisées ensemble"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "être silencieux"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "ajouter une ligne terminale Signed-off-by au message de validation"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 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:2292
+#: builtin/am.c:2348
 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:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "le passer à travers git-mailinfo"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 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:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "restaurer la branche originale et abandonner les applications de patch"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "abandonne l'opération de patch mais garde HEAD où il est"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "afficher le patch en cours d'application"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "enregistrer la rustine vide comme un commit vide"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "id-clé"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "comment gérer les rustines vides"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -11235,17 +11208,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:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, 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:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11254,13 +11227,13 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 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 "
 "reprise."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "le mode interactif requiert des rustines sur la ligne de commande"
 
@@ -11724,11 +11697,11 @@ msgstr ""
 msgid "show work cost statistics"
 msgstr "montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "forcer l'affichage de l'état d'avancement"
@@ -11777,7 +11750,7 @@ msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
 msgid "ignore whitespace differences"
 msgstr "ignorer les différences d'espace"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "rév"
 
@@ -11834,7 +11807,7 @@ msgstr ""
 "traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
 "de-fonction>"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -11848,18 +11821,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "le fichier %s n'a qu'%lu ligne"
 msgstr[1] "le fichier %s n'a que %lu lignes"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Assignation de blâme aux lignes"
 
@@ -11893,7 +11866,7 @@ msgstr "git branch [<options>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<options>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11902,7 +11875,7 @@ msgstr ""
 "suppression de la branche '%s' qui a été fusionnée dans\n"
 "         '%s', mais pas dans HEAD."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11911,12 +11884,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:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Impossible de rechercher l'objet commit pour '%s'"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11925,7 +11898,7 @@ 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:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "Échec de la mise à jour du fichier de configuration"
 
@@ -11937,103 +11910,103 @@ msgstr "impossible d'utiliser -a avec -d"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Impossible de rechercher l'objet commit pour HEAD"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "branche de suivi '%s' non trouvée."
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "branche '%s' non trouvée."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, 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:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branche %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "impossible d'analyser la chaîne de format"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) pointe hors de refs/heads/"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "La branche %s est en cours de rebasage sur %s"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branche %s est en cours de bissection sur %s"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 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:516
+#: builtin/branch.c:520
 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:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Échec de copie de la branche"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Création d'une copie d'une branche mal nommée '%s'"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Renommage d'une branche mal nommée '%s'"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, 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:580
+#: builtin/branch.c:584
 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:582
+#: builtin/branch.c:586
 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:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -12044,180 +12017,176 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 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:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "régler le mode de suivi (voir git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "règler la configuration des branches de suivi"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "ne pas utiliser"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "amont"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "désactiver l'information amont"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "afficher seulement les branches qui contiennent le commit"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "afficher seulement les branches qui ne contiennent pas le commit"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "afficher à la fois les branches de suivi et les branches locales"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "déplacer/renommer une branche, même si la cible existe"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "copier une branche et son reflog"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "copier une branche, même si la cible existe"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "afficher le nom de la branche courante"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "objet"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "le tri et le filtrage sont non-sensibles à la casse"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format à utiliser pour la sortie"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column et --verbose sont incompatibles"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "le nom de branche est requis"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "impossible d'éditer la description de plus d'une branche"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "trop de branches pour une opération de copie"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "trop d'arguments pour une opération de renommage"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "trop d'arguments pour spécifier une branche amont"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12225,32 +12194,32 @@ msgstr ""
 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "trop d'arguments pour désactiver un amont"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 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:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branche '%s' n'a aucune information de branche amont"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -12259,7 +12228,7 @@ msgstr ""
 "branche.\n"
 "Vouliez-vous plutôt dire -a|-r --list <motif> ?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12415,7 +12384,7 @@ msgstr "Le dépaquetage d'un colis requiert un dépôt."
 
 #: builtin/bundle.c:185
 msgid "Unbundling objects"
-msgstr "dépaquetage d'objets depuis un colis"
+msgstr "Dépaquetage d'objets"
 
 #: builtin/bundle.c:219 builtin/remote.c:1733
 #, c-format
@@ -12534,8 +12503,8 @@ 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:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
@@ -12593,10 +12562,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<options>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "chaîne"
 
@@ -12662,100 +12631,95 @@ msgstr "git switch [<options>] <branche>"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "le chemin '%s' n'a pas notre version"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "le chemin '%s' n'a pas leur version"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "le chemin '%s' n'a aucune des versions nécessaires"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "le chemin '%s' n'a pas les versions nécessaires"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "chemin '%s' : impossible de fusionner"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d conflit du fusion recréé"
 msgstr[1] "%d conflits du fusion recréés"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d chemin mis à jour depuis %s"
 msgstr[1] "%d chemins mis à jour depuis %s"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d chemin mis à jour depuis l'index"
 msgstr[1] "%d chemins mis à jour depuis l'index"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' ne peut pas être utilisé avec %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
 "même temps."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s', ni '%s' spécifié"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12765,50 +12729,50 @@ msgstr ""
 "suivants :\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12831,7 +12795,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12860,19 +12824,19 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12881,7 +12845,7 @@ msgstr ""
 "'%s' pourrait être un fichier local ou un branche de suivi.\n"
 "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12901,51 +12865,51 @@ msgstr ""
 "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
 "votre config."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "une seule référence attendue"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "une seule référence attendue, %d fournies."
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "branche attendue, mais étiquette '%s' reçue"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "une branche est attendue, mais '%s' a été reçue"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "une branche est attendue, mais un commit '%s' a été reçu"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12953,7 +12917,7 @@ msgstr ""
 "impossible de basculer de branche pendant une fusion\n"
 "Envisagez \"git merge --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12961,7 +12925,7 @@ msgstr ""
 "impossible de basculer de branche pendant une session am\n"
 "Envisagez \"git am --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12969,7 +12933,7 @@ msgstr ""
 "impossible de basculer de branche pendant un rebasage\n"
 "Envisagez \"git rebase --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12977,7 +12941,7 @@ msgstr ""
 "impossible de basculer de branche pendant un picorage\n"
 "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12985,139 +12949,128 @@ msgstr ""
 "impossible de basculer de branche pendant un retour\n"
 "Envisagez \"git revert --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "vous basculez de branche en cours de bissection"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, 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:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' n'accepte pas <point-de-départ>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, 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:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "argument de branche ou de commit manquant"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (merge (fusion) ou diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "style de conflit (merge (fusion), diff3 ou zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "régler le mode de suivi (voir git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 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:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 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:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p et --overlay sont mutuellement exclusifs"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr ""
+"les options '-%c', '-%c' et '%s' ne peuvent pas être utilisées ensemble"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "nom de branche manquant ; essayez -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossible de résoudre %s"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, 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:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file est incompatible avec --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file est incompatible avec --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -13125,72 +13078,72 @@ msgstr ""
 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
 "de l'extraction de l'index."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "vous devez spécifier un ou des chemins à restaurer"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "branche"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "utiliser le mode de superposition (défaut)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "créer et basculer sur une nouvelle branche"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "créer/réinitialiser et basculer sur une branche"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "interpréter 'git switch <branche-inexistante>'"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "laisser tomber les modifications locales"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "de quel <arbre-esque> faire l'extraction"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "restaurer l'index"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "restaurer l'arbre de travail (par défaut)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignorer les entrées non-fusionnées"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "utiliser le mode de superposition"
 
@@ -13225,7 +13178,15 @@ msgstr "Ignorerait le dépôt %s\n"
 msgid "could not lstat %s\n"
 msgstr "lstat de %s impossible\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Refus de supprimer le répertoire de travail actuel\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Refuserait de supprimer le répertoire de travail actuel\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13238,7 +13199,7 @@ msgstr ""
 "foo         - sélectionner un élément par un préfixe unique\n"
 "            - (vide) ne rien sélectionner\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13259,33 +13220,33 @@ msgstr ""
 "*          - choisir tous les éléments\n"
 "           - (vide) terminer la sélection\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hein (%s) ?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs à ignorer>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Sélectionner les éléments à supprimer"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13303,52 +13264,52 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 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:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier à nettoyer, sortie."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "ne pas afficher les noms des fichiers supprimés"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "motif"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorés, aussi"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorés"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13356,7 +13317,7 @@ msgstr ""
 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13364,7 +13325,7 @@ msgstr ""
 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x et -X ne peuvent pas être utilisés ensemble"
 
@@ -13420,19 +13381,20 @@ msgstr "répertoire-modèle"
 msgid "directory from which templates will be used"
 msgstr "répertoire depuis lequel les modèles vont être utilisés"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "dépôt de référence"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nom"
@@ -13449,7 +13411,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "profondeur"
@@ -13458,7 +13420,7 @@ msgstr "profondeur"
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "heure"
@@ -13467,18 +13429,18 @@ msgstr "heure"
 msgid "create a shallow clone since a specific time"
 msgstr "créer un clone superficiel depuis une date spécifique"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "révision"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "approfondir l'historique d'un clone superficiel en excluant une révision"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
@@ -13508,22 +13470,22 @@ msgstr "clé=valeur"
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "spécifique au serveur"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "option à transmettre"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
@@ -13620,29 +13582,25 @@ msgstr "impossible de remballer pour nettoyer"
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de délier le fichier temporaire alternates"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "les options --bare et --origin %s sont incompatibles."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare et --separate-git-dir sont incompatibles."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
@@ -13663,8 +13621,8 @@ msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
@@ -13787,7 +13745,7 @@ msgstr ""
 "split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "répertoire"
 
@@ -13870,7 +13828,7 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
 msgid "Collecting commits from input"
 msgstr "Collecte des commits depuis l'entrée"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "sous-commande non reconnue : %s"
@@ -13888,7 +13846,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "le parent dupliqué %s est ignoré"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "nom d'objet invalide %s"
@@ -13911,13 +13869,13 @@ msgstr "parent"
 msgid "id of a parent commit object"
 msgstr "id d'un objet commit parent"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "message"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "message de validation"
 
@@ -13925,7 +13883,7 @@ msgstr "message de validation"
 msgid "read commit log message from file"
 msgstr "lire le message de validation depuis un fichier"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signer la validation avec GPG"
@@ -14006,10 +13964,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."
@@ -14097,8 +14051,8 @@ msgstr "impossible de lire le fichier de journal '%s'"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "impossible de combiner -m avec --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "les options '%s' et '%s.%s' ne peuvent pas être utilisées ensemble"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -14208,7 +14162,7 @@ msgstr "impossible de passer les lignes finales à --trailers"
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, 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"
@@ -14225,15 +14179,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode de fichier ignoré invalide '%s'"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long et -z sont incompatibles"
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
@@ -14244,115 +14194,116 @@ msgstr "Vous êtes en plein picorage -- impossible de reformuler."
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr ""
+"l'option de reformulation de '%s' et le chemin '%s' ne peuvent pas être "
+"utilisés ensemble"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr ""
-"l'option reword de --fixup est mutuellement exclusive avec --patch/--"
-"interactive/--all/--include/--only"
+"l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés "
+"ensemble"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 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:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 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:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 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:1280
+#: builtin/commit.c:1281
 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:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 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:1309
+#: builtin/commit.c:1310
 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:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "option inconnue : --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "calcule les valeurs complètes en avance/en retard"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "afficher l'état en format long (par défaut)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 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:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14360,11 +14311,11 @@ msgstr ""
 "afficher les fichiers ignorés, \"mode\" facultatif : traditional "
 "(traditionnel), matching (correspondant), no. (Défaut : traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14372,198 +14323,198 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "ne pas détecter les renommages"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "détecter les renommages, en spécifiant optionnellement le facteur de "
 "similarité"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modèle de message de validation"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "réutiliser et éditer le message du commit spécifié"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "réutiliser le message du commit spécifié"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour corriger ou reformuler le "
 "commit spécifié"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 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:1635
+#: builtin/commit.c:1636
 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:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "ligne de fin"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "ajouter des lignes terminales personnaliser"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "ajouter une ligne terminale Signed-off-by"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "inclure l'état dans le modèle de message de validation"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, 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:1792
+#: builtin/commit.c:1793
 #, 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:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr ""
 "Abandon de la validation dû à un corps de message de validation vide.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -15078,7 +15029,7 @@ msgstr "ne considérer que les étiquettes correspondant à <motif>"
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considérer les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrégés en dernier recours"
 
@@ -15095,25 +15046,15 @@ 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:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long et --abbrev=0 sont incompatibles"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken est incompatible avec les commits ou assimilés"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr ""
+"l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -15134,26 +15075,26 @@ msgstr "option invalide : %s"
 msgid "%s...%s: no merge base"
 msgstr "%s..%s: pas de base de fusion"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Ce n'est pas un dépôt git"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objet non géré '%s' spécifié."
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"
@@ -15162,22 +15103,22 @@ msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, 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:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -15185,58 +15126,58 @@ 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:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "le fichier dans l'arbre de travail a été laissé."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "échec : %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "réalise un diff de répertoire complet"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "ne pas confirmer avant de lancer l'outil de diff"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "utiliser les liens symboliques en mode de diff de répertoire"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "outil"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spécifié"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 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:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -15244,31 +15185,23 @@ msgstr ""
 "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
 "de sortie non-nul"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "spécifier une commande personnalisée pour visualiser les différences"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "passé à `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool exige un arbre de travail ou --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff est incompatible avec --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
@@ -15309,133 +15242,124 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [options-de-liste-de-révisions]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"
 "tags ne soit spécifié."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "le jeton --anonymize-map ne peut pas être vide"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "afficher la progression après <n> objets"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "sélectionner la gestion des étiquettes signées"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 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:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "sélectionner la gestion des messages de validation dans un encodage "
 "alternatif"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "importer les marques depuis ce fichier s'il existe"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 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:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "utiliser la fonction \"done\" pour terminer le flux"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "sauter l'affichage de données de blob"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "spécificateur de référence"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 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:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "depuis:vers"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "référencer les parents qui ne sont pas dans le flux d'export rapide par id "
 "d'objet"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "afficher les ids d'objet originaux des blobs/commits"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "marquer les étiquettes avec des ids de marque"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map n'a aucune signification sans --anonymize"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Champs from manquants pour le sous-module '%s'"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Champs 'to' manquants pour le sous-module '%s'"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Commande 'mark' attendue, %s trouvé"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Commande 'to' attendue, %s trouvé"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 "Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-"
 "module"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
@@ -15446,122 +15370,122 @@ msgstr ""
 msgid "Lockfile created but not reported: %s"
 msgstr "Fichier verrou créé mais non reporté : %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel ne peut pas être négatif"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "définir la branche amont pour git pull/fetch"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "utiliser une transaction atomique pour mettre à jour les références"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "modifier le spécificateur de référence pour placer les références dans refs/"
 "prefetch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 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:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
 "encombrent les étiquettes modifiées"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "écrire les références récupérées dans le fichier FETCH_HEAD"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 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:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "préfixer ceci à la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15569,146 +15493,150 @@ 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:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les références qui mettent à jour .git/shallow"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "spécifier une correspondance de référence pour la récupération"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des "
 "sommets de négociation"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "lancer 'maintenance --auto' après la récupération"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 "vérifier les mises à jour forcées (forced-updates) sur toutes les branches "
 "mises à jour"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "écrire le graphe de commits après le rapatriement"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "lire les spécificateurs de référence depuis l'entrée standard"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, 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:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "extrait dans un autre arbre de travail"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[mise à jour de l'étiquette]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "impossible de mettre à jour la référence locale"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "écraserait l'étiquette existante"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
+"fetch indique normalement quelles branches ont subi une mise à jour forcée,\n"
 "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
-"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'."
+"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'"
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n"
+"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées ;\n"
 "Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
-"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
+"'git config fetch.showForcedUpdates false' pour éviter cette vérification\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, 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:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 "%s rejeté parce que les  mises à jour de racines superficielles ne sont pas "
 "permises"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15717,143 +15645,144 @@ 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:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, 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"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, 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"
+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:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "L'option \"%s\" est ignorée pour %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "l'option \"%s\" est ignorée pour %s\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "l'objet %s n'existe pas"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "branches multiples détectées, imcompatible avec --set-upstream"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne "
+"pointe sur aucune branche."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "dépôt amont non défini pour la branche de suivi à distance"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "dépôt amont non défini pour l'étiquette distante"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "type de branche inconnu"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 "aucune branche source trouvée.\n"
-"Vous devez spécifier exactement une branche avec l'option --set-upstream."
+"Vous devez spécifier exactement une branche avec l'option --set-upstream"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
-msgstr "Impossible de récupérer %s"
+msgid "could not fetch %s"
+msgstr "impossible de récupérer %s"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "impossible de récupérer '%s' (code de sortie : %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 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."
+"distant depuis lesquels les nouvelles révisions devraient être récupérées"
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Vous devez spécifier un nom d'étiquette."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "Vous devez spécifier un nom d'étiquette"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen et --depth sont mutuellement exclusifs"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "une profondeur négative dans --deepen n'est pas supportée"
 
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 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:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dépôt"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 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:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Distant ou groupe distant inexistant : %s"
+msgid "no such remote or remote group: %s"
+msgstr "distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2081
+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 "
+"la récupération d'un groupe avec des spécifications de référence n'a pas de "
 "sens"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15861,11 +15790,11 @@ msgstr ""
 "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans "
 "extensions.partialclone"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant"
 
@@ -15875,23 +15804,27 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 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:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "alias pour --log (obsolète)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "texte"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "utiliser <texte> comme début de message"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "utiliser <nom> au lieu de la branche cible reélle"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "fichier d'où lire"
 
@@ -15911,47 +15844,47 @@ msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 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:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "échapper les champs réservés pour les interpréteurs de commandes"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "échapper les champs réservés pour perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "échapper les champs réservés pour python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "échapper les champs réservés pour compatibilité avec Tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "n'afficher que <n> références correspondant"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "respecter les couleurs de formatage"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 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:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "afficher seulement les références qui sont fusionnées"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 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:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "afficher seulement les références qui contiennent le commit"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "afficher seulement les références qui ne contiennent pas le commit"
 
@@ -16102,125 +16035,125 @@ msgstr "%s : objet corrompu ou manquant : %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s : l'objet a un type '%s' inconnu : %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s : impossible d'analyser : %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mauvais fichier de sha1 : %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Vérification du répertoire d'objet"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Vérification du lien %s"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pointe sur quelque chose bizarre (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s : la HEAD détachée ne pointe sur rien"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "note : %s pointe sur une branche non-née (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Vérification de l'arbre cache"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-arbre dans l'arbre de cache"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 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:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "considérer les reflogs comme nœuds tête (par défaut)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "écrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms étendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s : objet manquant"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
@@ -16239,17 +16172,12 @@ msgstr "Échec du stat de %s : %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "échec de l'analyse de '%s' valeur '%s'"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossible de faire un stat de '%s'"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16265,56 +16193,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "éliminer les objets non référencés"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "être plus consciencieux (durée de traitement allongée)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 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:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "impossible d'analyser gc.logexpiry %s"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, 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:609
+#: builtin/gc.c:610
 #, 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:610
+#: builtin/gc.c:611
 #, 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:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16322,216 +16250,216 @@ 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:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
 "supprimer."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule n'est pas accepté"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argument de --schedule non reconnu, '%s'"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "échec de l'écriture du graphe de commits"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "échec de la pré-récupération des distants"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "impossible de démarrer le processus 'git pack-objects'"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "impossible de finir le processus 'git pack-objects'"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "échec de l'écriture de l'index de multi-paquet"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "échec de 'git multi-pack-index expire'"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "échec de 'git multi-pack-index repack'"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "le fichier verrou '%s' existe, pas de maintenance"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "échec de la tâche '%s'"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' n'est pas une tâche valide"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "lancer les tâches selon l'état du dépôt"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "fréquence"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "lancer les tâches selon une fréquence"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "ne pas afficher le progrès ou d'autres informations sur stderr"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tâche"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "lancer une tâche spécifique"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "échec du lancement de 'git config'"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "impossible d'étendre le chemin '%s'"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "échec de démarrage de launchctl"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "échec de la création des répertoires pour '%s'"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "échec de l'amorçage du service %s"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "échec de création du fichier temporaire xml"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "échec du démarrage de schtasks"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
 "'cron'"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
 "'cron'"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "échec à l'ouverture de stdin de 'crontab'"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' est mort"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "échec du démarrage de systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "échec pour lancer systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "échec de la suppression de '%s'"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "argument '%s' de --scheduler non reconnu"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "ni les minuteurs systemd ni crontab ne sont disponibles"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "le planificateur %s n'est pas disponible"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr ""
 "un autre processus est en train de programmer une maintenance en tâche de "
 "fond"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<planificateur>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "planificateur"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "planificateur qui lancera les maintenances git"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "échec de l'ajout du dépôt à la config globale"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subcommand> [<options>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "sous-commande invalide : %s"
@@ -16909,25 +16837,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "format d'aide non reconnu '%s'"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Échec de démarrage d'emacsclient."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Échec d'analyse de la version d'emacsclient."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "échec de l'exécution de '%s'"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16936,7 +16864,7 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16945,39 +16873,39 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s' : visualiseur de manuel inconnu."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' est un alias de '%s'"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mauvais chaîne alias.%s : %s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
-msgstr "Cette option n'accepte pas d'autre argument"
+msgstr "cette option n'accepte pas d'autre argument"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' pour plus d'information"
 
@@ -17245,18 +17173,10 @@ msgstr "mauvais %s"
 msgid "unknown hash algorithm '%s'"
 msgstr "algorithme d'empreinte inconnu '%s'"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format ne peut pas être utilisé avec --stdin"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
@@ -17382,10 +17302,6 @@ msgstr "empreinte"
 msgid "specify the hash algorithm to use"
 msgstr "spécifier l'algorithme d'empreinte à utiliser"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17520,85 +17436,85 @@ msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr ""
 "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "type inconnu : %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s : couverture invalide pour le mode de description"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "exactement une plage nécessaire"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "ceci n'est pas une plage"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "la lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "échec de création du fichier de lettre de motivation"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "deux répertoires de sortie ?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit inconnu %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "échec à résoudre '%s' comme une référence valide"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -17611,301 +17527,285 @@ msgstr ""
 "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "échec à trouver la base de fusion exacte"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 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:1582
+#: builtin/log.c:1597
 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:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "échec d'inférence de l'origine de différence d'intervalles de la série "
 "actuelle"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 "utilisation de '%s' comme une différence d'intervalle pour la série actuelle"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 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:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 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:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "taille maximum du nom du fichier de sortie"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 "générer des parties de la lettre d'introduction à partir de la description "
 "de la branche"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 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:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "ajouter l'en-tête de courriel"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 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:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "ajouter un arbre prérequis à la série de patchs"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr ""
 "afficher la barre de progression durant la phase de génération des patchs"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport à <rév> dans la première page ou une "
 "rustine"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport à <refspec> dans la première page ou "
 "une rustine"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "pourcentage par lequel la création est pondérée"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff :"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contre v%d :"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor requiert --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Diff-intervalle :"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Diff-intervalle contre v%d :"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Génération des patchs"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "échec de création des fichiers en sortie"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17913,121 +17813,125 @@ msgstr ""
 "Impossible de trouver une branche distante suivie, merci de spécifier "
 "<branche_amont> manuellement.\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<options>] [<fichier>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "séparer les chemins par un caractère NUL"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifier l'état de fichier avec les étiquettes"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "afficher les fichiers supprimés dans la sortie"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "afficher les fichiers modifiés dans la sortie"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "afficher les autres fichiers dans la sortie"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "afficher les fichiers ignorés dans la sortie"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "afficher les nom des objets indexés dans la sortie"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 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:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "afficher seulement les noms des répertoires 'other'"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "afficher les fins de lignes des fichiers"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "ne pas afficher les répertoires vides"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "afficher les fichiers non fusionnés dans la sortie"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "afficher l'information resolv-undo"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "sauter les fichiers correspondant au motif"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "lire les motifs d'exclusion depuis <fichier>"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 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:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "ajouter les exclusions git standard"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 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:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 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:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "arbre ou apparenté"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 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:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "afficher les données de débogage"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "supprimer les entrées dupliquées"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -18225,26 +18129,30 @@ msgid "use a diff3 based merge"
 msgstr "utiliser une fusion basée sur diff3"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "utiliser une fusion basée sur un diff3 zélée"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "pour les conflits, utiliser notre version (our)"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "pour les conflits, utiliser leur version (their)"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "pour les conflits, utiliser l'ensemble des versions"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "pour les conflits, utiliser cette taille de marqueur"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "ne pas avertir à propos des conflits"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
 
@@ -18283,182 +18191,186 @@ msgstr "Fusion de %s avec %s\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 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:260 builtin/pull.c:137
+#: builtin/merge.c:261 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:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 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:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 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:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion réussit (défaut)"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 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:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "stratégie"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 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:291
+msgid "use <name> instead of the real target"
+msgstr "utiliser <nom> au lieu de la cible réelle"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Déjà à jour. (rien à compresser)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, 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:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 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:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "option de stratégie inconnue : -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, 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:829
+#: builtin/merge.c:831
 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"
@@ -18470,11 +18382,11 @@ msgstr ""
 "branche de sujet.\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Un message vide abandonne la validation.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18483,74 +18395,74 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, 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:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 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:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %s : %s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 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:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit n'accepte pas d'argument"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 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:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18558,7 +18470,7 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18566,86 +18478,78 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 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:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 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:1435
+#: builtin/merge.c:1438
 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:1437
+#: builtin/merge.c:1440
 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:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 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:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, 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:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18688,7 +18592,7 @@ msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck"
 msgid "tag on stdin did not refer to a valid object"
 msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "impossible d'écrire le fichier d'étiquettes"
 
@@ -18754,7 +18658,7 @@ msgstr "écrire l'index multi-paquet ne contenant que les index fournis"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "instantané des réfs pour sélectionner les commits de bitmap"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18855,54 +18759,54 @@ msgstr "%s, source=%s, destination=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<options>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<options>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr ""
 "afficher seulement les noms basés sur des références (pas de nom d'objet)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "utiliser seulement les étiquettes pour nommer les validations"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "utiliser seulement les références correspondant à <motif>"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "ignorer les références correspondant à <motif>"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr ""
 "afficher toutes les validations accessibles depuis toutes les références"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "lire depuis l'entrée standard"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "déréférencer les étiquettes en entrée (usage interne)"
 
@@ -19022,25 +18926,25 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Écrire/éditer les notes pour l'objet suivant :"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "impossible de démarrer 'show' pour l'objet '%s'"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "impossible de lire la sortie de 'show'"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "impossible de finir 'show' pour l'objet '%s'"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "impossible d'écrire l'objet note"
 
@@ -19049,7 +18953,7 @@ 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:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
@@ -19091,8 +18995,8 @@ msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "trop d'arguments"
 
@@ -19139,7 +19043,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Écrasement des notes existantes pour l'objet %s\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Suppression de la note pour l'objet %s\n"
@@ -19262,18 +19166,18 @@ msgstr "vous devez spécifier une référence de notes à fusionner"
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy inconnu : %s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, 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:874
+#: builtin/notes.c:878
 #, 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:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -19284,42 +19188,42 @@ msgstr ""
 "validez le résultat avec 'git notes merges --commit', ou abandonnez la "
 "fusion avec 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Impossible de résoudre '%s' comme une référence valide."
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "L'objet %s n'a pas de note\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 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:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "lire les noms d'objet depuis l'entrée standard"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "afficher les notes éliminées"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "références-notes"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
@@ -19730,10 +19634,6 @@ msgstr "la taille limite minimale d'un paquet est 1 MiB"
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "impossible d'utiliser --filter sans --stdout"
@@ -19750,7 +19650,7 @@ msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs"
 msgid "Enumerating objects"
 msgstr "Énumération des objets"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19793,19 +19693,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "afficher les objets éliminés"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "faire expirer les objets plus vieux que <heure>"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
 
@@ -19838,7 +19738,7 @@ msgstr "autoriser l'avance rapide"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "remiser et réappliquer automatiquement avant et après"
 
@@ -19916,6 +19816,7 @@ msgid "<remote>"
 msgstr "<distant>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<branche>"
 
@@ -19949,13 +19850,13 @@ msgstr "impossible d'accéder le commit %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19978,21 +19879,21 @@ msgstr ""
 "passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n"
 "remplacer à l'invocation la valeur par défaut configurée.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 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:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -20003,7 +19904,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -20020,23 +19921,23 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Impossible d'aller en avance rapide sur de multiples branches."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Besoin de spécifier comment réconcilier des branches divergentes."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -20229,7 +20130,7 @@ msgstr "Poussée vers %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "impossible de pousser des références vers '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "dépôt"
 
@@ -20303,10 +20204,6 @@ msgstr "signer la poussée avec GPG"
 msgid "request atomic transaction on remote side"
 msgstr "demande une transaction atomique sur le serveur distant"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete est incompatible avec --all, --mirror et --tags"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete n'a pas de sens sans aucune référence"
@@ -20338,26 +20235,14 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all et --tags sont incompatibles"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all ne peut pas être combiné avec des spécifications de référence"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror et --tags sont incompatibles"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all et --mirror sont incompatibles"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr ""
@@ -20785,18 +20670,6 @@ msgstr "Il semble que 'git am' soit en cours. Impossible de rebaser."
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges a été remplacé par --rebase-merges"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "impossible de combiner '--keep-base' avec '--onto'"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "impossible de combiner '--keep-base' avec '--root'"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "impossible de combiner '--root' avec '--fork-point'"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
@@ -20864,9 +20737,9 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiert --merge ou --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
 msgstr ""
-"impossible de combiner les options d'application avec les options de fusion"
+"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20907,7 +20780,7 @@ msgid "no such branch/commit '%s'"
 msgstr "pas de branche ou commit '%s'"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Référence inexistante : %s"
@@ -20977,7 +20850,7 @@ msgstr "Avance rapide de %s sur %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -21007,7 +20880,7 @@ msgstr ""
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
 "réglez « receive.denyCurrentBranch » à 'refuse'."
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -21027,13 +20900,13 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Vous devez spécifier un répertoire."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "Vous devez spécifier un répertoire"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -21057,41 +20930,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <référence>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' n'est pas un horodatage valide"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marquage des objets inaccessibles..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s ne pointe nulle part !"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "pas de journal de références à supprimer spécifié"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "'%s' n'est pas un journal de références"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "pas de journal de références pour '%s'"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de référence invalide : %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -21183,6 +21056,11 @@ msgstr "git remote update [<options>] [<groupe> | <distante>]..."
 msgid "Updating %s"
 msgstr "Mise à jour de %s"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Impossible de récupérer %s"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21428,7 +21306,7 @@ msgstr "ne pas interroger les distantes"
 #: builtin/remote.c:1243
 #, c-format
 msgid "* remote %s"
-msgstr "* distante %s"
+msgstr "* distant %s"
 
 #: builtin/remote.c:1244
 #, c-format
@@ -21642,155 +21520,147 @@ msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
 "les objects de paquet."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "impossible de terminer pack-objects  pour ré-empaqueter les objets de "
 "prometteur"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "impossible d'ouvrir l'index pour %s"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr ""
 "le paquet %s est trop gros pour être pris en compte dans un progression "
 "géométrique"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "le paquet %s est trop gros à enrouler"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "impossible d'ouvrir le fichier temporaire %s en écriture"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "impossible de fermer le fichier temporaire d'instantané des réfs"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "identique à -a et transformer les objets inaccessibles en suspens"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "supprimer les paquets redondants et lancer git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta à git-pack-objects"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object à git-pack-objects"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "ne pas lancer git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local à git-pack-objects"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "écrire un index en bitmap"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passer --delta-islands à git-pack-objects"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "date approximative"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquétiser les objets inaccessibles"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "taille de la fenêtre utilisée pour la compression des deltas"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "limite le nombre maximal de fils"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "ne pas rempaqueter ce paquet"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "trouver une progression géométrique avec un facteur <N>"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "écrire un index de multi-paquet des paquets résultants"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable et -A sont incompatibles"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric est incompatible avec -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Rien de neuf à empaqueter."
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "fichier nécessaire manquant : %s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "impossible de délier : '%s'"
@@ -21873,67 +21743,61 @@ msgstr "cat-file a retourné un échec"
 msgid "unable to open %s for reading"
 msgstr "impossible d'ouvrir %s en écriture"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "impossible de lire depui mktree"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree a échoué"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree n'a pas retourné de nom d'objet"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "fstat de %s impossible"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "impossible d'écrire l'objet dans la base de données"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "nom d'objet invalide : '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "impossible d'obtenir le type de l'objet pour %s"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "échec de l'édition du fichier d'objet"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "le nouvel objet est identique à l'ancien : '%s'"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "impossible d'analyser %s comme commit"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mauvaise étiquette de fusion dans le commit '%s'"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "étiquette de fusion malformée dans le commit '%s'"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21942,31 +21806,31 @@ msgstr ""
 "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
 "utilisez --edit au lieu de --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "le commit original '%s' contient une signature GPG"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la signature sera éliminée dans la validation de remplacement !"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "impossible d'écrire le commit de remplacement pour '%s'"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft pour '%s' non nécessaire"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "le nouveau commit est identique à l'ancien : '%s'"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21975,71 +21839,71 @@ msgstr ""
 "impossible de convertir la(les) greffe(s) suivante(s) :\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "afficher les références de remplacement"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "supprimer les références de remplacement"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "éditer l'objet existant"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "modifier les parents d'un commit"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "convertir le fichier de greffe existant"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "remplacer la référence si elle existe"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "afficher sans mise en forme pour --edit"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "utiliser ce format"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format ne peut pas être utilisé sans lister"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f n'a de sens qu'en écrivant un remplacement"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw n'a de sens qu'avec l'option --edit"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d requiert au moins un argument"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "mauvais nombre d'arguments"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e requiert un seul argument"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g requiert au moins un argument"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file ne supporte aucun argument"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "-l n'accepte qu'un motifs"
 
@@ -22061,136 +21925,128 @@ msgstr "'git rerere forget' sans chemin est obsolète"
 msgid "unable to generate diff for '%s'"
 msgstr "échec de la génération de diff pour '%s'"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr ""
 "git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, 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:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "être silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "réinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 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:350
+#: builtin/reset.c:445
 #, 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:358
+#: builtin/reset.c:453
 #, 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:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 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:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, 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:398
-msgid "-N can only be used with --mixed"
-msgstr "-N ne peut être utilisé qu'avec --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -22205,19 +22061,15 @@ msgstr ""
 "de\n"
 "config reset.quiet à true pour avoir ce comportement en permanence.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, 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:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "le filtrage d'objet exige --objects"
@@ -22227,8 +22079,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list ne supporte l'affichage des notes"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "le comptage marqué est incompatible avec --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "le comptage marqué et '%s' ne peuvent pas être utilisés ensemble"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22676,13 +22529,6 @@ msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 "afficher les <n> plus récents éléments de ref-log en commençant à la base"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog est incompatible avec --all, --remotes, --independent et --merge-"
-"base"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "aucune branche spécifiée, et HEAD est invalide"
@@ -22703,19 +22549,19 @@ msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps."
 msgid "no such ref %s"
 msgstr "référence inexistante %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "impossible de gérer plus de %d révision."
 msgstr[1] "impossible de gérer plus de %d révisions."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' n'est pas une référence valide."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "impossible de trouver le commit %s (%s)"
@@ -22785,13 +22631,17 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "cet arbre de travail n'est pas clairsemé"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
 "pourrait ne pas exister)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22800,77 +22650,102 @@ msgstr ""
 "le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le "
 "cone d'extraction clairsemée"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "échec de suppression du répertoire '%s'"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr ""
 "échec de la création du répertoire pour le fichier d'extraction clairsemée"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 "impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "échec de paramétrage extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "impossible de modifier la configuration d'index clairsemé"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "initialiser l'extraction clairsemée en mode cone"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "bascule l'utilisation d'index clairsemé"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "impossible de modifier la configuration d'index clairsemé"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "échec à l'ouverture de '%s'"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "impossible de normaliser le chemin '%s'"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "impossible de décoter la chaîne en style C '%s'"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr ""
+"les motifs de l'extraction clairsemée existants n'utilisent pas le mode cone"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <motifs>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "lire les motifs depuis l'entrée standard"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "aucun sparse-checkout auquel on peut ajouter"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<motifs>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"extraction clairsemée nécessaire pour pouvoir réappliquer les motifs de "
+"clairsemage"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "erreur lors du rafraîchissement du répertoire de travail"
 
@@ -22896,22 +22771,26 @@ msgstr "git stash branch <nom-de-branche> [<remise>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
 "          [--] [<spécificateur-de-chemin>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 
 #: builtin/stash.c:55
@@ -23005,142 +22884,159 @@ msgstr "Fusion de %s avec %s"
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "tentative de recréer l'index"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s supprimé (%s)"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s : Impossible de supprimer l'élément de stash"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' n'est pas une référence de remisage"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 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."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "échec de l'analyse de l'arbre"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "échec du dépaquetage des arbres"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "inclure les fichiers non suivis dans le remisage"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "ne montrer que les fichiers non suivis dans le remisage"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Impossible de mettre à jour %s avec %s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "message pour le remisage"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" exige un argument <commit>"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Aucune modification indexée"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "Aucun changement sélectionné"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Vous n'avez pas encore la validation initiale"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'état courant de l'index"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Impossible de sauver l'état courant de la copie de travail"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Impossible de sauver l'état actuel de l'index"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Impossible d'enregistrer l'état de la copie de travail"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 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"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Impossible d'utiliser --staged et --include-untracked ou --all en même temps"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Vous avez sûrement oublié 'git add' ?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Pas de modifications locales à sauver"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Impossible de sauver l'état courant"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "conserver l'index"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "remiser seulement les modifications indexées"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "remiser une mode rustine"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "mode silencieux"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "inclure les fichiers non suivis dans la remise"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "inclure les fichiers ignorés"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -23166,7 +23062,7 @@ 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:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de référence complet attendu, %s obtenu"
@@ -23189,7 +23085,7 @@ msgstr ""
 "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
 "son propre amont d'autorité."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
@@ -23291,7 +23187,7 @@ msgstr "impossible de résoudre HEAD dans le sous-module '%s'"
 msgid "failed to recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "supprimer la sortie d'état du sous-module"
 
@@ -23361,10 +23257,6 @@ msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
 msgid "could not fetch a revision for HEAD"
 msgstr "impossible de récupérer une révision pour HEAD"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached et --files sont mutuellement exclusifs"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -23394,17 +23286,16 @@ msgstr ""
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez "
-"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
-"historique)"
+"L'arbre de travail du sous-module '%s' contient un répertoire .git. Il sera "
+"remplacé par un fichier .git en utilisant absorbgitdirs."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23413,48 +23304,48 @@ msgstr ""
 "L'arbre de travail du sous-module '%s' contient des modifications locales ; "
 "utilisez '-f' pour les annuler"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Répertoire '%s' nettoyé\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "impossible de créer le répertoire vide du sous-module %s"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 "éliminer les arbres de travail des sous-modules même s'ils contiennent des "
 "modifications locales"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "désenregistrer tous les sous-modules"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -23466,69 +23357,69 @@ msgstr ""
 "submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
 "clonez avec '--reference-if-able' au lieu de '--reference'."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, 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:1739
+#: builtin/submodule--helper.c:1740
 #, 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:1746
+#: builtin/submodule--helper.c:1747
 #, 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:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 "refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, 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:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "le répertoire n'est pas vide : '%s'"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, 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:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
-msgstr "URL depuis laquelle cloner le sous-module"
+msgstr "url depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "forcer l'affichage de la progression du clonage"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "interdire de cloner dans un répertoire non-vide"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23538,94 +23429,94 @@ msgstr ""
 "<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
 "--path <chemin>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionné %s non traité"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traité"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Impossible de cloner '%s'. Réessai prévu"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, 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:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Impossible d'extraire '%s' dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Impossible de rebaser '%s' dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Impossible de fusionner '%s' dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "L'exécution de '%s %s' a échoué dans le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Chemin de sous-module '%s' : '%s' extrait\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Chemin de sous-module '%s' : rebasé dans '%s'\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Chemin de sous-module '%s' : fusionné dans '%s'\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Le chemin de sous-module '%s' : '%s %s'\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 "Impossible de rapatrier dans le chemin de sous-module '%s' ; essai de "
 "rapatriement direct de %s :"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23634,87 +23525,87 @@ msgstr ""
 "Chemin de sous-module '%s' récupéré, mais il ne contenait pas %s. La "
 "récupération directe de ce commit a échoué."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "chemin dans la copie de travail"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 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:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "valeurs possibles : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 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:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "jobs parallèles"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 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:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "valeur invalide pour la mise à jour du paramètre"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr ""
 "supprimer la sortie lors de la mise à jour par un rebasage ou une fusion"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "forcer les mises à jour d'extraction"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "ne pas récupérer les nouveaux objets depuis le site distant"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr ""
 "passer outre le mode mise à jour dans le cas où le dépôt est un clone nouveau"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "profondeur pour une récupération superficielle"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "SHA1 attendu par le super-projet"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "sous-sha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "SHA1 de la HEAD du sous-module"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<options>] <chemin>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23723,98 +23614,94 @@ 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "vérifier si écrire dans le fichier .gitmodules est sur"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "désactiver la configuration dans le fichier .gitmodules"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config name [<valeur>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "régler la branche de suivi par défaut à master"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "régler la branche de suivi par défaut"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> "
 "<chemin>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch ou --default requis"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch et --default sont mutuellement exclusifs"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "Ajout du dépôt existant à '%s' dans l'index\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' existe déjà et n'est pas un dépôt git valide"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr ""
 "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) "
 "distant(s) :\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23831,54 +23718,54 @@ msgstr ""
 "correct\n"
 "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Impossible d'extraire le sous-module '%s'"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Échec d'ajout du sous-module '%s'"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Échec d'enregistrement du sous-module '%s'"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' existe déjà dans l'index"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' existe déjà dans l'index et n'est pas un sous-module"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "la branche du dépôt à ajouter comme sous-module"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "afficher seulement les messages d'erreur"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "emprunter les objets depuis des dépôts de références"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
@@ -23886,32 +23773,32 @@ msgstr ""
 "configurer le nom du sous-module avec la chaîne fournie au lieu d'utiliser "
 "par défaut son chemin"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
 "travail"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' n'est pas un nom valide de sous-module"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gère pas --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -24011,11 +23898,11 @@ 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:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "impossible de signer l'étiquette"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -24030,15 +23917,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "mauvais type d'objet."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Le message pour l'étiquette a été laissé dans %s\n"
@@ -24119,46 +24006,22 @@ msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column et -n sont incompatibles"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "l'option -n est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "l'option --contains est autorisée seulement en mode de liste"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "l'option --no-contains est autorisée seulement en mode liste"
-
-#: builtin/tag.c:552
-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:554
-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:568
-msgid "only one -F or -m option is allowed."
-msgstr "une seule option -F ou -m est autorisée."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "l'option '%s' est autorisée seulement en mode de liste"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -24601,140 +24464,128 @@ msgstr "impossible de créer le répertoire de '%s'"
 msgid "initializing"
 msgstr "initialisation"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
 "précédemment sur %s)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Préparation de l'arbre de travail (extraction de '%s')"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 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:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "raison du verrouillage"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "régler le mode de suivi (voir git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "essayer de nommer la nouvelle branche comme la branche amont"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B et --detach sont mutuellement exclusifs"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason exige --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "ajouté avec --lock"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "afficher les annotations étendues et les raisons, si disponible"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose et --porcelain sont mutuellement exclusifs"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' n'est pas une copie de travail"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 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:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "les arbres de travail contenant des sous-modules ne peuvent pas être "
 "déplacés ou supprimés"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' est un arbre de travail principal"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "impossible de trouver le nom de la destination à partir de '%s'"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24744,7 +24595,7 @@ msgstr ""
 "verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24752,39 +24603,39 @@ msgstr ""
 "impossible de déplacer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "échec au déplacement de '%s' vers '%s'"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "échec du lancement de 'git status' sur '%s'"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le "
 "supprimer"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "impossible de lancer 'git status' sur '%s', code %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "forcer la suppression même si l'arbre de travail est sale ou verrouillé"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24794,7 +24645,7 @@ msgstr ""
 "verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24802,18 +24653,18 @@ msgstr ""
 "impossible de supprimer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 "la validation a échoué, impossible de supprimer l'arbre de travail : %s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "réparation : %s : '%s'"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "erreur : %s : %s"
@@ -24866,21 +24717,16 @@ msgstr ""
 "pour en lire plus à propos d'une commande spécifique ou d'un concept.\n"
 "Voir 'git help git' pour un survol du système."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "aucun répertoire fourni pour --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "aucun répertoire fourni pour l'option '%s'\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "aucun espace de nom fournit pour --namespace\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "aucun répertoire fourni pour --work-tree\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24896,11 +24742,6 @@ msgstr "-c requiert une chaîne de configuration\n"
 msgid "no config key given for --config-env\n"
 msgstr "aucune clé de configuration fournie pour --config-env\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "aucun répertoire fourni pour -C\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -24930,29 +24771,29 @@ msgstr "alias vide pour %s"
 msgid "recursive alias: %s"
 msgstr "alias recursif : %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "échec d'écriture sur la sortie standard"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "échec inconnu d'écriture sur la sortie standard"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "échec de fermeture de la sortie standard"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "impossible d'utiliser %s comme une fonction intégrée"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24961,34 +24802,26 @@ msgstr ""
 "usage : %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "échec au lancement de la commande '%s' : %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "pas un dépôt git"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile nécessite --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "options non gérées"
@@ -25276,6 +25109,177 @@ msgstr "remote-curl : récupération tentée sans dépôt local"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl : commande inconnue '%s' depuis git"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "répertoire de travail nécessaire"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "impossible de trouver la racine d'enrôlement"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "impossible de basculer vers '%s'"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "impossible de configurer %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "impossible de configurer log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Les enrôlements scalaires requièrent un arbre de travail"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "la HEAD distante n'est pas une branche : '%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"échec de récupération de la branche par défaut depuis le distant ; "
+"utilisation de la valeur par défaut locale"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "échec de l'obtention du nom de branche par défaut"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "échec du désenregistrement du dépôt"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "échec de la suppression du répertoire d'enrôlement"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "branche à extraire après le clonage"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "lors d'un clonage, créer un répertoire de travail complet"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "ne télécharger les méta-données que pour la branche qui sera extraite"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "le répertoire '%s' existe déjà"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "échec d'obtention de la branche par défaut pour '%s'"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "impossible de paramétrer le distant dans '%s'"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "impossible de configurer '%s'"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "échec du clonage partiel ; tentative de clonage complet"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "impossible de configurer pour le clonage complet"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` n'accepte pas d'argument"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrôlement>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "reconfigurer tous les enrôlements enregistrés"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scala reconfigure [--all|<enrôlement>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all ou <enrôlement>, mais pas les deux"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "dépôt git parti dans '%s'"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <tâche> [<enrôlement>]\n"
+"Tâches :\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "pas de tâche : '%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrôlement>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrôlement>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "refus de la suppression du répertoire de travail actuel"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "inclure la version Git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "inclure les options de construction de Git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <commande> [<options>]\n"
+"\n"
+"Commandes :\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "aucune information de compilateur disponible\n"
@@ -25300,38 +25304,38 @@ msgstr "date-d'expiration"
 msgid "no-op (backward compatibility)"
 msgstr "sans action (rétrocompatibilité)"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "être plus verbeux"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "être plus silencieux"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "utiliser <n> chiffres pour afficher les noms des objets"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "comment éliminer les espaces et les commentaires # du message"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "lire les spécificateurs de fichier depuis fichier"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 "avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un "
 "caractère NUL"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "clé"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
@@ -25406,17 +25410,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "Afficher les noms canoniques et les adresses courriel des contacts"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "S'assurer qu'un nom de référence est bien formé"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Basculer de branche ou restaurer la copie de travail"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Copier les fichiers depuis l'index dans la copie de travail"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "S'assurer qu'un nom de référence est bien formé"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Trouver les commits à appliquer en amont"
@@ -25619,61 +25623,61 @@ msgstr ""
 "Ajouter ou analyser l'information structurée dans les messages de validation"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Le navigateur de dépôt Git"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Afficher l'historique des validations"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr ""
 "Afficher l'information à propos des fichiers dans l'index ou l'arbre de "
 "travail"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Lister les références dans un dépôt distant"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Afficher le contenu d'un objet arbre"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 "Extraire le patch et l'information de d'auteur depuis un simple message de "
 "courriel"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Programme simple de découpage de mbox UNIX"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Lancer les tâches pour optimiser les données du depôt Git"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Trouver un ancêtre aussi bon que possible pour une fusion"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Lancer une fusion à 3 points"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Le programme assistant standard à utiliser avec git-merge-index"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Afficher la fusion à trois points sans modifier l'index"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
@@ -25681,363 +25685,363 @@ msgstr ""
 "conflits de fusion"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Afficher la fusion à trois points sans modifier l'index"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Écrire et vérifier les index multi-paquet"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "Créer un objet étiquette avec validation supplémentaire"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Écrire et vérifier les index multi-paquet"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique"
 
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Trouver les noms symboliques pour des révisions données"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Ajouter ou inspecter les notes d'un objet"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importer et soumettre à des dépôt Perforce"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Créer une archive compactée d'objets"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Trouver les fichiers pack redondants"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Calculer l'ID unique d'un patch"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr ""
 "Éliminer les objets inatteignables depuis la base de données des objets"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "Mettre à jour les références distantes ainsi que les objets associés"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Appliquer un patchset quilt sur la branche courante"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 "Comparer deux plages de commits (par exemple deux versions d'une branche)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Lire l'information d'arbre dans l'index"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Réapplication des commits sur le sommet de l'autre base"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Recevoir ce qui est poussé dans le dépôt"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Gérer l'information de reflog"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Gérer un ensemble de dépôts suivis"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaqueter les objets non-empaquetés d'un dépôt"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Créer, lister, supprimer des référence pour remplacer des objets"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "Générer une résumé des modifications en attentes"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "Réinitialiser la HEAD courante à l'état spécifié"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Restaurer les fichiers l'arbre de travail"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Inverser des commits existants"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Analyser et préparer les paramètres"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Inverser des commits existants"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Supprimer des fichiers de la copie de travail et de l'index"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Envoyer un ensemble de patchs comme courriels"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Pousser les objets sur un autre dépôt via le protocole Git"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Le code d'initialisation i18n pour les scripts shell"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Le code d'initialisation commun aux scripts shell Git"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell de login restreint pour un accès SSH vers Git seulement"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Résumer la sortie de 'git log'"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Afficher différents types d'objets"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Afficher les branches et leurs commits"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Afficher l'index de l'archive empaquetée"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Lister les références du dépôt local"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Le code d'initialisation i18n pour les scripts shell"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Le code d'initialisation commun aux scripts shell Git"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Initialiser et modifier l'extraction clairsemée"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Ajouter le contenu de fichiers à l'index"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Remiser les modifications d'un répertoire de travail sale"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Ajouter le contenu de fichiers à l'index"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Afficher l'état de la copie de travail"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Retirer les espaces inutiles"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Basculer de branche"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lire, modifier et supprimer les références symboliques"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Créer un fichier temporaire avec le contenu d'un blob"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Dépaqueter les objets depuis une archive empaquetée"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "
 "idiots"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Renvoyer une archive dans git-archive"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Afficher un variable logique de Git"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "Vérifier la signature GPG de commits"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Valider des fichiers d'archive Git empaquetés"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Vérifier la signature GPG d'étiquettes"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Interface web de Git"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Afficher les journaux avec la différence que chaque commit introduit"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Gérer des arbres de travail multiples"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Créer un objet arbre depuis l'index courant"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Définition des attributs par chemin"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Interface en ligne de commande et conventions de Git"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Tutoriel du cœur de Git pour les développeurs"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git pour les utilisateurs de CVS"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "Bidouillage de la sortie diff"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Foire aux questions sur l'utilisation de Git"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Un glossaire Git"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Crochets utilisés par Git"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Le navigateur de dépôt Git"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr ""
 "Fait correspondre les noms d'auteur/validateur avec les adresses de courriel"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Définition des propriétés de sous-module"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Espaces de nom de Git"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Programmes assistants pour interagir avec des dépôts distants"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Disposition d'un dépôt Git"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spécification des révisions et portées pour Git"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Montage d'un dépôt dans un autre dépôt"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Une introduction pratique à Git"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Une introduction pratique à Git : deuxième partie"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Une introduction pratique à Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interface web de Git"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -26114,45 +26118,45 @@ msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 msgid "usage: $dashless $USAGE"
 msgstr "usage : $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Impossible de se placer dans le répertoire $cdup, la racine de la copie de "
 "travail"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "Impossible de réécrire les branches : vous avez des modifications non "
 "indexées."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "$action est impossible : vous avez des modifications non indexées."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 "$action est impossible : votre index contient des modifications non validées."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "De plus, votre index contient des modifications non validées."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Vous devez lancer cette commande depuis la racine de votre copie de travail."
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Impossible de déterminer le chemin absolu du répertoire git"
 
@@ -26234,7 +26238,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -26248,7 +26252,7 @@ msgstr ""
 "a - indexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas indexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -26262,7 +26266,7 @@ msgstr ""
 "a - remiser cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas remiser cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -26276,7 +26280,7 @@ msgstr ""
 "a - désindexer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas désindexer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -26290,7 +26294,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -26304,7 +26308,7 @@ msgstr ""
 "a - supprimer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas supprimer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -26318,7 +26322,7 @@ msgstr ""
 "a - éliminer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas éliminer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -26332,7 +26336,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -26346,7 +26350,7 @@ msgstr ""
 "a - appliquer cette section et toutes les suivantes de ce fichier\n"
 "d - ne pas appliquer cette section ni les suivantes de ce fichier"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -26368,91 +26372,91 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "fichier non-fusionné ignoré : %s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Aucune autre section à atteindre\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nombre invalide : '%s'\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Désolé, %d seule section disponible.\n"
 msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Aucune autre section à rechercher\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regex de recherche malformée %s : %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Aucune section ne correspond au motif donné\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Pas de section précédente\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Pas de section suivante\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Désolé, impossible de découper cette section\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Découpée en %d section.\n"
 msgstr[1] "Découpée en %d sections.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Désolé, impossible d'éditer cette section\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26470,58 +26474,58 @@ msgstr ""
 "diff          - visualiser les diff entre HEAD et l'index\n"
 "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "-- manquant"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "mode de --patch inconnu : %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument invalide %s, -- attendu"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 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:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal : la commande '%s' s'est interrompue avec le code %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'éditeur est sorti en erreur, abandon total"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, 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:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contient le courriel composé.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases est incompatible avec d'autres options\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26533,11 +26537,11 @@ msgstr ""
 "Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette "
 "vérification.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 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:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26545,39 +26549,39 @@ msgstr ""
 "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
 "commande ou des options de configuration)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Champ de --suppress-cc inconnu : '%s'\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paramètre de --confirm inconnu : '%s'\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, 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:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attention : `:include:` n'est pas supporté : %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, 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:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attention : ligne sendmail non reconnue : %s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26592,12 +26596,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:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Échec à l'ouverture du répertoire %s : %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26607,17 +26611,17 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ligne de sujet non trouvée dans %s ?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26631,27 +26635,27 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Échec à l'ouverture de %s.final : %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Le courriel de résumé étant vide, il a été ignoré\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, 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:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26659,11 +26663,11 @@ msgstr ""
 "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26676,22 +26680,22 @@ msgstr ""
 "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
 "vraiment envoyer.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 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:1040
+#: git-send-email.perl:1076
 #, 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:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -26699,16 +26703,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:1126
+#: git-send-email.perl:1162
 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:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Le chemin vers la CA \"%s\" n'existe pas"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26735,114 +26739,114 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 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:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Le serveur ne supporte pas STARTTLS ! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "échec de STARTTLS ! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 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:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Échec de l'envoi de %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, 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:1762
+#: git-send-email.perl:1798
 #, 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:1819
+#: git-send-email.perl:1855
 #, 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:1854
+#: git-send-email.perl:1890
 #, 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:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) échec de la fermeture du pipe vers '%s'"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26853,12 +26857,12 @@ msgstr ""
 "%s\n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "impossible d'ouvrir %s :%s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26867,13 +26871,392 @@ msgstr ""
 "fatal : %s : %d est plus long que 998 caractères \n"
 "attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, 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:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+
+#~ msgid "--index outside a repository"
+#~ msgstr "--index hors d'un dépôt"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached hors d'un dépôt"
+
+#~ msgid "unrecognized input"
+#~ msgstr "entrée non reconnue"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "impossible de lire %s"
+
+#~ 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"
+
+#, c-format
+#~ 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."
+
+#, c-format
+#~ 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'."
+
+#, c-format
+#~ 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."
+
+#, 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'."
+
+#, c-format
+#~ 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 "
+#~ "rebasant."
+
+#, 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 "Cannot force update the current branch."
+#~ msgstr "Impossible de forcer la mise à jour de la branche courante."
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "Nom d'objet invalide : '%s'."
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr ""
+#~ "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G, -S et --find-object sont mutuellement exclusifs"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr ""
+#~ "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-"
+#~ "regex avec -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all et  --find-object sont mutuellement exclusifs, utilisez --"
+#~ "pickaxe-all avec -G et -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc nécessite multi_ack_detailed"
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only et --right-only sont mutuellement exclusifs"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "argument %%(objectsize) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "argument %%(subject) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "argument %%(contents) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "argument %%(raw) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "argument '%s' non reconnu dans %%(%s)"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "argument %%(align) non reconnu : %s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "argument %%(if) non reconnu : %s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input est incompatible avec --no-walk"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk est incompatible avec --unsorted-input"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run est incompatible avec --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file est incompatible avec --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file est incompatible avec --edit"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A et -u sont mutuellement incompatibles"
+
+#~ 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"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
+
+#, c-format
+#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+#~ msgstr ""
+#~ "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column et --verbose sont incompatibles"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "'%s' ne peut pas être utilisé avec %s"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr ""
+#~ "paramétrer les coordonnées de branche amont pour une nouvelle branche"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p et --overlay sont mutuellement exclusifs"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file est incompatible avec --detach"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file est incompatible avec --patch"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "les options --bare et --origin %s sont incompatibles."
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "--bare et --separate-git-dir sont incompatibles."
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file avec l'option -a n'a pas de sens"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "impossible de combiner -m avec --fixup:%s"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long et -z sont incompatibles"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr ""
+#~ "impossible de combiner l'option reword de --fixup avec le chemin '%s'"
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "l'option reword de --fixup est mutuellement exclusive avec --patch/--"
+#~ "interactive/--all/--include/--only"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long et --abbrev=0 sont incompatibles"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr ""
+#~ "--dirty est incompatible avec la spécification de commits ou assimilés"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken est incompatible avec les commits ou assimilés"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff est incompatible avec --no-index"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "--anonymize-map n'a aucune signification sans --anonymize"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr ""
+#~ "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
+
+#, 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"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen et --depth sont mutuellement exclusifs"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format ne peut pas être utilisé avec --stdin"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n et -k sont mutuellement exclusifs"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr ""
+#~ "--stdout, --output, et --output-directory sont mutuellement exclusifs"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor requiert --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete est incompatible avec --all, --mirror et --tags"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all et --tags sont incompatibles"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror et --tags sont incompatibles"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all et --mirror sont incompatibles"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "impossible de combiner '--keep-base' avec '--onto'"
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "impossible de combiner '--keep-base' avec '--root'"
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "impossible de combiner '--root' avec '--fork-point'"
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr ""
+#~ "impossible de combiner les options d'application avec les options de "
+#~ "fusion"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable et -A sont incompatibles"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric est incompatible avec -A, -a"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch est incompatible avec --{hard,mixed,soft}"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N ne peut être utilisé qu'avec --mixed"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "impossible de combiner --exclude-promisor-objects et --missing"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "le comptage marqué est incompatible avec --objects"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr ""
+#~ "--reflog est incompatible avec --all, --remotes, --independent et --merge-"
+#~ "base"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached et --files sont mutuellement exclusifs"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch et --default sont mutuellement exclusifs"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column et -n sont incompatibles"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "l'option --contains est autorisée seulement en mode de liste"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "l'option --no-contains est autorisée seulement en mode liste"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "l'option --points-at est autorisée seulement en mode liste"
+
+#~ 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"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "une seule option -F ou -m est autorisée."
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B et --detach sont mutuellement exclusifs"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason exige --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose et --porcelain sont mutuellement exclusifs"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "aucun répertoire fourni pour --git-dir\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "aucun répertoire fourni pour --work-tree\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile nécessite --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
diff --git a/po/git.pot b/po/git.pot
index 78fea37065..196249abd4 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: 2021-11-10 08:55+0800\n"
+"POT-Creation-Date: 2022-01-17 08:31+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"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr ""
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr ""
@@ -53,7 +53,7 @@ msgstr ""
 msgid "could not stage '%s'"
 msgstr ""
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr ""
 
@@ -69,8 +69,8 @@ msgstr[1] ""
 msgid "note: %s is untracked now.\n"
 msgstr ""
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr ""
@@ -111,21 +111,21 @@ msgstr[1] ""
 msgid "ignoring unmerged: %s"
 msgstr ""
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr ""
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr ""
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr ""
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr ""
 
@@ -193,11 +193,11 @@ msgstr ""
 msgid "(empty) select nothing"
 msgstr ""
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr ""
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr ""
 
@@ -209,13 +209,13 @@ msgstr ""
 msgid "unstaged"
 msgstr ""
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr ""
@@ -224,27 +224,27 @@ msgstr ""
 msgid "could not refresh index"
 msgstr ""
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr ""
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -264,22 +264,22 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -299,22 +299,22 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -334,22 +334,22 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -369,26 +369,26 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -408,22 +408,22 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -437,22 +437,22 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file\n"
 msgstr ""
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
@@ -565,7 +565,7 @@ msgstr ""
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -574,11 +574,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr ""
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr ""
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr ""
 
@@ -607,11 +607,11 @@ msgstr ""
 msgid "No other hunks to goto"
 msgstr ""
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr ""
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr ""
 
@@ -631,7 +631,7 @@ msgstr[1] ""
 msgid "No other hunks to search"
 msgstr ""
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr ""
 
@@ -708,7 +708,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
@@ -780,20 +780,32 @@ msgstr ""
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr ""
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr ""
-
-#: apply.c:150
-msgid "--index outside a repository"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
 msgstr ""
 
-#: apply.c:153
-msgid "--cached outside a repository"
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
 msgstr ""
 
 #: apply.c:800
@@ -995,8 +1007,8 @@ msgstr ""
 msgid "cannot checkout %s"
 msgstr ""
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr ""
@@ -1006,380 +1018,378 @@ msgstr ""
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr ""
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr ""
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr ""
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr ""
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
-#: apply.c:3998
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: apply.c:4003
+#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: apply.c:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
-#: apply.c:4134
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
-#: apply.c:4141
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr ""
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr ""
 
-#: apply.c:4581
+#: apply.c:4583
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 
-#: apply.c:4755
-msgid "unrecognized input"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
 msgstr ""
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr ""
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 
-#: apply.c:4959
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4973
+#: apply.c:4977
 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr ""
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr ""
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr ""
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: apply.c:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr ""
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr ""
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr ""
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr ""
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr ""
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1390,16 +1400,16 @@ msgstr ""
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr ""
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr ""
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr ""
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr ""
@@ -1441,19 +1451,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr ""
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr ""
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr ""
@@ -1495,7 +1499,7 @@ msgstr ""
 msgid "archive format"
 msgstr ""
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr ""
 
@@ -1505,9 +1509,9 @@ msgstr ""
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr ""
@@ -1537,7 +1541,7 @@ msgid "list supported archive formats"
 msgstr ""
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr ""
 
@@ -1545,7 +1549,7 @@ msgstr ""
 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr ""
@@ -1558,18 +1562,20 @@ msgstr ""
 msgid "Unexpected option --remote"
 msgstr ""
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
 msgstr ""
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr ""
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr ""
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1663,7 +1669,7 @@ msgstr ""
 msgid "could not create file '%s'"
 msgstr ""
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
@@ -1713,10 +1719,10 @@ msgstr ""
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1737,94 +1743,84 @@ msgstr ""
 msgid "cannot read blob %s for path %s"
 msgstr ""
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
+msgid "not setting branch '%s' as its own upstream"
 msgstr ""
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr ""
 
-#: branch.c:94
+#: branch.c:145
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgid "branch '%s' set up to track '%s'."
 msgstr ""
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgid "branch '%s' set up to track:"
 msgstr ""
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
 msgstr ""
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
 
-#: branch.c:110
+#: branch.c:252
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
+msgid "not tracking: ambiguous information for ref %s"
 msgstr ""
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr ""
-
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "'%s' is not a valid branch name"
 msgstr ""
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
+msgid "a branch named '%s' already exists"
 msgstr ""
 
-#: branch.c:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
+msgid "cannot force update the branch '%s' checked out at '%s'"
 msgstr ""
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr ""
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1836,27 +1832,28 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
+msgid "not a valid object name: '%s'"
 msgstr ""
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
+msgid "ambiguous object name: '%s'"
 msgstr ""
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
+msgid "not a valid branch point: '%s'"
 msgstr ""
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr ""
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr ""
@@ -1881,7 +1878,7 @@ msgstr ""
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -1940,7 +1937,7 @@ msgstr ""
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr ""
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr ""
@@ -1977,7 +1974,7 @@ msgstr ""
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr ""
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
@@ -2027,207 +2024,207 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr ""
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr ""
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr ""
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr ""
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr ""
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr ""
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr ""
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr ""
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr ""
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr ""
@@ -2249,27 +2246,27 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1239
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2328,7 +2325,7 @@ msgstr ""
 msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr ""
@@ -2479,144 +2476,144 @@ msgstr ""
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr ""
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr ""
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr ""
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr ""
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr ""
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr ""
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr ""
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr ""
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr ""
@@ -2785,7 +2782,7 @@ msgstr ""
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr ""
 
@@ -3073,596 +3070,598 @@ msgid ""
 "tree"
 msgstr ""
 
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
 msgstr ""
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr ""
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
 msgstr ""
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
 msgstr ""
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr ""
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr ""
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr ""
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr ""
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr ""
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr ""
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr ""
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr ""
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr ""
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr ""
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr ""
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr ""
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr ""
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr ""
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr ""
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr ""
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr ""
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr ""
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr ""
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr ""
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr ""
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr ""
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr ""
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr ""
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr ""
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr ""
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr ""
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr ""
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr ""
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr ""
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr ""
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr ""
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr ""
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr ""
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr ""
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr ""
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr ""
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr ""
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr ""
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr ""
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr ""
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr ""
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr ""
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr ""
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr ""
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr ""
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr ""
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr ""
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr ""
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr ""
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr ""
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr ""
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr ""
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr ""
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr ""
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr ""
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr ""
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr ""
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr ""
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr ""
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr ""
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr ""
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr ""
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr ""
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr ""
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr ""
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr ""
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr ""
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr ""
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr ""
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr ""
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr ""
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr ""
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr ""
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr ""
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr ""
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr ""
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr ""
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr ""
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr ""
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr ""
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3702,64 +3701,64 @@ msgstr ""
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr ""
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr ""
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr ""
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
@@ -3769,338 +3768,334 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr ""
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr ""
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr ""
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr ""
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr ""
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr ""
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr ""
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr ""
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr ""
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr ""
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr ""
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr ""
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr ""
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr ""
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr ""
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr ""
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr ""
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr ""
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr ""
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr ""
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr ""
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr ""
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
 msgstr ""
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
 msgstr ""
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr ""
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr ""
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr ""
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr ""
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr ""
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr ""
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr ""
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr ""
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
 msgstr ""
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr ""
@@ -4110,24 +4105,24 @@ msgstr ""
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr ""
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr ""
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr ""
@@ -4246,7 +4241,7 @@ msgstr ""
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
+msgid "Run '%s' instead [y/N]? "
 msgstr ""
 
 #: help.c:654
@@ -4441,7 +4436,7 @@ msgstr ""
 msgid "quoted CRLF detected"
 msgstr ""
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr ""
@@ -4633,14 +4628,14 @@ msgstr ""
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
 "of %s left in tree."
 msgstr ""
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4650,7 +4645,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
@@ -4662,7 +4657,7 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr ""
 
@@ -4921,7 +4916,7 @@ msgstr ""
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr ""
@@ -4930,8 +4925,8 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr ""
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr ""
@@ -4940,211 +4935,211 @@ msgstr ""
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr ""
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr ""
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr ""
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr ""
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr ""
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr ""
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr ""
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr ""
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr ""
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr ""
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr ""
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr ""
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr ""
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr ""
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr ""
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr ""
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr ""
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr ""
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr ""
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr ""
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr ""
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr ""
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr ""
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr ""
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr ""
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr ""
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr ""
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr ""
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr ""
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr ""
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr ""
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr ""
 
@@ -5199,257 +5194,257 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr ""
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr ""
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr ""
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr ""
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr ""
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr ""
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr ""
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr ""
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr ""
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr ""
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr ""
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr ""
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr ""
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr ""
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr ""
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr ""
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr ""
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
@@ -5561,25 +5556,25 @@ msgstr ""
 msgid "hash mismatch %s"
 msgstr ""
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr ""
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr ""
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr ""
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr ""
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr ""
@@ -5628,45 +5623,50 @@ msgstr ""
 msgid "could not write '%s' promisor file"
 msgstr ""
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr ""
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: packfile.c:1927
+#: packfile.c:1928
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr ""
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr ""
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr ""
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -5702,36 +5702,36 @@ msgstr ""
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr ""
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr ""
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -5739,7 +5739,7 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr ""
@@ -5763,17 +5763,17 @@ msgstr ""
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr ""
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr ""
 
@@ -5899,17 +5899,17 @@ msgstr ""
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr ""
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr ""
@@ -5960,7 +5960,7 @@ msgstr ""
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
@@ -5981,209 +5981,205 @@ msgstr ""
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr ""
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr ""
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr ""
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr ""
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr ""
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr ""
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr ""
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
@@ -6261,8 +6257,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6296,7 +6292,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr ""
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr ""
 
@@ -6335,7 +6331,8 @@ msgstr ""
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
@@ -6345,11 +6342,6 @@ msgstr ""
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6360,11 +6352,6 @@ msgstr ""
 msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6380,26 +6367,11 @@ msgstr ""
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr ""
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr ""
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6420,21 +6392,11 @@ msgstr ""
 msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr ""
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6456,14 +6418,9 @@ msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:844
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
 msgstr ""
 
 #: ref-filter.c:912
@@ -6476,16 +6433,6 @@ msgstr ""
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -6560,22 +6507,22 @@ msgstr ""
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr ""
@@ -6610,71 +6557,71 @@ msgstr ""
 msgid "invalid branch name: %s = %s"
 msgstr ""
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr ""
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
@@ -6684,50 +6631,50 @@ msgstr ""
 msgid "invalid refspec '%s'"
 msgstr ""
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr ""
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr ""
 
-#: remote.c:590
+#: remote.c:699
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: remote.c:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr ""
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr ""
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -6736,7 +6683,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -6750,7 +6697,7 @@ msgid ""
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -6758,7 +6705,7 @@ msgid ""
 "'%s:refs/heads/%s'?"
 msgstr ""
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -6766,7 +6713,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -6774,7 +6721,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -6782,114 +6729,114 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr ""
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr ""
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: remote.c:1757
+#: remote.c:1867
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr ""
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr ""
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -6897,11 +6844,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -6912,11 +6859,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr ""
@@ -6949,7 +6896,7 @@ msgstr ""
 msgid "there were errors while writing '%s' (%s)"
 msgstr ""
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr ""
@@ -6994,8 +6941,8 @@ msgstr ""
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr ""
@@ -7033,37 +6980,29 @@ msgstr ""
 msgid "could not determine HEAD revision"
 msgstr ""
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr ""
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr ""
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr ""
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr ""
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
@@ -7126,8 +7065,8 @@ msgstr ""
 msgid "could not delete '%s'"
 msgstr ""
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr ""
@@ -7175,13 +7114,13 @@ msgid ""
 "run \"git revert --abort\"."
 msgstr ""
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr ""
@@ -7191,12 +7130,18 @@ msgstr ""
 msgid "could not write eol to '%s'"
 msgstr ""
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr ""
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7211,7 +7156,7 @@ msgstr ""
 msgid "%s: fast-forward"
 msgstr ""
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
@@ -7242,8 +7187,8 @@ msgstr ""
 msgid "unable to dequote value of '%s'"
 msgstr ""
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr ""
@@ -7294,11 +7239,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7313,7 +7258,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7327,364 +7272,365 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr ""
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr ""
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr ""
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr ""
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr ""
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr ""
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr ""
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr ""
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr ""
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr ""
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr ""
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr ""
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr ""
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr ""
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr ""
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr ""
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr ""
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr ""
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr ""
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr ""
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr ""
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr ""
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr ""
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr ""
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr ""
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr ""
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr ""
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr ""
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr ""
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr ""
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr ""
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr ""
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr ""
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr ""
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr ""
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -7696,27 +7642,27 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr ""
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -7726,11 +7672,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: sequencer.c:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -7741,90 +7687,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr ""
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr ""
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr ""
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr ""
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr ""
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr ""
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr ""
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr ""
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr ""
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -7832,29 +7778,29 @@ msgid ""
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr ""
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr ""
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -7867,133 +7813,133 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr ""
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr ""
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr ""
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr ""
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 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:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr ""
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr ""
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr ""
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr ""
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr ""
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr ""
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr ""
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr ""
 
-#: setup.c:185
+#: setup.c:186
 #, 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 ""
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8001,12 +7947,12 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8014,122 +7960,122 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr ""
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:1257
+#: setup.c:1321
 #, 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:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr ""
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr ""
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr ""
@@ -8186,13 +8132,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr ""
@@ -8278,7 +8224,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr ""
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
@@ -8516,7 +8462,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr ""
 
@@ -8722,7 +8668,7 @@ msgstr ""
 msgid "Aborting."
 msgstr ""
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr ""
 
@@ -8742,98 +8688,105 @@ msgstr ""
 msgid "too-short tree file"
 msgstr ""
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, 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:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, 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:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, 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:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:142
 #, 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:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, 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:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, 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:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -8841,7 +8794,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -8849,47 +8802,47 @@ msgid ""
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, 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:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, 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:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -8897,14 +8850,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -8912,39 +8865,39 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr ""
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr ""
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 "colliding group is in the working tree:\n"
 msgstr ""
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr ""
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr ""
 
@@ -8981,99 +8934,99 @@ msgstr ""
 msgid "Fetching objects"
 msgstr ""
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr ""
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr ""
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ""
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ""
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ""
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr ""
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr ""
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr ""
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr ""
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr ""
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr ""
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr ""
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr ""
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr ""
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr ""
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr ""
 
@@ -9130,11 +9083,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr ""
 
@@ -9232,28 +9185,28 @@ msgstr ""
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9261,259 +9214,264 @@ msgid ""
 "You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr ""
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr ""
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr ""
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr ""
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr ""
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr ""
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr ""
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr ""
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr ""
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr ""
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9521,110 +9479,110 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr ""
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr ""
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr ""
@@ -9661,107 +9619,113 @@ msgstr ""
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr ""
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr ""
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr ""
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr ""
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr ""
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr ""
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
-#: builtin/add.c:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/add.c:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr ""
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr ""
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr ""
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr ""
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -9779,191 +9743,173 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
 "\"git config advice.addIgnoredFile false\""
 msgstr ""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr ""
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr ""
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr ""
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
 msgstr ""
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
 "\"git config advice.addEmptyPathspec false\""
 msgstr ""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr ""
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr ""
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr ""
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/am.c:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr ""
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1129
+#: builtin/am.c:1159
 #, c-format
-msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
 msgstr ""
 
-#: builtin/am.c:1224
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+#: builtin/am.c:1161
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
+#: builtin/am.c:1256
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr ""
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr ""
 
@@ -9971,46 +9917,64 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr ""
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr ""
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr ""
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr ""
+
+#: builtin/am.c:1922
 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:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10018,201 +9982,209 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr ""
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr ""
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
 msgstr ""
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr ""
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr ""
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr ""
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr ""
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr ""
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr ""
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr ""
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr ""
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr ""
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr ""
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr ""
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr ""
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
@@ -10651,11 +10623,11 @@ msgstr ""
 msgid "show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr ""
@@ -10704,7 +10676,7 @@ msgstr ""
 msgid "ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr ""
 
@@ -10756,7 +10728,7 @@ msgstr ""
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
@@ -10768,18 +10740,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr ""
 
@@ -10811,33 +10783,33 @@ msgstr ""
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr ""
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, 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:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr ""
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, 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:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr ""
 
@@ -10849,99 +10821,99 @@ msgstr ""
 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr ""
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr ""
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr ""
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr ""
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr ""
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr ""
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:516
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr ""
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -10949,215 +10921,211 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr ""
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
 msgstr ""
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr ""
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr ""
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr ""
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr ""
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr ""
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr ""
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr ""
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr ""
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr ""
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr ""
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr ""
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr ""
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr ""
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr ""
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr ""
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr ""
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr ""
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr ""
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr ""
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr ""
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr ""
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr ""
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
 msgstr ""
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11404,8 +11372,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -11463,10 +11431,10 @@ msgid "git checkout--worker [<options>]"
 msgstr ""
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr ""
 
@@ -11530,148 +11498,143 @@ msgstr ""
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr ""
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr ""
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr ""
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr ""
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr ""
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr ""
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr ""
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr ""
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -11686,7 +11649,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11703,26 +11666,26 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
 "Please use -- (and optionally --no-guess) to disambiguate"
 msgstr ""
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -11734,281 +11697,269 @@ msgid ""
 "checkout.defaultRemote=origin in your config."
 msgstr ""
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr ""
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr ""
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr ""
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr ""
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr ""
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
 msgstr ""
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
 msgstr ""
 
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr ""
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr ""
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr ""
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr ""
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr ""
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr ""
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr ""
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr ""
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr ""
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr ""
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr ""
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr ""
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr ""
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr ""
 
@@ -12042,7 +11993,15 @@ msgstr ""
 msgid "could not lstat %s\n"
 msgstr ""
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr ""
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr ""
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12051,7 +12010,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12064,33 +12023,33 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr ""
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12101,64 +12060,64 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/clean.c:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr ""
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr ""
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr ""
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr ""
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr ""
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr ""
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr ""
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr ""
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr ""
 
@@ -12214,19 +12173,20 @@ msgstr ""
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr ""
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr ""
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr ""
@@ -12243,7 +12203,7 @@ msgstr ""
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr ""
@@ -12252,7 +12212,7 @@ msgstr ""
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr ""
@@ -12261,17 +12221,17 @@ msgstr ""
 msgid "create a shallow clone since a specific time"
 msgstr ""
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr ""
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
@@ -12299,22 +12259,22 @@ msgstr ""
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr ""
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr ""
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr ""
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr ""
@@ -12403,21 +12363,17 @@ msgstr ""
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr ""
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr ""
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
+msgid "options '%s' and '%s %s' cannot be used together"
 msgstr ""
 
 #: builtin/clone.c:920
@@ -12425,7 +12381,7 @@ msgstr ""
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
@@ -12445,8 +12401,8 @@ msgstr ""
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr ""
@@ -12558,7 +12514,7 @@ msgid ""
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 msgstr ""
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr ""
 
@@ -12638,7 +12594,7 @@ msgstr ""
 msgid "Collecting commits from input"
 msgstr ""
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr ""
@@ -12654,7 +12610,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr ""
@@ -12677,13 +12633,13 @@ msgstr ""
 msgid "id of a parent commit object"
 msgstr ""
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr ""
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr ""
 
@@ -12691,7 +12647,7 @@ msgstr ""
 msgid "read commit log message from file"
 msgstr ""
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr ""
@@ -12753,10 +12709,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr ""
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr ""
@@ -12842,7 +12794,7 @@ msgstr ""
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
 msgstr ""
 
 #: builtin/commit.c:814 builtin/commit.c:830
@@ -12931,7 +12883,7 @@ msgstr ""
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
@@ -12946,15 +12898,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr ""
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
@@ -12965,308 +12913,307 @@ msgstr ""
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr ""
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr ""
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr ""
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr ""
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr ""
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr ""
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr ""
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr ""
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr ""
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr ""
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr ""
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr ""
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -13744,7 +13691,7 @@ msgstr ""
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
@@ -13760,24 +13707,13 @@ msgstr ""
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr ""
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr ""
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr ""
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
 msgstr ""
 
 #: builtin/diff-tree.c:157
@@ -13799,26 +13735,26 @@ msgstr ""
 msgid "%s...%s: no merge base"
 msgstr ""
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr ""
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr ""
@@ -13827,109 +13763,101 @@ msgstr ""
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr ""
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr ""
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr ""
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr ""
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr ""
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr ""
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr ""
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr ""
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr ""
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr ""
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr ""
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr ""
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr ""
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
@@ -13965,123 +13893,115 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr ""
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr ""
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr ""
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr ""
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr ""
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr ""
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr ""
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr ""
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr ""
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr ""
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr ""
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr ""
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr ""
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr ""
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr ""
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr ""
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr ""
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr ""
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr ""
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr ""
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr ""
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
@@ -14091,395 +14011,398 @@ msgstr ""
 msgid "Lockfile created but not reported: %s"
 msgstr ""
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr ""
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr ""
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr ""
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr ""
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr ""
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr ""
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr ""
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr ""
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr ""
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr ""
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr ""
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr ""
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr ""
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr ""
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr ""
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr ""
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr ""
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr ""
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr ""
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr ""
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr ""
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr ""
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
 msgstr ""
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr ""
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr ""
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr ""
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr ""
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr ""
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr ""
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr ""
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr ""
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr ""
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr ""
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr ""
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr ""
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr ""
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, 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:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr ""
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr ""
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
 msgstr ""
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr ""
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr ""
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr ""
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr ""
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
 msgstr ""
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr ""
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"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:1945
-msgid "You need to specify a tag name."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
 msgstr ""
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr ""
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr ""
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
 msgstr ""
 
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr ""
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
 msgstr ""
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr ""
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
 msgstr ""
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr ""
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 
@@ -14488,23 +14411,27 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr ""
 
@@ -14524,47 +14451,47 @@ msgstr ""
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr ""
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr ""
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr ""
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr ""
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr ""
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr ""
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr ""
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr ""
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
@@ -14713,124 +14640,124 @@ msgstr ""
 msgid "%s: object is of unknown type '%s': %s"
 msgstr ""
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr ""
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr ""
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr ""
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr ""
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr ""
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr ""
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr ""
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr ""
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr ""
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr ""
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr ""
@@ -14849,17 +14776,12 @@ msgstr ""
 msgid "failed to parse '%s' value '%s'"
 msgstr ""
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr ""
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr ""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -14869,257 +14791,257 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr ""
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr ""
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr ""
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr ""
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr ""
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr ""
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr ""
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr ""
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr ""
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr ""
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr ""
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr ""
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr ""
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr ""
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr ""
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr ""
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr ""
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr ""
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr ""
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr ""
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr ""
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr ""
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr ""
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr ""
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr ""
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr ""
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr ""
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr ""
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr ""
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr ""
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr ""
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr ""
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr ""
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr ""
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr ""
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr ""
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr ""
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr ""
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr ""
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr ""
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr ""
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr ""
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr ""
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr ""
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr ""
@@ -15483,71 +15405,71 @@ msgstr ""
 msgid "unrecognized help format '%s'"
 msgstr ""
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr ""
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr ""
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr ""
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr ""
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr ""
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr ""
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr ""
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr ""
 
@@ -15814,18 +15736,10 @@ msgstr ""
 msgid "unknown hash algorithm '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr ""
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr ""
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr ""
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr ""
@@ -15949,10 +15863,6 @@ msgstr ""
 msgid "specify the hash algorithm to use"
 msgstr ""
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr ""
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -16080,490 +15990,478 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr ""
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr ""
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr ""
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr ""
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr ""
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr ""
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr ""
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr ""
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr ""
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr ""
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr ""
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr ""
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr ""
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr ""
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr ""
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr ""
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr ""
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr ""
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr ""
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr ""
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr ""
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr ""
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr ""
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr ""
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr ""
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr ""
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr ""
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr ""
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr ""
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr ""
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr ""
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr ""
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr ""
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr ""
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr ""
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -16752,26 +16650,30 @@ msgid "use a diff3 based merge"
 msgstr ""
 
 #: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
+msgid "use a zealous diff3 based merge"
 msgstr ""
 
 #: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
+msgid "for conflicts, use our version"
 msgstr ""
 
 #: builtin/merge-file.c:41
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr ""
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr ""
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr ""
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 
@@ -16810,349 +16712,345 @@ msgstr ""
 msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr ""
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr ""
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr ""
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr ""
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr ""
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:829
+#: builtin/merge.c:831
 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"
 msgstr ""
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr ""
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr ""
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr ""
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -17194,7 +17092,7 @@ msgstr ""
 msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr ""
 
@@ -17256,7 +17154,7 @@ msgstr ""
 msgid "refs snapshot for selecting bitmap commits"
 msgstr ""
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -17353,52 +17251,52 @@ msgstr ""
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr ""
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr ""
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr ""
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr ""
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr ""
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr ""
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr ""
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr ""
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr ""
 
@@ -17511,25 +17409,25 @@ msgstr ""
 msgid "Write/edit the notes for the following object:"
 msgstr ""
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr ""
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr ""
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr ""
 
@@ -17538,7 +17436,7 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
@@ -17580,8 +17478,8 @@ msgstr ""
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr ""
 
@@ -17626,7 +17524,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
@@ -17742,17 +17640,17 @@ msgstr ""
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 
-#: builtin/notes.c:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -17760,41 +17658,41 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
-#: builtin/notes.c:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr ""
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr ""
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr ""
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
@@ -18176,10 +18074,6 @@ msgstr ""
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr ""
@@ -18196,7 +18090,7 @@ msgstr ""
 msgid "Enumerating objects"
 msgstr ""
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18232,19 +18126,19 @@ msgstr ""
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr ""
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr ""
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
@@ -18277,7 +18171,7 @@ msgstr ""
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr ""
 
@@ -18345,6 +18239,7 @@ msgid "<remote>"
 msgstr ""
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr ""
 
@@ -18373,13 +18268,13 @@ msgstr ""
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -18390,19 +18285,19 @@ msgid ""
 "invocation.\n"
 msgstr ""
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr ""
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr ""
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -18410,7 +18305,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -18421,23 +18316,23 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr ""
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr ""
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -18565,7 +18460,7 @@ msgstr ""
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr ""
 
@@ -18638,10 +18533,6 @@ msgstr ""
 msgid "request atomic transaction on remote side"
 msgstr ""
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr ""
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
@@ -18664,26 +18555,14 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr ""
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr ""
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr ""
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr ""
@@ -19072,18 +18951,6 @@ msgstr ""
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr ""
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr ""
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr ""
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr ""
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr ""
@@ -19138,7 +19005,7 @@ msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
+msgid "apply options and merge options cannot be used together"
 msgstr ""
 
 #: builtin/rebase.c:1476
@@ -19180,7 +19047,7 @@ msgid "no such branch/commit '%s'"
 msgstr ""
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
@@ -19248,7 +19115,7 @@ msgstr ""
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -19265,7 +19132,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -19277,12 +19144,12 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr ""
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
 msgstr ""
 
 #: builtin/reflog.c:17
@@ -19302,41 +19169,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr ""
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr ""
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr ""
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr ""
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr ""
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr ""
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr ""
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr ""
 
@@ -19424,6 +19291,11 @@ msgstr ""
 msgid "Updating %s"
 msgstr ""
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -19856,148 +19728,140 @@ msgstr ""
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr ""
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr ""
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr ""
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr ""
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr ""
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr ""
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr ""
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr ""
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr ""
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr ""
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr ""
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr ""
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr ""
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr ""
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr ""
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr ""
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr ""
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr ""
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr ""
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr ""
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr ""
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr ""
@@ -20075,169 +19939,163 @@ msgstr ""
 msgid "unable to open %s for reading"
 msgstr ""
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr ""
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr ""
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr ""
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr ""
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr ""
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr ""
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr ""
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr ""
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr ""
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr ""
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr ""
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr ""
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr ""
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr ""
 
@@ -20258,129 +20116,121 @@ msgstr ""
 msgid "unable to generate diff for '%s'"
 msgstr ""
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr ""
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr ""
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr ""
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr ""
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr ""
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr ""
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr ""
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr ""
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr ""
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr ""
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr ""
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr ""
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr ""
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr ""
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr ""
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr ""
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -20389,19 +20239,15 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr ""
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr ""
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr ""
@@ -20411,7 +20257,8 @@ msgid "rev-list does not support display of notes"
 msgstr ""
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
 msgstr ""
 
 #: builtin/rev-parse.c:409
@@ -20830,11 +20677,6 @@ msgstr ""
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr ""
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr ""
@@ -20855,19 +20697,19 @@ msgstr[1] ""
 msgid "no such ref %s"
 msgstr ""
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr ""
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr ""
@@ -20930,86 +20772,110 @@ msgstr ""
 msgid "git sparse-checkout list"
 msgstr ""
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr ""
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr ""
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr ""
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr ""
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr ""
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr ""
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr ""
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr ""
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr ""
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr ""
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr ""
 
-#: builtin/sparse-checkout.c:667
-msgid "read patterns from standard in"
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
 msgstr ""
 
 #: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
+msgid "git sparse-checkout add (--stdin | <patterns>)"
 msgstr ""
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr ""
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr ""
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr ""
 
@@ -21035,7 +20901,8 @@ msgstr ""
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
@@ -21043,7 +20910,8 @@ msgstr ""
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
 
@@ -21129,140 +20997,156 @@ msgstr ""
 msgid "Index was not unstashed."
 msgstr ""
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr ""
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr ""
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr ""
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr ""
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr ""
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr ""
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr ""
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr ""
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr ""
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr ""
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr ""
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr ""
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr ""
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr ""
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr ""
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr ""
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr ""
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr ""
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr ""
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr ""
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr ""
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr ""
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr ""
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr ""
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr ""
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr ""
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr ""
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr ""
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr ""
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr ""
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -21284,7 +21168,7 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
@@ -21305,7 +21189,7 @@ msgid ""
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr ""
 
@@ -21395,7 +21279,7 @@ msgstr ""
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr ""
 
@@ -21462,10 +21346,6 @@ msgstr ""
 msgid "could not fetch a revision for HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr ""
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -21494,58 +21374,58 @@ msgstr ""
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -21553,335 +21433,331 @@ msgid ""
 "'--reference-if-able' instead of '--reference'."
 msgstr ""
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr ""
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr ""
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
 "<url> --path <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
 "of that commit failed."
 msgstr ""
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr ""
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr ""
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr ""
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr ""
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr ""
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr ""
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr ""
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr ""
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr ""
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr ""
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr ""
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr ""
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr ""
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr ""
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr ""
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr ""
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr ""
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -21892,83 +21768,83 @@ msgid ""
 "option."
 msgstr ""
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr ""
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr ""
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr ""
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr ""
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr ""
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr ""
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr ""
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
@@ -22052,11 +21928,11 @@ msgid ""
 "want to.\n"
 msgstr ""
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -22065,15 +21941,15 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
@@ -22154,45 +22030,22 @@ msgstr ""
 msgid "print only tags of the object"
 msgstr ""
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr ""
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
@@ -22601,195 +22454,183 @@ msgstr ""
 msgid "initializing"
 msgstr ""
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr ""
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr ""
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr ""
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr ""
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr ""
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr ""
@@ -22829,9 +22670,9 @@ msgid ""
 "See 'git help git' for an overview of the system."
 msgstr ""
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
+msgid "no directory given for '%s' option\n"
 msgstr ""
 
 #: git.c:202
@@ -22839,11 +22680,6 @@ msgstr ""
 msgid "no namespace given for --namespace\n"
 msgstr ""
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr ""
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -22859,11 +22695,6 @@ msgstr ""
 msgid "no config key given for --config-env\n"
 msgstr ""
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr ""
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -22891,62 +22722,54 @@ msgstr ""
 msgid "recursive alias: %s"
 msgstr ""
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr ""
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr ""
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr ""
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr ""
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
 "\n"
 msgstr ""
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr ""
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr ""
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr ""
@@ -23219,6 +23042,170 @@ msgstr ""
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr ""
@@ -23243,36 +23230,36 @@ msgstr ""
 msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr ""
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr ""
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr ""
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr ""
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr ""
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr ""
 
@@ -23341,15 +23328,15 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr ""
 
 #: command-list.h:65
-msgid "Switch branches or restore working tree files"
+msgid "Ensures that a reference name is well formed"
 msgstr ""
 
 #: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
 msgstr ""
 
 #: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
 msgstr ""
 
 #: command-list.h:68
@@ -23545,55 +23532,55 @@ msgid "Add or parse structured information in commit messages"
 msgstr ""
 
 #: command-list.h:116
-msgid "The Git repository browser"
+msgid "Show commit logs"
 msgstr ""
 
 #: command-list.h:117
-msgid "Show commit logs"
+msgid "Show information about files in the index and the working tree"
 msgstr ""
 
 #: command-list.h:118
-msgid "Show information about files in the index and the working tree"
+msgid "List references in a remote repository"
 msgstr ""
 
 #: command-list.h:119
-msgid "List references in a remote repository"
+msgid "List the contents of a tree object"
 msgstr ""
 
 #: command-list.h:120
-msgid "List the contents of a tree object"
+msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
 #: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "Simple UNIX mbox splitter program"
 msgstr ""
 
 #: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
+msgid "Run tasks to optimize Git repository data"
 msgstr ""
 
 #: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
+msgid "Join two or more development histories together"
 msgstr ""
 
 #: command-list.h:124
-msgid "Join two or more development histories together"
+msgid "Find as good common ancestors as possible for a merge"
 msgstr ""
 
 #: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Run a three-way file merge"
 msgstr ""
 
 #: command-list.h:126
-msgid "Run a three-way file merge"
+msgid "Run a merge for files needing merging"
 msgstr ""
 
 #: command-list.h:127
-msgid "Run a merge for files needing merging"
+msgid "The standard helper program to use with git-merge-index"
 msgstr ""
 
 #: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
+msgid "Show three-way merge without touching index"
 msgstr ""
 
 #: command-list.h:129
@@ -23601,179 +23588,179 @@ msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
+msgid "Creates a tag object with extra validation"
 msgstr ""
 
 #: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+msgid "Build a tree-object from ls-tree formatted text"
 msgstr ""
 
 #: command-list.h:132
-msgid "Creates a tag object with extra validation"
+msgid "Write and verify multi-pack-indexes"
 msgstr ""
 
 #: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Move or rename a file, a directory, or a symlink"
 msgstr ""
 
 #: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Find symbolic names for given revs"
 msgstr ""
 
 #: command-list.h:135
-msgid "Find symbolic names for given revs"
+msgid "Add or inspect object notes"
 msgstr ""
 
 #: command-list.h:136
-msgid "Add or inspect object notes"
+msgid "Import from and submit to Perforce repositories"
 msgstr ""
 
 #: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
+msgid "Create a packed archive of objects"
 msgstr ""
 
 #: command-list.h:138
-msgid "Create a packed archive of objects"
+msgid "Find redundant pack files"
 msgstr ""
 
 #: command-list.h:139
-msgid "Find redundant pack files"
+msgid "Pack heads and tags for efficient repository access"
 msgstr ""
 
 #: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
+msgid "Compute unique ID for a patch"
 msgstr ""
 
 #: command-list.h:141
-msgid "Compute unique ID for a patch"
+msgid "Prune all unreachable objects from the object database"
 msgstr ""
 
 #: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
+msgid "Remove extra objects that are already in pack files"
 msgstr ""
 
 #: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
+msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
 #: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Update remote refs along with associated objects"
 msgstr ""
 
 #: command-list.h:145
-msgid "Update remote refs along with associated objects"
+msgid "Applies a quilt patchset onto the current branch"
 msgstr ""
 
 #: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
 #: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Reads tree information into the index"
 msgstr ""
 
 #: command-list.h:148
-msgid "Reads tree information into the index"
+msgid "Reapply commits on top of another base tip"
 msgstr ""
 
 #: command-list.h:149
-msgid "Reapply commits on top of another base tip"
+msgid "Receive what is pushed into the repository"
 msgstr ""
 
 #: command-list.h:150
-msgid "Receive what is pushed into the repository"
+msgid "Manage reflog information"
 msgstr ""
 
 #: command-list.h:151
-msgid "Manage reflog information"
+msgid "Manage set of tracked repositories"
 msgstr ""
 
 #: command-list.h:152
-msgid "Manage set of tracked repositories"
+msgid "Pack unpacked objects in a repository"
 msgstr ""
 
 #: command-list.h:153
-msgid "Pack unpacked objects in a repository"
+msgid "Create, list, delete refs to replace objects"
 msgstr ""
 
 #: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
+msgid "Generates a summary of pending changes"
 msgstr ""
 
 #: command-list.h:155
-msgid "Generates a summary of pending changes"
+msgid "Reuse recorded resolution of conflicted merges"
 msgstr ""
 
 #: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Reset current HEAD to the specified state"
 msgstr ""
 
 #: command-list.h:157
-msgid "Reset current HEAD to the specified state"
+msgid "Restore working tree files"
 msgstr ""
 
 #: command-list.h:158
-msgid "Restore working tree files"
+msgid "Lists commit objects in reverse chronological order"
 msgstr ""
 
 #: command-list.h:159
-msgid "Revert some existing commits"
+msgid "Pick out and massage parameters"
 msgstr ""
 
 #: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
 msgstr ""
 
 #: command-list.h:161
-msgid "Pick out and massage parameters"
+msgid "Remove files from the working tree and from the index"
 msgstr ""
 
 #: command-list.h:162
-msgid "Remove files from the working tree and from the index"
+msgid "Send a collection of patches as emails"
 msgstr ""
 
 #: command-list.h:163
-msgid "Send a collection of patches as emails"
+msgid "Push objects over Git protocol to another repository"
 msgstr ""
 
 #: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
+msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 
 #: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Common Git shell script setup code"
 msgstr ""
 
 #: command-list.h:166
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
 msgstr ""
 
 #: command-list.h:167
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
 msgstr ""
 
 #: command-list.h:168
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
 msgstr ""
 
 #: command-list.h:169
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
 msgstr ""
 
 #: command-list.h:170
-msgid "List references in a local repository"
+msgid "Show packed archive index"
 msgstr ""
 
 #: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
 msgstr ""
 
 #: command-list.h:172
-msgid "Common Git shell script setup code"
+msgid "Initialize and modify the sparse-checkout"
 msgstr ""
 
 #: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Add file contents to the staging area"
 msgstr ""
 
 #: command-list.h:174
@@ -23781,167 +23768,167 @@ msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
+msgid "Show the working tree status"
 msgstr ""
 
 #: command-list.h:176
-msgid "Show the working tree status"
+msgid "Remove unnecessary whitespace"
 msgstr ""
 
 #: command-list.h:177
-msgid "Remove unnecessary whitespace"
+msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: command-list.h:178
-msgid "Initialize, update or inspect submodules"
+msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
 #: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Switch branches"
 msgstr ""
 
 #: command-list.h:180
-msgid "Switch branches"
+msgid "Read, modify and delete symbolic refs"
 msgstr ""
 
 #: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
+msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 #: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 
 #: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
+msgid "Unpack objects from a packed archive"
 msgstr ""
 
 #: command-list.h:184
-msgid "Unpack objects from a packed archive"
+msgid "Register file contents in the working tree to the index"
 msgstr ""
 
 #: command-list.h:185
-msgid "Register file contents in the working tree to the index"
+msgid "Update the object name stored in a ref safely"
 msgstr ""
 
 #: command-list.h:186
-msgid "Update the object name stored in a ref safely"
+msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
 #: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Send archive back to git-archive"
 msgstr ""
 
 #: command-list.h:188
-msgid "Send archive back to git-archive"
+msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 
 #: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Show a Git logical variable"
 msgstr ""
 
 #: command-list.h:190
-msgid "Show a Git logical variable"
+msgid "Check the GPG signature of commits"
 msgstr ""
 
 #: command-list.h:191
-msgid "Check the GPG signature of commits"
+msgid "Validate packed Git archive files"
 msgstr ""
 
 #: command-list.h:192
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of tags"
 msgstr ""
 
 #: command-list.h:193
-msgid "Check the GPG signature of tags"
+msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Manage multiple working trees"
 msgstr ""
 
 #: command-list.h:195
-msgid "Show logs with difference each commit introduces"
+msgid "Create a tree object from the current index"
 msgstr ""
 
 #: command-list.h:196
-msgid "Manage multiple working trees"
+msgid "Defining attributes per path"
 msgstr ""
 
 #: command-list.h:197
-msgid "Create a tree object from the current index"
+msgid "Git command-line interface and conventions"
 msgstr ""
 
 #: command-list.h:198
-msgid "Defining attributes per path"
+msgid "A Git core tutorial for developers"
 msgstr ""
 
 #: command-list.h:199
-msgid "Git command-line interface and conventions"
+msgid "Providing usernames and passwords to Git"
 msgstr ""
 
 #: command-list.h:200
-msgid "A Git core tutorial for developers"
+msgid "Git for CVS users"
 msgstr ""
 
 #: command-list.h:201
-msgid "Providing usernames and passwords to Git"
+msgid "Tweaking diff output"
 msgstr ""
 
 #: command-list.h:202
-msgid "Git for CVS users"
+msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 
 #: command-list.h:203
-msgid "Tweaking diff output"
+msgid "Frequently asked questions about using Git"
 msgstr ""
 
 #: command-list.h:204
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "A Git Glossary"
 msgstr ""
 
 #: command-list.h:205
-msgid "Frequently asked questions about using Git"
+msgid "Hooks used by Git"
 msgstr ""
 
 #: command-list.h:206
-msgid "A Git Glossary"
+msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
 #: command-list.h:207
-msgid "Hooks used by Git"
+msgid "The Git repository browser"
 msgstr ""
 
 #: command-list.h:208
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Map author/committer names and/or E-Mail addresses"
 msgstr ""
 
 #: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
+msgid "Defining submodule properties"
 msgstr ""
 
 #: command-list.h:210
-msgid "Defining submodule properties"
+msgid "Git namespaces"
 msgstr ""
 
 #: command-list.h:211
-msgid "Git namespaces"
+msgid "Helper programs to interact with remote repositories"
 msgstr ""
 
 #: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
+msgid "Git Repository Layout"
 msgstr ""
 
 #: command-list.h:213
-msgid "Git Repository Layout"
+msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
 #: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
+msgid "Mounting one repository inside another"
 msgstr ""
 
 #: command-list.h:215
-msgid "Mounting one repository inside another"
+msgid "A tutorial introduction to Git"
 msgstr ""
 
 #: command-list.h:216
@@ -23949,7 +23936,7 @@ msgid "A tutorial introduction to Git: part two"
 msgstr ""
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
+msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 
 #: command-list.h:218
@@ -24021,39 +24008,39 @@ msgstr ""
 msgid "usage: $dashless $USAGE"
 msgstr ""
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
@@ -24121,7 +24108,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -24130,7 +24117,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -24139,7 +24126,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -24148,7 +24135,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -24157,7 +24144,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -24166,7 +24153,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -24175,7 +24162,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -24184,7 +24171,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -24193,7 +24180,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -24206,90 +24193,90 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -24300,103 +24287,103 @@ msgid ""
 "changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr ""
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
-#: git-send-email.perl:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr ""
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
 "Set sendemail.forbidSendmailVariables to false to disable this check.\n"
 msgstr ""
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
-#: git-send-email.perl:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -24406,29 +24393,29 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -24437,37 +24424,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr ""
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -24476,20 +24463,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
@@ -24497,16 +24484,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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -24523,112 +24510,112 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr ""
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr ""
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr ""
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr ""
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr ""
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -24636,25 +24623,25 @@ msgid ""
 "warning: no patches were sent\n"
 msgstr ""
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr ""
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
 "warning: no patches were sent\n"
 msgstr ""
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
diff --git a/po/id.po b/po/id.po
index c1afc2a32f..aa6f170b8e 100644
--- a/po/id.po
+++ b/po/id.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: 2021-11-10 08:55+0800\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
 "PO-Revision-Date: 2021-08-14 09:35+0700\n"
 "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
 "Language-Team: Indonesian\n"
@@ -22,8 +22,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "Huh (%s)"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "tidak dapat membaca indeks"
@@ -52,7 +52,7 @@ msgstr "Perbarui"
 msgid "could not stage '%s'"
 msgstr "tidak dapat menggelar '%s'"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "tidak dapat menulis indeks"
 
@@ -68,8 +68,8 @@ msgstr[1] "%d jalur diperbarui\n"
 msgid "note: %s is untracked now.\n"
 msgstr "catatan: %s sekarang tak terlacak.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry gagal untuk jalur '%s'"
@@ -110,21 +110,21 @@ msgstr[1] "%d jalur ditambahkan\n"
 msgid "ignoring unmerged: %s"
 msgstr "mengabaikan tak tergabung: %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Hanya berkas biner yang berubah.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Tidak ada perubahan.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Pembaruan tambalan"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Tinjau diff"
 
@@ -192,11 +192,11 @@ msgstr "pilih item bernomor"
 msgid "(empty) select nothing"
 msgstr "(empty) tidak pilih apapun"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Perintah ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Apa sekarang"
 
@@ -208,13 +208,13 @@ msgstr "tergelar"
 msgid "unstaged"
 msgstr "tak tergelar"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "jalur"
@@ -223,27 +223,27 @@ msgstr "jalur"
 msgid "could not refresh index"
 msgstr "tidak dapat menyegarkan indeks"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Sampai jumpa.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Gelar penambahan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? "
@@ -270,22 +270,22 @@ msgstr ""
 "a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
 "d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Stase penghapusan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Stase penambahan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? "
@@ -312,22 +312,22 @@ msgstr ""
 "a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
 "d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? "
@@ -354,22 +354,22 @@ msgstr ""
 "a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
 "d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? "
@@ -396,26 +396,26 @@ msgstr ""
 "a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
 "d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? "
@@ -442,22 +442,22 @@ msgstr ""
 "a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n"
 "d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? "
@@ -476,22 +476,22 @@ msgstr ""
 "a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n"
 "d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan perubahan mode ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penghapusan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan penambahan ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Terapkan bingkah ini ke indeks dan pohon kerja [y,n,q,a,d%s,?]? "
@@ -629,7 +629,7 @@ msgstr "'git apply --cached' gagal"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -640,11 +640,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Bingkah yang dipilih tidak diterapkan ke indeks!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Tetap terapkan itu ke pohon kerja? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Tidak ada yang diterapkan.\n"
 
@@ -682,11 +682,11 @@ msgstr "Tidak ada bingkah selanjutnya"
 msgid "No other hunks to goto"
 msgstr "Tidak ada bingkah lainnya untuk dikunjungi"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "pergi ke bingkah yang mana?"
 
@@ -706,7 +706,7 @@ msgstr[1] "Maaf, hanya %d bingkah yang tersedia."
 msgid "No other hunks to search"
 msgstr "Tidak ada bingkah lainnya untuk dicari"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "cari untuk regex? "
 
@@ -742,58 +742,62 @@ msgid ""
 "\n"
 "Disable this message with \"git config advice.%s false\""
 msgstr ""
+"\n"
+"Nonaktifkan pesan ini dengan \"git config advice.%s false\""
 
 #: advice.c:94
 #, c-format
 msgid "%shint: %.*s%s\n"
-msgstr ""
+msgstr "%shint: %.*s%s\n"
 
 #: advice.c:178
 msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr ""
+msgstr "Pemetikan ceri tidak mungkin sebab Anda punya berkas tak tergabung."
 
 #: advice.c:180
 msgid "Committing is not possible because you have unmerged files."
-msgstr ""
+msgstr "Pengkomitan tidak mungkin sebab Anda punya berkas tak tergabung."
 
 #: advice.c:182
 msgid "Merging is not possible because you have unmerged files."
-msgstr ""
+msgstr "Penggabungan tidak mungkin sebab Anda punya berkas tak tergabung."
 
 #: advice.c:184
 msgid "Pulling is not possible because you have unmerged files."
-msgstr ""
+msgstr "Penarikan tidak mungkin sebab Anda punya berkas tak tergabung."
 
 #: advice.c:186
 msgid "Reverting is not possible because you have unmerged files."
-msgstr ""
+msgstr "Pembalikkan tidak mungkin sebab Anda punya berkas tak tergabung."
 
 #: advice.c:188
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
-msgstr ""
+msgstr "Tidak mungkin untuk %s sebab Anda punya berkas tak tergabung."
 
 #: advice.c:196
 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 ""
+"Perbaiki di dalam pohon kerja, lalu gunakan 'git add/rm <berkas>'\n"
+"sebagaimana mestinya untuk menandai resolusi dan membuat sebuah komit."
 
 #: advice.c:204
 msgid "Exiting because of an unresolved conflict."
-msgstr ""
+msgstr "Keluar karena sebuah konflik tak terselesaikan."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr ""
+msgstr "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada)."
 
 #: advice.c:211
 msgid "Please, commit your changes before merging."
-msgstr ""
+msgstr "Mohon komit perubahan Anda sebelum menggabungkan."
 
 #: advice.c:212
 msgid "Exiting because of unfinished merge."
-msgstr ""
+msgstr "Keluar karena penggabungan belum selesai."
 
 #: advice.c:217
 msgid "Not possible to fast-forward, aborting."
@@ -806,6 +810,9 @@ msgid ""
 "outside of your sparse-checkout definition, so will not be\n"
 "updated in the index:\n"
 msgstr ""
+"Jalur dan/atau spek jalur berikut cocok dengan jalur yang ada\n"
+"di luar definisi checkout tipis Anda, jadi tidak akan diperbarui\n"
+"di dalam indeks:\n"
 
 #: advice.c:234
 msgid ""
@@ -813,6 +820,9 @@ msgid ""
 "* Use the --sparse option.\n"
 "* Disable or modify the sparsity rules."
 msgstr ""
+"Jika Anda berniat memperbarui entri tersebut, coba salah satu dari:\n"
+"* Gunakan opsi --sparse\n"
+"* Nonaktifkan atau modifikasi aturan kejarangan."
 
 #: advice.c:242
 #, c-format
@@ -836,14 +846,33 @@ msgid ""
 "false\n"
 "\n"
 msgstr ""
+"Catatan: berganti ke '%s'.\n"
+"\n"
+"Anda berada dalam keadaan 'HEAD terpisah'. Anda dapat melihat-lihat, membuat\n"
+"perubahan eksperimental and komit, dan Anda dapat membuang komit apa saja yang\n"
+"Anda buat di dalam keadaan ini tanpa mempengaruhi cabang apapun dengan bergantin"
+"kembali ke sebuah cabang.\n"
+"\n"
+"Jika Anda ingin membuat cabang baru untuk menyimpan komit yang Anda buat, Anda\n"
+"dapat melakukannya (sekarang atau nanti) dengan:\n"
+"\n"
+"  git switch -c <nama cabang baru>\n"
+"\n"
+"Atau batalkan operasi ini dengan:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Matikan saran ini dengan menyetel variabel konfigurasi advice.detachedHead ke "
+"false\n"
+"\n"
 
 #: alias.c:50
 msgid "cmdline ends with \\"
-msgstr ""
+msgstr "baris perintah diakhiri dengan \\"
 
 #: alias.c:51
 msgid "unclosed quote"
-msgstr ""
+msgstr "tanda kutip tak ditutup"
 
 #: apply.c:70
 #, c-format
@@ -855,21 +884,33 @@ msgstr "opsi spasi putih tidak dikenal '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opsi abai spasi putih tidak dikenal '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject dan --3way tidak dapat digunakan bersamaan."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way di luar repositori"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index di luar repositori"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached di luar repositori"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' di luar repositori"
 
 #: apply.c:800
 #, c-format
@@ -1081,8 +1122,8 @@ msgstr "tambalan gagal: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "tidak dapat men-checkout %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "gagal membaca %s"
@@ -1092,427 +1133,425 @@ msgstr "gagal membaca %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "membaca dari '%s' diluar tautan simbolik"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "jalus %s sudah dinamai ulang/dihapus"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: tidak ada di indeks"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: tidak cocok dengan indeks"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr ""
 "repositori kekurangan blob yang diperlukan untuk melakukan penggabungan 3 "
 "arah."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Melakukan penggabungan 3 arah...\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "tidak dapat membaca konten saat ini dari '%s'"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Gagal melakukan penggabungan 3 arah...\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Tambalan diterapkan ke '%s' dengan konflik.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tambalan diterapkan ke '%s' dengan rapi.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Mundur ke penerapan langsung...\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "tambalan penghapusan meninggalkan isi berkas"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: salah tipe"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s bertipe %o, diharapkan %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "jalur tidak valid '%s'"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: sudah ada di indeks"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: sudah ada di direktori kerja"
 
-#: apply.c:3998
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o)"
 
-#: apply.c:4003
+#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "mode baru (%o) dari %s tidak cocok dengan mode lama (%o) dari %s"
 
-#: apply.c:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "berkas yang terpengaruh '%s' diluar tautan simbolik"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: tambalan tak diterapkan"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Memeriksa tambalan %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "informasi sha1 kurang atau tidak berguna untuk submodul %s"
 
-#: apply.c:4141
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "perubahan mode untuk %s, yang bukan dalam HEAD saat ini"
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "informasi sha1 kurang atau tidak berguna (%s)"
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "tidak dapat menambahkan %s ke indeks sementara"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "tidak dapat menulis indeks sementara ke %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "tidak dapat menghapus %s dari indeks"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "tambalan rusak untuk submodul %s"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "tidak dapat men-stat berkas yang baru dibuat '%s'"
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "tidak dapat membuat simpanan pendukung untuk berkas yang baru dibuat %s"
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "tidak dapat menambahkan entri tembolok untuk %s"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gagal menulis ke '%s'"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "menutup berkas '%s'"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "tidak dapat menulis berkas '%s' mode %o"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tambalan %s diterapkan dengan rapi."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "kesalahan internal"
 
-#: apply.c:4581
+#: apply.c:4583
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Menerapkan tambalan %%s dengan %d penolakan..."
 msgstr[1] "Menerapkan tambalan %%s dengan %d penolakan..."
 
-#: apply.c:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "memotong nama berkas .rej ke %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "tidak dapat membuka %s"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Bingkah #%d diterapkan dengan rapi."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Bingkah #%d ditolak."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Tambalan '%s' dilewatkan."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "masukan tidak dikenal"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "tidak dapa membaca berkas indeks"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "tidak dapat membuka tambalan '%s': %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d kesalahan spasi putih dipadamkan"
 msgstr[1] "%d kesalahan spasi putih dipadamkan"
 
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d baris menambahkan kesalahan spasi putih."
 msgstr[1] "%d baris menambahkan kesalahan spasi putih."
 
-#: apply.c:4973
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
 msgstr[1] "%d baris diterapkan setelah memperbaiki kesalahan spasi putih."
 
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Tidak dapat menulis berkas indeks baru"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "jangan terapkan perubahan yang cocok dengan jalur yang diberikan"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "terapkan perubahan yang cocok dengan jalur yang diberikan"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "jumlah"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "hapus <jumlah> garis miring terkemuka dari jalur diff tradisional"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "abaikan penambahan yang dibuat oleh tambalan"
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "daripada menerapkan tambalan, keluarkan diffstat untuk masukan"
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "perlihatkan jumlah baris yang ditambahkan dan dihapuskan dalam notasi desimal"
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "daripada menerapkan tambalan, keluarkan ringkasan untuk masukan"
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "daripada menerapkan tambalan, lihat jika tambalan bisa diterapkan"
 
-#: apply.c:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "pastikan tambalan bisa diterapkan ke indeks saat ini"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "tandai berkas baru dengan `git add --intent-to-add`"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "terapkan sebuah tambalan tanpa menyentuh pohon kerja"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "terima sebuah tambalan yang menyentuh di luar area kerja"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "juga terapkan tambalan (gunakan dengan --stat/--summary/--check)"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "coba penggabungan tiga arah, mundur ke penambalan normal jika gagal"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "bangun sebuah indeks sementara berdasarkan informasi indeks tertanam"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "jalur dipisahkan dengan karakter NUL"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "pastikan setidaknya <n> baris dari konteks cocokan"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "aksi"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "deteksi baris baru atau yang diubah yang ada kesalahan spasi putih"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "abaikan perubahan spasi putih ketika menemukan konteks"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "terapkan tambalan terbalik"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "jangan harap setidaknya satu baris konteks"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "tinggalkan bingkah yang ditolak pada berkas *.rej yang bersesuaian"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "perbolehkan bingkah yang tumpang tindih"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "jadi berkata-kata"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerir baris baru hilang yang salah dideteksi pada akhir berkas"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "jangan percaya hitungan baris pada kepala bingkah"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "akar"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "tambahkan <akar> di depan semua nama berkas"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "jangan kembalikan kesalahan untuk tambalan kosong"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
-msgstr ""
+msgstr "tidak dapat mengaruskan blob %s"
 
 #: archive-tar.c:265 archive-zip.c:358
 #, c-format
 msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
+msgstr "mode berkas tidak didukung: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
-msgstr ""
+msgstr "tidak dapat memulai saringan '%s'"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
-msgstr ""
+msgstr "tidak dapat mengalihkan pendeskripsi"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
-msgstr ""
+msgstr "saringan '%s' melaporkan kesalahan"
 
 #: archive-zip.c:318
 #, c-format
 msgid "path is not valid UTF-8: %s"
-msgstr ""
+msgstr "jalur bukan UTF-8 valid: %s"
 
 #: archive-zip.c:322
 #, c-format
 msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
+msgstr "jalur terlalu panjang (%d karakter, SHA1: %s): %s"
 
 #: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
 #, c-format
 msgid "deflate error (%d)"
-msgstr ""
+msgstr "kesalahan deflasi (%d)"
 
 #: archive-zip.c:603
 #, c-format
 msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr ""
+msgstr "stempel waktu terlalu besar untuk sistem ini: %<PRIuMAX>"
 
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
@@ -1533,19 +1572,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <perintah>] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr "Tidak dapat membaca %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "tidak dapat membaca '%s'"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "spek jalur '%s' tidak cocok dengan berkas apapun"
@@ -1587,7 +1620,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "format arsip"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "prefiks"
 
@@ -1597,9 +1630,9 @@ msgstr "tambahkan prefiks di depan setiap nama jalur dalam arsip"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "berkas"
@@ -1629,7 +1662,7 @@ msgid "list supported archive formats"
 msgstr "daftar format arsip yang didukung"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "repositori"
 
@@ -1637,7 +1670,7 @@ msgstr "repositori"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "ambil arsip dari repositori remote <repo>"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "perintah"
@@ -1650,18 +1683,20 @@ msgstr "jalur ke perintah git-upload-archive remote"
 msgid "Unexpected option --remote"
 msgstr "Opsi --remote tak diharapkan"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "Opsi --exec hanya dapat digunakan bersamaan dengan --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "opsi `%s' butuh '%s'"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Opsi --output tak diharapkan"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Opsi --add-file dan --remote tidak dapat digunakan bersamaan"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1767,7 +1802,7 @@ msgstr "sebuah revisi %s diperlukan"
 msgid "could not create file '%s'"
 msgstr "tidak dapat membuat berkas '%s'"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "tidak dapat membaca berkas '%s'"
@@ -1820,10 +1855,10 @@ msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1846,94 +1881,94 @@ msgstr "tidak ada jalur seperti %s di %s"
 msgid "cannot read blob %s for path %s"
 msgstr "tidak dapat membaca blob %s untuk jalur %s"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
+"tidak dapat mewariskan konfigurasi pelacakan hulu banyak referensi ketika "
+"pendasaran ulang diminta"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr ""
+msgid "not setting branch '%s' as its own upstream"
+msgstr "tidak menyetel '%s' sebagai hulunya"
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
-msgstr ""
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "cabang '%s' disiapkan untuk melacak '%s' oleh pendasaran ulang."
 
-#: branch.c:94
+#: branch.c:145
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr ""
+msgid "branch '%s' set up to track '%s'."
+msgstr "cabang '%s' disiapkan untuk melacak '%s'."
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
+msgid "branch '%s' set up to track:"
+msgstr "cabang '%s' disiapkan untuk melacak:"
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr ""
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "tidak dapat menulis konfigurasi cabang hulu"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
+"\n"
+"Setelah memperbaiki penyebab kesalahan Anda dapat mencoba memperbaiki\n"
+"informasi pelacakan remote dengan menjalankan:"
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
+msgid "asked to inherit tracking from '%s', but no remote is set"
 msgstr ""
+"diminta mewariskan pelacakan dari '%s', tetapi tidak ada remote yang disetel"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
+"diminta mewariskan pelacakan dari '%s', tetapi tidak ada konfigurasi "
+"penggabungan yang disetel"
 
-#: branch.c:110
+#: branch.c:252
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr ""
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "tak melacak: informasi ambigu untuk referensi %s"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr ""
-
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr ""
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' bukan nama cabang valid"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr ""
+msgid "a branch named '%s' already exists"
+msgstr "sebuah cabang bernama '%s' sudah ada"
 
-#: branch.c:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr ""
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'"
 
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr ""
-
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
 msgstr ""
+"tidak dapat menyiapkan informasi pelacakan; titik awal '%s' bukan sebuah "
+"cabang"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
-msgstr ""
+msgstr "cabang hulu yang diminta '%s' tidak ada"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1945,30 +1980,31 @@ msgid ""
 "\"git push -u\" to set the upstream config as you push."
 msgstr ""
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr ""
+msgid "not a valid object name: '%s'"
+msgstr "bukan nama objek valid: '%s'"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr ""
+msgid "ambiguous object name: '%s'"
+msgstr "nama objek ambigu: '%s'"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr ""
+msgid "not a valid branch point: '%s'"
+msgstr "bukan sebuah titik cabang valid: '%s'"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
-msgstr ""
+msgstr "'%s' sudah di-checkout pada '%s'"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
-msgstr ""
+msgstr "HEAD dari pohon kerja %s tidak diperbarui"
 
 #: bundle.c:44
 #, c-format
@@ -1990,7 +2026,7 @@ msgstr "'%s' tidak terlihat seperti berkas bundel v2 atau v3"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "kepala tidak dikenal: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2049,7 +2085,7 @@ msgstr "versi bundle %d tidak didukung"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "tidak dapat menulis versi bundel %d dengan algoritma %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumen tidak dikenal: %s"
@@ -2086,7 +2122,7 @@ msgstr ""
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr ""
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
@@ -2136,207 +2172,207 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr ""
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr ""
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr ""
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr ""
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr ""
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr ""
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr ""
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr ""
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr ""
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr ""
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr ""
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr ""
@@ -2358,27 +2394,27 @@ msgid ""
 "\"git config advice.graftFileDeprecated false\""
 msgstr ""
 
-#: commit.c:1239
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr ""
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr ""
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr ""
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2442,7 +2478,7 @@ msgstr "kunci tidak berisi bagian: %s"
 msgid "key does not contain variable name: %s"
 msgstr "kunci tidak berisi nama variabel: %s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "kunci tidak valid: %s"
@@ -2596,144 +2632,144 @@ msgstr "core.commentChar harusnya hanya satu karakter"
 msgid "invalid mode for object creation: %s"
 msgstr "mode tidak valid untuk pembuatan objek: %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "nilai rusak untuk %s"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "nilai rusak untuk %s: %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "harus salah satu dari nothing, matching, simple, upstream atau current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "level kompresi pak jelek %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "gagal menguraikan %s"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "gagal menguraikan konfigurasi baris perintah"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s tidak valid: '%s'"
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "nilai splitIndex.maxPercentChange '%d' harusnya diantara 0 dan 100"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variabel konfigurasi '%s' jelek dalam berkas '%s' pada baris %d"
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nama bagian '%s' tidak valid"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s punya banyak nilai"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "gagal menulis berkas konfigurasi baru %s"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "tidak dapat mengunci berkas konfigurasi %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "membuka %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "pola tidak valid: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "berkas konfigurasi %s tidak valid"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat pada %s gagal"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "tidak dapat me-mmap '%s'%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod pada %s gagal"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "tidak dapat menulis berkas konfigurasi %s"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "tidak dapat menyetel '%s' ke '%s'"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "tidak dapat mem-batal setel '%s'"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nama bagian tidak valid: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "nilai hilang untuk '%s'"
@@ -2902,7 +2938,7 @@ msgstr ""
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr ""
 
@@ -3190,17 +3226,17 @@ msgid ""
 "tree"
 msgstr ""
 
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Gagal mengurai persentase potongan dirstat '%s'\n"
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Parameter dirstat tidak ditketahui '%s'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3208,7 +3244,7 @@ msgstr ""
 "Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
 "'dimmed-zebra', 'plain'"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3218,7 +3254,7 @@ msgstr ""
 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3226,12 +3262,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change tidak dapat digabungkan dengan mode "
 "spasi yang lainnya"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3240,49 +3276,51 @@ msgstr ""
 "Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff eksternal mati, berhenti pada %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check dan -s saling eksklusif"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S dan --find-object saling eksklusif"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr ""
-"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S"
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s'"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
-"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
-"dengan -G dan -S"
+"opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' "
+"dan '%s'"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow butuh tepatnya satu spek jalur"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "nilai --stat tidak valid: %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s harap nilai numerik"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3291,42 +3329,42 @@ msgstr ""
 "Gagal menguraikan parameter opsi --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "tidak dapat menguraikan '%s'"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s butuh bentuk <n>/<m>"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s butuh sebuah karakter, dapat '%s'"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argumen --color-moved jelek: %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode tidak valid '%s' dalam --color-moved-ws"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3334,162 +3372,162 @@ msgstr ""
 "opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
 "\"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argumen tidak valid ke %s"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "regex tidak valid diberikan ke -I: '%s'"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "argumen --word-diff jelek: %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Opsi format keluaran diff"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "buat tambalan"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "sembunyikan keluaran diff"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "buat diff dengan <n> baris konteks"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "buat diff dalam format mentah"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "sinonim untuk '-p --raw'"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "sinonim untuk '-p --stat'"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "--stat yang ramah mesin"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "keluarkan hanya baris terakhir --stat"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<parameter 1,parameter 2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinonim untuk --dirstat=cumulative"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinonim untuk --dirstat=files,param1,param2..."
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "perlihatkan hanya nama berkas yang berubah"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "perlihatkan hanya nama dan status berkas yang berubah"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "buat diffstat"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<lebar>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "buat diffstat dengan lebar yang diberikan"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "buat diffstat dengan nama lebar yang diberikan"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "buat diffstat dengan lebar grafik yang diberikan"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<hitungan>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "buat diffstat dengan baris yang terbatas"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "buat ringkasan singkat dalam diffstat"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "keluarkan diff biner yang dapat diterapkan"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "perlihatkan objek pra- dan pasca-citra penuh pada baris \"index\""
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "perlihatkan diff berwarna"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<tipe>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 "soroti kesalahan spasi dalam baris 'context', 'old' atau 'new' dalam diff"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3497,91 +3535,91 @@ msgstr ""
 "jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
 "pada --raw atau --numstat"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<prefiks>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "perlihatkan prefiks tujuan daripada \"b/\""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "perlihatkan konteks diantara bingkah diff hingga jumlah baris yang disebutkan"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<karakter>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "sebutkan karakter yang menandai konteks daripada ' '"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Opsi penamaan ulang diff"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
 "pembuatan"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "deteksi penamaan ulang"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "lewati pracitra untuk penghapusan"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "deteksi penyalinan"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr ""
 "gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "nonaktifkan deteksi penamaan ulang"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3589,232 +3627,232 @@ msgstr ""
 "cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
 "ulang/penyalinan melebihi batas yang diberikan"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Opsi algoritma diff"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "abaikan spasi saat membandingkan baris"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "abaikan perubahan dalam jumlah spasi"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "abaikan perubahan spasi pada EOL"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "abaikan kembalian-kurir pada akhir baris"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "abaikan perubahan yang semua baris kosong"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "heuristik untuk geser perbatasan bingkah diff untuk pembacaan yang mudah"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "buat diff menggunakan algoritma \"diff sabar\""
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "buat diff menggunakan algoritma \"diff histogram\""
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algoritma>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "pilih algoritma diff"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<teks>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "gunakan <regex> untuk menentukan apa itu kata"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "baris kode yang berpindah diwarnai berbeda"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "bagaimana spasi diabaikan di --color-moved"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Opsi diff yang lainnya"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "ketika dijalankan dari subdirektori, kecualikan perubahan diluar dan "
 "perlihatkan jalur relatif"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "perlakukan semua berkas sebagai teks"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "tukar dua masukkan, balikkan diff"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "nonaktifkan semua keluaran program"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<kapan>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "abaikan perubahan submodul dalam pembuatan diff"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "sembunyikan entri 'git add -N' dari indeks"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<untai>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "cari perbedaan yang mengubah jumlah kemunculan untai yang disebutkan"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "cari perbedaan yang mengubah jumlah kemunculan regex yang disebutkan"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "kontrol urutan berkas yang muncul dalam keluaran"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<jalur>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "lewati keluaran ke jalur yang disebutkan"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<id objek>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "cari perubahan yang mengubah jumlah kemunculan objek yang disebutkan"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "pilih berkas oleh tipe diff"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<berkas>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Keluarkan ke berkas yang disebutkan"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "hanya ditemukan salinan dari jalur yang berubah karena terlalu banyak berkas."
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3856,29 +3894,29 @@ msgstr ""
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr ""
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -3886,36 +3924,36 @@ msgstr ""
 "Nama direktori tidak dapat ditebak.\n"
 "Mohon sebutkan direktori pada baris perintah"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr ""
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
@@ -3925,273 +3963,269 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: daftar dangkal diharapkan"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: sebuah paket bilasan diharapkan setelah daftar dangkal"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: ACK/NAK diharapkan, dapat paket bilasan"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK diharapkan, dapat '%s'"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "tidak dapat menulis ke remote"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc memerlukan multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "baris dangkal tidak valid: %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "baris dangkal-balik tidak valid: %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "object tidak ditemukan: %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "kesalahan dalam objek: %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "tidak ada dangkal yang ditemukan: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "dangkal/dangkal-balik diharapkan, dapat %s"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "dapat %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "komit tidak valid %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "menyerah"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "selesai"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "dapat %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Menandai %s sebagai lengkap"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "sudah punya %s (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: tidak dapat menggarpu pemultipleks-balik pita samping"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "kesalahan protokol: kepala pak jelek"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: tidak dapat menggarpu %s"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: keluaran index-pack tidak valid"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s gagal"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "kesalahan dalam pemultipleks-balik pita samping"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versi peladen %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Peladen mendukung %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Peladen tidak mendukung klien dangkal"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Peladen tidak mendukung --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Peladen tidak mendukung --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Peladen tidak mendukung --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Peladen tidak mendukung objek format repositori ini"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "tidak ada komit umum"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "repositori sumber dangkal, menolak mengkloning."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: pengambilan gagal."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "algoritma tidak cocok: klien %s; peladen %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "peladen tidak mendukung algoritma '%s'"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Peladen tidak mendukung permintaan dangkal"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Peladen mendukung saringan"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "tidak dapat menulis permintaan kepada remote"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "kesalahan membaca kepala seksi '%s'"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "diharapkan '%s', diterima '%s'"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "baris pengakuan tidak diharapkan: %s"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "kesalahan memproses ack: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "berkas pak diharapkan dikirim setelah 'ready'"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "tidak ada seksi lainnya yang diharapkan dikirim setelah tidak ada 'ready'"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "gagal memproses info dangkal: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref diharapkan, dapat '%s'"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref tidak diharapkan: '%s'"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "kesalahan memproses referensi yang diminta: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: paket jawaban akhir diharapkan"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "tidak ada kepala remote yang cocok"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "remote tidak mengirim semua objek yang dibutuhkan"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "'ready' tidak diharapkan dari remote"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "tidak ada referensi remote seperti %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Peladen tidak memperbolehkan permintaan untuk objek tak diiklankan %s"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "tidak dapat membuat berkas sementara"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "gagal menulis tandatangan terlepas ke '%s'"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4199,7 +4233,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile perlu dikonfigurasi dan ada untuk verifikasi "
 "tandatangan ssh"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4207,57 +4241,57 @@ msgstr ""
 "ssh-keygen -Y find-principals/verify diperlukan untuk verifikasi tandatangan "
 "ssh (tersedia di openssh versi 8.2p1+)"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr ""
 "berkas pencabutan penandatanganan ssh terkonfigurasi tapi tidak ada: %s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "tanda tangan '%s' jelek/tidak kompatibel"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "gagal mendapatkan sidik jari ssh untuk kunci '%s'"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 "baik user.signingkey atau gpg.ssh.defaultKeyCommand perlu dikonfigurasi"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand sukses tapi tidak mengembalikan kunci: %s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg gagal menandatangani data"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "user.signingkey perlu disetel untuk penandatanganan ssh"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "gagal menulis kunci penandatanganan ssh ke '%s'"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "gagal menulis penyangga kunci penandatanganan ssh ke '%s'"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4265,7 +4299,7 @@ msgstr ""
 "ssh-keygen -Y sign diperlukan untuk penandatanganan ssh (tersedia di "
 "openssh  versi 8.2p1+)"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
@@ -4275,7 +4309,7 @@ msgstr "gagal membaca penyangga data penandatanganan ssh dari '%s'"
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "warna tidak valid '%.*s' diabaikan di log.graphColors"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4283,18 +4317,18 @@ msgstr ""
 "pola yang diberikan berisi bita NULL (via -f <berkas>). Hal ini hanya "
 "didukung dengan -P di bawah PCRE v2"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': tidak dapat membaca %s"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "gagal men-stat '%s'"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': baca pendek"
@@ -4415,7 +4449,7 @@ msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
+msgid "Run '%s' instead [y/N]? "
 msgstr ""
 
 #: help.c:654
@@ -4618,7 +4652,7 @@ msgstr ""
 msgid "quoted CRLF detected"
 msgstr ""
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr ""
@@ -4810,14 +4844,14 @@ msgstr ""
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
 "of %s left in tree."
 msgstr ""
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4827,7 +4861,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr ""
@@ -4839,7 +4873,7 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Sudah terbaru."
 
@@ -5098,7 +5132,7 @@ msgstr ""
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr ""
@@ -5107,8 +5141,8 @@ msgstr ""
 msgid "failed to read the cache"
 msgstr "gagal membaca tembolok"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "gagal menulis berkas indeks baru"
@@ -5117,212 +5151,214 @@ msgstr "gagal menulis berkas indeks baru"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "OID kipas-keluar indeks multipak salah ukuran"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "berkas indeks multipak %s terlalu kecil"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
-msgstr "tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
+msgstr ""
+"tanda tangan indeks multipak 0x%08x tidak cocok dengan tanda tangan 0x%08x"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "versi indeks multipak %d tidak dikenal"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "versi hash indeks multipak %u tidak cocok dengan versi %u"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "indeks multipak kehilangan bingkah pack-name yang diperlukan"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "indeks multipak kehilangan bingkah OID kipas keluar yang diperlukan"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "indeks multipak kehilangan bingkah pencarian OID yang diperlukan"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "indeks multipak kehilangan bingkah offset objek yang diperlukan"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "nama pak indeks multipak tidak berurutan: '%s' sebelum '%s'"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "pack-int-id jelek: %u (total pak %u)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "indeks multipak simpan offset 64-bit, tapi off_t terlalu kecil"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "gagal menambah berkas pak '%s'"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "gagal membuka indeks pak '%s'"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "gagal melokasi objek %d di dalam berkas pak"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "tidak dapat menyimpan berkas indeks balik"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "tidak dapat menguraikan baris: %s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "baris jelek '%s'."
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr "abaikan indeks multipak yang sudah ada; checksum tidak cocok"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "tidak dapat memuat pak"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "tidak dapat membuka indeks untuk %s"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Menambahkan berkas pak ke indeks multipak"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "pak yang disukai tidak dikenal: '%s'"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "tidak dapat memilih pak yang disukai %s tanpa objek"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "tidak melihat berkas pak %s untuk dijeblokkan"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "pak yang disukai '%s' kadaluarsa"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "tidak ada berkas pak untuk diindeks."
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "tidak dapat menulis bitmap multipak"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "gagal menulis indeks multipak"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "gagal menghapus %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "gagal membersihkan indeks multipak pada %s"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "berkas indeks multipak ada, tetapi gagal diurai"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "checksum salah"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Mencari berkas pak yang direferensikan"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
-"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = fanout[%d]"
+"kipas-keluar oid tidak berurutan: fanout[%d] =%<PRIx32> > %<PRIx32> = "
+"fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx tidak berisi oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Memverifikasi urutan OID di dalam indeks multipak"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "urutan pencarian oid tidak berurutan: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Mengurutkan objek oleh berkas pak"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Memverifikasi offset objek"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "gagal memuat entri pak untuk oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "gagal memuat indeks pak untuk berkas pak %s"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset objek salah untuk oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Menghitung objek tereferensi"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Mencari dan menghapus berkas pak tak tereferensi"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "tidak dapat memulai pack-objects"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "tidak dapat menyelesaikan pack-objects"
 
@@ -5377,257 +5413,257 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr ""
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr ""
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr ""
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr ""
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr ""
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr ""
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr ""
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr ""
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr ""
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr ""
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr ""
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr ""
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr ""
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr ""
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr ""
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr ""
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr ""
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr ""
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr ""
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr ""
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr ""
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr ""
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "tidak dapat membuka %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr ""
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
@@ -5739,25 +5775,25 @@ msgstr ""
 msgid "hash mismatch %s"
 msgstr ""
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr ""
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr ""
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr ""
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr ""
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr ""
@@ -5806,45 +5842,50 @@ msgstr ""
 msgid "could not write '%s' promisor file"
 msgstr ""
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr ""
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: packfile.c:1927
+#: packfile.c:1928
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr ""
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr ""
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr ""
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr ""
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr ""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -5880,36 +5921,36 @@ msgstr ""
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr ""
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr ""
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -5917,7 +5958,7 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr ""
@@ -5941,17 +5982,17 @@ msgstr ""
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr ""
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr ""
 
@@ -6077,17 +6118,17 @@ msgstr ""
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr ""
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr ""
@@ -6138,7 +6179,7 @@ msgstr ""
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
@@ -6159,209 +6200,205 @@ msgstr ""
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr ""
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr ""
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr ""
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr ""
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr ""
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr ""
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr ""
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr ""
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr ""
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
@@ -6372,8 +6409,8 @@ msgid ""
 "continue'.\n"
 "Or you can abort the rebase with 'git rebase --abort'.\n"
 msgstr ""
-"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan 'git "
-"rebase --continue'.\n"
+"Anda dapat memperbaiki ini dengan 'git rebase --edit-todo' lalu jalankan "
+"'git rebase --continue'.\n"
 "Atau Anda dapat membatalkan pendasaran ulang dengan 'git rebase --abort'.\n"
 
 #: rebase-interactive.c:33
@@ -6415,10 +6452,12 @@ msgstr ""
 "s, squash <komit> = gunakan komit, tapi lebur ke komit sebelumnya\n"
 "f, fixup [-C | -c] <komit> = seperti \"squash\" tapi hanya pertahankan\n"
 "                   pesan komit sebelumnya, kecuali -C digunakan, dimana\n"
-"                   hanya pertahankan pesan komit ini; -c sama dengan -C tapi\n"
-"                   buka penyunting"
-"x, exec <perintah> = jalankan perintah (sisa baris) menggunakan cangkang\n"
-"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git rebase --continue')\n"
+"                   hanya pertahankan pesan komit ini; -c sama dengan -C "
+"tapi\n"
+"                   buka penyuntingx, exec <perintah> = jalankan perintah "
+"(sisa baris) menggunakan cangkang\n"
+"b, break = berhenti disini (lanjutkan pendasaran ulang nanti dengan 'git "
+"rebase --continue')\n"
 "d, drop <komit> = hapus komit\n"
 "l, label <label> = tandai HEAD saat ini dengan nama\n"
 "t, reset <label> = setel ulang HEAD ke sebuah label\n"
@@ -6442,7 +6481,8 @@ msgid ""
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr ""
 "\n"
-"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus komit.\n"
+"Jangan hapus baris apapun. Gunakan 'drop' secara eksplisit untuk menghapus "
+"komit.\n"
 
 #: rebase-interactive.c:78
 msgid ""
@@ -6461,7 +6501,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang sedang berjalan.\n"
+"Anda sedang menyunting berkas todo dari pendasaran ulang interaktif yang "
+"sedang berjalan.\n"
 "Untuk melanjutkan pendasaran ulang setelah menyunting, jalankan:\n"
 "    git rebase --continue\n"
 "\n"
@@ -6473,11 +6514,12 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan dibatalkan.\n"
+"Bagaimanapun, jika Anda menghapus semuanya, pendasaran ulang akan "
+"dibatalkan.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6507,7 +6549,8 @@ msgid ""
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
-"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit eksplisit.\n"
+"Untuk menghindari pesan ini, gunakan \"drop\" untuk menghapus sebuah komit "
+"eksplisit.\n"
 "Gunakan 'git config rebase.missingCommitsCheck untuk' mengganti tingkat "
 "peringatan.\n"
 "Kelakuan yang mungkin adalah: ignore, warn, error.\n"
@@ -6518,7 +6561,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s: 'preserve' digantikan oleh 'merges'"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr ""
 
@@ -6557,7 +6600,8 @@ msgstr ""
 msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
@@ -6567,11 +6611,6 @@ msgstr ""
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr ""
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6582,11 +6621,6 @@ msgstr ""
 msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr ""
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6602,26 +6636,11 @@ msgstr ""
 msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr ""
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr ""
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr ""
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr ""
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6642,21 +6661,11 @@ msgstr ""
 msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr ""
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr ""
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6678,14 +6687,9 @@ msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:844
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr ""
-
-#: ref-filter.c:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
 msgstr ""
 
 #: ref-filter.c:912
@@ -6698,16 +6702,6 @@ msgstr ""
 msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr ""
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr ""
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -6782,22 +6776,22 @@ msgstr ""
 msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr ""
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr ""
@@ -6832,71 +6826,71 @@ msgstr ""
 msgid "invalid branch name: %s = %s"
 msgstr ""
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr ""
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr ""
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr ""
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr ""
@@ -6906,50 +6900,50 @@ msgstr ""
 msgid "invalid refspec '%s'"
 msgstr ""
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
 
-#: remote.c:590
+#: remote.c:699
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "tidak dapat mengambil baik %s dan %s ke %s"
 
-#: remote.c:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s biasanya melacak %s, bukan %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s melacak baik %s dan %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "kunci '%s' dari pola tidak ada '*'"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "nilai '%s' dari pola tidak ada '*'"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "spek referensi sumber %s tidak cocok dengan apapun"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
@@ -6958,7 +6952,7 @@ msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -6982,7 +6976,7 @@ msgstr ""
 "Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
 "penuh referensi."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -6993,7 +6987,7 @@ msgstr ""
 "Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
 "'%s:refs/heads/%s'?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7004,7 +6998,7 @@ msgstr ""
 "Apakah maksud Anda buat tag baru dengan mendorong ke\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7015,7 +7009,7 @@ msgstr ""
 "Apakah maksud Anda tag pohon dengan mendorong ke\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7026,114 +7020,114 @@ msgstr ""
 "Apakah maksud Anda tag blob baru dengan mendorong ke\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s tidak dapat diselesaikan ke cabang"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "referensi tujuan %s menerima dari lebih dari satu sumber"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD tidak menunjuk ke cabang"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "tidak ada cabang seperti: '%s'"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote"
 
-#: remote.c:1757
+#: remote.c:1867
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal"
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "cabang '%s' tidak ada remote untuk didorong"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "tidak dapat menemukan referensi remote %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Abaikan referensi lucu '%s' secara lokal"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Cabang Anda mutakhir dengan '%s'.\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (gunakan \"%s\" untuk selengkapnya)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7141,11 +7135,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7156,11 +7150,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
@@ -7193,7 +7187,7 @@ msgstr "tidak dapat menulis rekaman rerere"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "ada kesalahan saat menulis '%s' (%s)"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "gagal membilas '%s'"
@@ -7238,8 +7232,8 @@ msgstr "tidak dapat batal taut simpangan '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "Pracitra direkam untuk '%s'"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "tidak dapat membuat direktori '%s'"
@@ -7277,37 +7271,29 @@ msgstr "tidak dapat membuka direktori rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "tidak dapat menentukan revisi HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "gagal menemukan pohon %s"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr ""
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr ""
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr ""
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr ""
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr ""
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
@@ -7365,41 +7351,43 @@ msgstr "ujung penerima tidak mendukung opsi dorong"
 #: sequencer.c:197
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
-msgstr ""
+msgstr "mode pembersihan pesan komit tidak valid '%s'"
 
 #: sequencer.c:325
 #, c-format
 msgid "could not delete '%s'"
-msgstr ""
+msgstr "tidak dapat menghapus '%s'"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
-msgstr ""
+msgstr "tidak dapat menghapus '%s'"
 
 #: sequencer.c:355
 msgid "revert"
-msgstr ""
+msgstr "balik"
 
 #: sequencer.c:357
 msgid "cherry-pick"
-msgstr ""
+msgstr "petik ceri"
 
 #: sequencer.c:359
 msgid "rebase"
-msgstr ""
+msgstr "dasar ulang"
 
 #: sequencer.c:361
 #, c-format
 msgid "unknown action: %d"
-msgstr ""
+msgstr "aksi tidak dikenal: %d"
 
 #: sequencer.c:420
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
+"setelah menyelesaikan konflik, tandai jalur yang terkoreksi\n"
+"dengan 'git add <jalur>' atau 'git rm <jalur>'"
 
 #: sequencer.c:423
 msgid ""
@@ -7410,6 +7398,12 @@ msgid ""
 "To abort and get back to the state before \"git cherry-pick\",\n"
 "run \"git cherry-pick --abort\"."
 msgstr ""
+"Setelah menyelesaikan konflik, tandai dengan\n"
+"\"git add/rm <spek jalur\", lalu jalankan\n"
+"\"git cherry-pick --continue\".\n"
+"Atau Anda dapat melewati komit ini dengan \"git cherry-pick --skip\".\n"
+"Untuk membatalkan dan kembali ke keadaan sebelum \"git cherry-pick\",\n"
+"jalankan \"git cherry-pick --abort\"."
 
 #: sequencer.c:430
 msgid ""
@@ -7420,47 +7414,59 @@ msgid ""
 "To abort and get back to the state before \"git revert\",\n"
 "run \"git revert --abort\"."
 msgstr ""
+"Setelah menyelesaikan konflik, tandai dengan\n"
+"\"git add/rm <spek jalur>\", lalu jalankan\n"
+"\"git revert --continue\".\n"
+"Atau Anda dapat melewati komit ini dengan \"git revert --skip\".\n"
+"Untuk membatalkan dan kembali ke keadaan sebelum \"git revert\",\n"
+"jalankan \"git revert --abort\"."
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
-msgstr ""
+msgstr "tidak dapat mengunci '%s'"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
-msgstr ""
+msgstr "tidak dapat menulis ke '%s'"
 
 #: sequencer.c:455
 #, c-format
 msgid "could not write eol to '%s'"
-msgstr ""
+msgstr "tidak dapat menulis akhir baris ke '%s'"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
-msgstr ""
+msgstr "gagal mengakhiri '%s'"
+
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "tidak dapat membaca '%s'"
 
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
-msgstr ""
+msgstr "perubahan lokal Anda akan ditimpa oleh %s."
 
 #: sequencer.c:503
 msgid "commit your changes or stash them to proceed."
-msgstr ""
+msgstr "komit perubahan Anda atau stase untuk melanjutkan."
 
 #: sequencer.c:535
 #, c-format
 msgid "%s: fast-forward"
-msgstr ""
+msgstr "%s: maju-cepat"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
-msgstr ""
+msgstr "Mode pembersihan tidak valid %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
 #. "rebase".
@@ -7468,60 +7474,60 @@ msgstr ""
 #: sequencer.c:685
 #, c-format
 msgid "%s: Unable to write new index file"
-msgstr ""
+msgstr "%s: Tidak dapat menulis berkas indeks baru"
 
 #: sequencer.c:699
 msgid "unable to update cache tree"
-msgstr ""
+msgstr "tidak dapat memperbarui pohon tembolok"
 
 #: sequencer.c:713
 msgid "could not resolve HEAD commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit HEAD"
 
 #: sequencer.c:793
 #, c-format
 msgid "no key present in '%.*s'"
-msgstr ""
+msgstr "tidak ada kunci yang ada di pada '%.*s'"
 
 #: sequencer.c:804
 #, c-format
 msgid "unable to dequote value of '%s'"
-msgstr ""
+msgstr "tidak dapat membatal-kutip nilai dari '%s'"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
-msgstr ""
+msgstr "tidak dapat membuka '%s' untuk dibaca"
 
 #: sequencer.c:851
 msgid "'GIT_AUTHOR_NAME' already given"
-msgstr ""
+msgstr "'GIT_AUTHOR_NAME' sudah diberikan"
 
 #: sequencer.c:856
 msgid "'GIT_AUTHOR_EMAIL' already given"
-msgstr ""
+msgstr "'GIT_AUTHOR_EMAIL' sudah diberikan"
 
 #: sequencer.c:861
 msgid "'GIT_AUTHOR_DATE' already given"
-msgstr ""
+msgstr "'GIT_AUTHOR_DATE' sudah diberikan"
 
 #: sequencer.c:865
 #, c-format
 msgid "unknown variable '%s'"
-msgstr ""
+msgstr "variabel tidak dikenal '%s'"
 
 #: sequencer.c:870
 msgid "missing 'GIT_AUTHOR_NAME'"
-msgstr ""
+msgstr "'GIT_AUTHOR_NAME' hilang"
 
 #: sequencer.c:872
 msgid "missing 'GIT_AUTHOR_EMAIL'"
-msgstr ""
+msgstr "'GIT_AUTHOR_EMAIL' hilang"
 
 #: sequencer.c:874
 msgid "missing 'GIT_AUTHOR_DATE'"
-msgstr ""
+msgstr "'GIT_AUTHOR_DATE' hilang"
 
 #: sequencer.c:939
 #, c-format
@@ -7539,12 +7545,23 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
+"Anda punya perubahan tergelar di dalam pohon kerja Anda.\n"
+"Apabila perubahan tersebut dimaksudkan untuk dilumat ke komit sebelumnya, jalankan:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Apabila dimaksudkan untuk masuk ke komit baru, jalankan:\n"
+"\n"
+"  git commit %s\n"
+"Pada kedua kasus tersebut, setelah selesai, lanjutkan dengan:\n"
+"\n"
+"  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
-msgstr ""
+msgstr "kait 'prepare-commit-msg' gagal"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7558,8 +7575,19 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
+"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
+"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
+"ini dengan menyetel secara eksplisit. Jalankan perintah berikut dan ikuti\n"
+"petunjuk di dalam penyunting untuk menyunting berkas konfigurasi Anda:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
+"ini dengan:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7572,365 +7600,379 @@ msgid ""
 "\n"
 "    git commit --amend --reset-author\n"
 msgstr ""
+"Nama dan email Anda dikonfigurasikan otomatis berdasarkan nama pengguna\n"
+"dan nama host Anda. Periksa jika itu benar. Anda dapat mematikan pesan\n"
+"ini dengan menyetel secara eksplisit:\n"
+"\n"
+"    git config --global user.name \"Nama Anda\"\n"
+"    git config --global user.email anda@example.com\n"
+"\n"
+"Setelah itu, Anda dapat memperbaiki identitas yang digunakan untuk komit\n"
+"ini dengan:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
-msgstr ""
+msgstr "tidak dapat mencari komit yang baru saja dibuat"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit yang baru saja dibuat"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD setelah membuat komit"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
-msgstr ""
+msgstr "HEAD terpisah"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
-msgstr ""
+msgstr " (komit-akar)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
-msgstr ""
+msgstr "HEAD %s bukan sebuah komit!"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
-msgstr ""
+msgstr "tidak dapat menguraikan komit HEAD"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
-msgstr ""
+msgstr "tidak dapat menguraikan pengarang komit"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
-msgstr ""
+msgstr "git write-tree gagal menulis sebuah pohon"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit dari '%s'"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
-msgstr ""
+msgstr "identitas pengarang tidak valid '%s'"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
-msgstr ""
+msgstr "pengarang rusak: informasi tanggal hilang"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
-msgstr ""
+msgstr "gagal menulis objek komit"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
-msgstr ""
+msgstr "tidak dapat memperbarui %s"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
-msgstr ""
+msgstr "tidak dapat menguraikan komit %s"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
-msgstr ""
+msgstr "tidak dapat menguraikan komit induk %s"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
-msgstr ""
+msgstr "perintah tidak dikenal: %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
-msgstr ""
+msgstr "Ini komit pertama:"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
-msgstr ""
+msgstr "Ini komit ke-%d:"
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
-msgstr ""
+msgstr "Pesan komit pertama akan dilewati:"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
-msgstr ""
+msgstr "Pesan komit ke-%d akan dilewati"
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
-msgstr ""
+msgstr "Ini kombinasi dari %d komit."
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
-msgstr ""
+msgstr "tidak dapat menulis '%s'"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
-msgstr ""
+msgstr "butuh sebuah HEAD untuk memperbaiki"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
-msgstr ""
+msgstr "tidak dapat membaca HEAD"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit HEAD"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
-msgstr ""
+msgstr "tidak dapat membaca pesan komit %s"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
-msgstr ""
+msgstr "berkas indeks Anda tak tergabung."
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
-msgstr ""
+msgstr "tidak dapat memperbaiki komit akar"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
-msgstr ""
+msgstr "komit %s adalah penggabungan tetapi opsi -m tidak diberikan."
 
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
-msgstr ""
+msgstr "komit %s tidak punya induk %d"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, c-format
 msgid "cannot get commit message for %s"
-msgstr ""
+msgstr "tidak dapat mendapatkan pesan komit untuk %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
-msgstr ""
+msgstr "%s: tidak dapat menguraikan komit induk %s"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menamai ulang '%s' ke '%s'"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
-msgstr ""
+msgstr "tidak dapat membalikkan %s... %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
-msgstr ""
+msgstr "tidak dapat menerapkan %s... %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
-msgstr ""
+msgstr "menjatuhkan %s %s -- isi tambalan sudah di hulu\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
-msgstr ""
+msgstr "git %s: gagal membaca indeks"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
-msgstr ""
+msgstr "git %s: gagal menyegarkan indeks"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
-msgstr ""
+msgstr "%s tidak menerima argumen: '%s'"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
-msgstr ""
+msgstr "argumen hilang untuk %s"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%s'"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
-msgstr ""
+msgstr "baris %d tidak valid: %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr ""
+msgstr "tidak dapat '%s' tanpa komit sebelumnya"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
-msgstr ""
+msgstr "tidak dapat membaca '%s'."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
-msgstr ""
+msgstr "membatalkan pemetikan ceri yang sedang berlangsung"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
-msgstr ""
+msgstr "membatalkan pembalikkan yang sedang berlangsung"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
-msgstr ""
+msgstr "mohon perbaiki menggunakan 'git rebase --edit-todo'."
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
-msgstr ""
+msgstr "lembar perintah tidak dapat digunakan: '%s'"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
-msgstr ""
+msgstr "tidak ada komit yang diuraikan."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
-msgstr ""
+msgstr "tidak dapat memetik ceri selama pembalikkan."
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
-msgstr ""
+msgstr "tidak dapat membalikkan selama petik ceri."
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
-msgstr ""
+msgstr "nilai tidak valid untuk %s: %s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
-msgstr ""
+msgstr "squash-onto tidak dapat digunakan"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
-msgstr ""
+msgstr "lembar opsi jelek: '%s'"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
-msgstr ""
+msgstr "himpunan komit kosong dilewatkan"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
-msgstr ""
+msgstr "pembalikkan sudah berjalan"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr ""
+msgstr "coba \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
-msgstr ""
+msgstr "pemetikan ceri sudah berjalan"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr ""
+msgstr "coba \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
-msgstr ""
+msgstr "tidak dapat membuat direktori pembaris '%s'"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
-msgstr ""
+msgstr "tidak dapat mengunci HEAD"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
-msgstr ""
+msgstr "tidak ada pemetikan ceri atau pembalikkan yang sedang berjalan"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
-msgstr ""
+msgstr "tidak dapat menguraikan HEAD"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
-msgstr ""
+msgstr "tidak dapat membatalkan dari cabang yang belum lahir"
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
-msgstr ""
+msgstr "tidak dapat membuka '%s'"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
-msgstr ""
+msgstr "tidak dapat membaca '%s': %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
-msgstr ""
+msgstr "akhir berkas tidak diharapkan"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
-msgstr ""
+msgstr "berkas HEAD pra-petik-ceri yang tersimpan '%s' rusak"
 
-#: sequencer.c:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr ""
+msgstr "Sepertinya Anda sudah memindahkan HEAD. Tidak memutar ulang, periksa HEAD Anda!"
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
-msgstr ""
+msgstr "tidak ada pembalikkan yang sedang berjalan"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
-msgstr ""
+msgstr "tidak ada pemetikan ceri yang sedang berjalan"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
-msgstr ""
+msgstr "gagal melewati komit"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
-msgstr ""
+msgstr "tidak ada yang dilewati"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
+"sudahkah Anda komit?\n"
+"coba \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
-msgstr ""
+msgstr "tidak dapat membaca HEAD"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menyalin '%s' ke '%s'"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -7941,28 +7983,35 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
+"Anda dapat mengubah komit sekarang, dengan\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Setelah Anda puas dengan perubahan Anda, jalankan\n"
+"\n"
+"  git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
-msgstr ""
+msgstr "Tidak dapat menerapkan %s... %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
-msgstr ""
+msgstr "Tidak dapat menggabungkan %.*s"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
-msgstr ""
+msgstr "tidak dapat menyalin '%s' ke '%s'"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
-msgstr ""
+msgstr "Mengeksekusi: %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -7971,12 +8020,17 @@ msgid ""
 "  git rebase --continue\n"
 "\n"
 msgstr ""
+"eksekusi gagal: %s\n"
+"%sAnda dapat memperbaiki masalah, lalu jalankan\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
-msgstr ""
+msgstr "dan buat perubahan ke indeks dan/atau pohon kerja\n"
 
-#: sequencer.c:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -7986,121 +8040,130 @@ msgid ""
 "  git rebase --continue\n"
 "\n"
 msgstr ""
+"eksekusi berhasil: %s\n"
+"tapi meninggalkan perubahan ke indeks dan/atau pohon kerja\n"
+"Komit atau stase perubahan Anda, lalu jalankan\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
-msgstr ""
+msgstr "nama label ilegal: '%.*s'"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
-msgstr ""
+msgstr "menulis komit akar palsu"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
-msgstr ""
+msgstr "menulis squash-onto"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%s'"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
-msgstr ""
+msgstr "tidak dapat menggabungkan tanpa revisi saat ini"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
-msgstr ""
+msgstr "tidak dapat menguraikan '%.*s'"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
-msgstr ""
+msgstr "tidak ada yang digabungkan: '%.*s'"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
-msgstr ""
+msgstr "penggabungan gurita tidak dapat dieksekusi di atas sebuah [akar baru]"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
-msgstr ""
+msgstr "tidak dapat mendapatkan pesan komit dari '%s'"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
-msgstr ""
+msgstr "bahkan tidak dapat mencoba menggabungkan '%.*s'"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
-msgstr ""
+msgstr "merge: Tidak dapat menulis berkas indeks baru"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
-msgstr ""
+msgstr "Tidak dapat menstase otomatis"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
-msgstr ""
+msgstr "Respons stase tidak diharapkan: '%s'"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
-msgstr ""
+msgstr "Tidak dapat membuat direktori untuk '%s'"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
-msgstr ""
+msgstr "Stase otomatis dibuat: %s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
-msgstr ""
+msgstr "tidak dapat reset --hard"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
-msgstr ""
+msgstr "Stase otomatis diterapkan.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
-msgstr ""
+msgstr "tidak dapat menyimpan %s"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
+"%s\n"
+"Perubahan Anda aman di dalam stase.\n"
+"Anda dapat menjalankan \"git stash pop\" atau \"git stash drop\" kapanpun.\n"
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
-msgstr ""
+msgstr "Menerapkan stase otomatis menghasilkan konflik."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
-msgstr ""
+msgstr "Stase otomatis sudah ada; membuat entri stase baru."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
-msgstr ""
+msgstr "tidak dapat melepas HEAD"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
-msgstr ""
+msgstr "Berhenti pada HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
-msgstr ""
+msgstr "Berhenti pada %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8112,134 +8175,145 @@ msgid ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 msgstr ""
+"Tidak dapat mengeksekusi perintah todo\n"
+"\n"
+"    %.*s\n"
+"Itu sudah dijadwalkan ulang; Untuk menyunting perintah sebelum melanjutkan,\n"
+"mohon sunting daftar todo terlebih dahulu:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
-msgstr ""
+msgstr "Mendasarkan ulang (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
-msgstr ""
+msgstr "Berhenti pada %s... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
-msgstr ""
+msgstr "perintah tidak dikenal %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
-msgstr ""
+msgstr "tidak dapat membaca orig-head"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
-msgstr ""
+msgstr "tidak dapat membaca 'onto'"
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
-msgstr ""
+msgstr "tidak dapat memperbarui HEAD ke %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
-msgstr ""
+msgstr "%s didasarkan ulang dan diperbarui dengan sukses.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
-msgstr ""
+msgstr "tidak dapat mendasarkan ulang: Anda punya perubahan tak tergelar."
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
-msgstr ""
+msgstr "tidak dapat mengubah komit yang tidak ada"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
-msgstr ""
+msgstr "berkas tidak valid: '%s'"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
-msgstr ""
+msgstr "konten tidak valid: '%s'"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr ""
+"\n"
+"Anda punya perubahan tak tergelar di dalam pohon kerja Anda. Mohon komit\n"
+"terlebih dahulu dan jalankan 'git rebase --continue' lagi."
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
-msgstr ""
+msgstr "tidak dapat menulis berkas: '%s'"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
-msgstr ""
+msgstr "tidak dapat menghapus CHERRY_PICK_HEAD"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
-msgstr ""
+msgstr "tidak dapat mengkomit perubahan tergelar."
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
-msgstr ""
+msgstr "%s: tidak dapat memetik ceri sebuah %s"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
-msgstr ""
+msgstr "%s: revisi jelek"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
-msgstr ""
+msgstr "tidak dapat membalikkan sebagai komit awal"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
-msgstr ""
+msgstr "melewatkan komit yang sudah diterapkan sebelumnya %s"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
-msgstr ""
+msgstr "gunakan --reapply-cherry-picks untuk memasukkan komit yang terlewat"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
-msgstr ""
+msgstr "make_script: opsi tak ditangani"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
-msgstr ""
+msgstr "make_script: kesalahan membuat revisi"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
-msgstr ""
+msgstr "tidak ada yang dilakukan"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
-msgstr ""
+msgstr "tidak dapat melewatkan perintah pick yang tidak perlu"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
-msgstr ""
+msgstr "skrip sudah ditata ulang."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr ""
 
-#: setup.c:185
+#: setup.c:186
 #, 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 ""
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8247,12 +8321,12 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8260,125 +8334,125 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr ""
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:1257
+#: setup.c:1321
 #, 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:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr ""
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr ""
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
-msgstr ""
+msgstr "entri indeks adalah direktori, tapi bukan tipis (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
 #: strbuf.c:850
@@ -8432,13 +8506,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr ""
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr ""
@@ -8530,7 +8604,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "proses untuk submodul '%s' gagal"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Gagal menguraikan HEAD sebagai referensi valid."
 
@@ -8775,7 +8849,7 @@ msgstr ""
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr ""
 
@@ -8981,7 +9055,7 @@ msgstr ""
 msgid "Aborting."
 msgstr ""
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr ""
 
@@ -9001,98 +9075,105 @@ msgstr ""
 msgid "too-short tree file"
 msgstr ""
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, 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:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, 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:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, 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:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:142
 #, 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:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, 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:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, 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:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9100,7 +9181,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9108,47 +9189,47 @@ msgid ""
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, 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:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, 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:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9156,14 +9237,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9171,39 +9252,39 @@ msgid ""
 "%s"
 msgstr ""
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr ""
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr ""
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
 "colliding group is in the working tree:\n"
 msgstr ""
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr ""
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "bilasan diharapkan setelah argumen pengambilan"
 
@@ -9240,100 +9321,100 @@ msgstr ""
 msgid "Fetching objects"
 msgstr ""
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "gagal membaca '%s'"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "'%s' pada pohon kerja utama bukan direktori repositori"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' tidak ada"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' bukan berkas .git, kode error %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' tidak menunjuk kembali ke '%s'"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "bukan direktori"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git bukan berkas"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "berkas .git rusak"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "berkas .git salah"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "bukan jalur valid"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr ""
 "tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir tidak dapat dibaca"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir salah"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "bukan direktori valid"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "berkas gitdir tidak ada"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "tidak dapat membaca berkas gitdir (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "berkas gitdir tidak valid"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
 
@@ -9394,11 +9475,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Perubahan yang akan dikomit:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Perubahan yang tidak digelar untuk komit:"
 
@@ -9502,22 +9583,22 @@ msgstr "konten yang dimodifikasi, "
 msgid "untracked content, "
 msgstr "konten yang tak dilacak, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Simpanan Anda saat ini ada %d entri"
 msgstr[1] "Simpanan Anda saat ini ada %d entri"
 
-#: wt-status.c:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Submodul berubah tapi tak diperbarui:"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Perubahan submodul yang akan dikomit:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9525,7 +9606,7 @@ msgstr ""
 "Jangan ubah atau hapus baris diatas.\n"
 "Semua dibawahnya akan diabaikan."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9536,266 +9617,273 @@ msgstr ""
 "Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
 "Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Anda punya jalur yang tak tergabung."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (selesaikan konflik dan jalankan \"git commit\")"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
 
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (gunakan \"git commit\" untuk mengakhiri penggabungan)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Anda berada ditengah-tengah sesi am."
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Jalur saat ini kosong"
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (selesaikan konflik lalu jalankan \"git am --continue\")"
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (gunakan \"git am --skip\" untuk lewati tambalan ini)"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (gunakan \"git am --allow-empty\" untuk merekam tambalan ini sebagai komit "
+"kosong)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo hilang."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Tidak ada perintah selesai."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Perintah yang selesai (%d perintah):"
 msgstr[1] "Perintah yang selesai (%d perintah):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (lihat lebih lanjut di berkas %s)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Tidak ada perintah yang tersisa."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Perintah berikutnya (%d perintah tersisa):"
 msgstr[1] "Perintah berikutnya (%d perintah tersisa):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Anda sedang mendasarkan ulang."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (selesaikan konflik lalu jalankan \"git rebase --continue\")"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (gunakan \"git rebase --abort\" untuk check out cabang asal)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Anda sedang membelah komit saat mendasarkan ulang."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Petik ceri sedang berjalan."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Anda sedang memetik ceri komit %s."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Pengembalian sedang berjalang."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Anda sedang mengembalikan komit %s."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (selesaikan konflik dan jalankan \"git revert --continue\")"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (jalankan \"git revert --continue\" untuk melanjutkan)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (semua konflik sudah selesai: jalankan \"git revert --continue\")"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Anda sedang membagi dua."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Anda berada dalam checkout tipis."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Pada cabang "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "sedang mendasarkan ulang interaktif; ke "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "sedang mendasarkan ulang; ke "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr ""
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr ""
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Tidak sedang berada pada cabang apapun."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Komit awal"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Tidak ada komit"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Berkas tak terlacak"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Berkas yang diabaikan"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9806,32 +9894,32 @@ msgstr ""
 "mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
 "untuk tambahkan berkas baru sendiri (lihat 'git help status')."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Berkas tak terlacak yang tak disebutkan%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Tidak ada perubahan"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
 "-a\")\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "tidak ada perubahan untuk dikomit\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -9840,82 +9928,82 @@ msgstr ""
 "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
 "\"git add\" untuk lacak)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
 "lacak)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "tidak ada yang dikomit\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Tidak ada komit apapun pada "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (tanpa cabang)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "berbeda"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "di belakang "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "di depan "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr ""
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr ""
@@ -9952,107 +10040,113 @@ msgstr "hapus '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Tidak dapat membaca indeks"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Tidak dapat menulis tambalan"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "Gagal menyunting tambalan"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Tidak dapat men-stat '%s'"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Tambalan kosong. Dibatalkan."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Tidak dapat terapkan '%s'"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Jalur berikut diabaikan oleh salah satu dari berkas .gitignore Anda:\n"
 
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "latihan"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "jadi berkata-kata"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "pengambilan interaktif"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "pilih bingkah secara interaktif"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "sunting diff saat ini dan terapkan"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "perbolehkan tambah berkas yang diabaikan"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "perbarui berkas terlacak"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "rekam hanya fakta bahwa jalur akan ditambahkan nanti"
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "abaikan jalur yang terhapus dari pohon kerja (sama dengan --no-all)"
 
-#: builtin/add.c:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "jangan tambahkan, hanya segarkan indeks"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "hanya lewatkan berkas yang tidak dapat ditambah karena error"
 
-#: builtin/add.c:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "periksa bahwa berkas yang - bahkan hilang - diabaikan dalam latihan"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
-msgstr ""
+msgstr "perbolehkan perbarui entri di luar kerucut checkout tipis"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "peringatkan ketika menambahkan repositori tertanam"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "tulang belakang untuk `git stash -p`"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10083,12 +10177,12 @@ msgstr ""
 "\n"
 "Lihat \"git help submodule\" untuk selengkapnya."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "menambahkan repositori git tertanam: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10098,51 +10192,27 @@ msgstr ""
 "Matikan pesan ini dengan menjalankan\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "gagal menambahkan berkas"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file tidak kompatibel dengan --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A dan -u saling tak kompatibel"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Opsi --ignore-missing hanya dapat digunakan bersama dengan --dry-run"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod param '%s' harus berupa -x atau +x"
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul butuh --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' dan argumen spek jalur tidak dapat digunakan bersamaan"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10152,113 +10222,121 @@ msgstr ""
 "Matikan pesan ini dengan menjalankan\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Nilai tidak valid untuk --empty: %s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "tidak dapat mengurai skrip pengarang"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' dihapus oleh kail applypatch-msg"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Baris masukan salah format: '%s'."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Gagal menyalin catatan dari '%s' ke '%s'"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek gagal"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "tidak dapat mengurai tambalan '%s'"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Hanya satu rangkaian tambalan StGIT yang bisa diterapkan sekaligus"
 
-#: builtin/am.c:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "stempel waktu tidak valid"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "baris Date tidak valid"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "offset zona waktu tidak valid"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Pendeteksian format tambalan gagal."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "gagal membuat direktori '%s'"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Gagal memecah tambalan."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Saat Anda sudah menyelesaikan masalah ini, jalankan \"%s --continue\"."
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 "Jika Anda lebih suka melewati tambalan ini, jalankan \"%s --skip\" sebagai "
 "gantinya."
 
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Untuk merekam tambalan kosong sebagai komit kosong, jalankan \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1161
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Untuk mengembalikan cabang yang asli dan berhenti menambal, jalankan \"%s --"
 "abort\""
 
-#: builtin/am.c:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Tambalan dikirimkan dengan format=flowed; spasi pada akhir baris mungkin "
 "hilang."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Tambalan kosong."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "baris pengarang hilang dalam komit %s"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "baris identitas tidak valid: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Repositori kekurangan blob yang diperlukan untuk mundur ke penggabungan 3 "
 "arah."
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Menggunakan info indeks untuk membangun ulang sebuah pohon dasar..."
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10266,24 +10344,24 @@ msgstr ""
 "Apakah Anda menyunting tambalan Anda?\n"
 "Itu tidak diterapkan ke blob yang direkam dalam indeksnya."
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Mundur ke penambalan dasar dan penggabungan 3 arah..."
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Gagal menggabungkan perubahan."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "menerapkan ke sebuah riwayat kosong"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "tidak dapat melanjutkan: %s tidak ada."
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Badan komit adalah:"
 
@@ -10291,41 +10369,59 @@ msgstr "Badan komit adalah:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Terapkan? [y]a/[n] tidak/[e] sunting/[v] lihat tambalan/terim[a] semua: "
 
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "tidak dapat menulis berkas indeks"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Indeks kotor: tidak dapat menerapkan tambalan (kotor: %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Melewatkan: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Membuat sebuah komit kosong: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Tambalan kosong."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Menerapkan: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Tidak ada perubahan -- tambalan sudah diterapkan"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Penambalan gagal pada %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "Gunakan 'git am --show-current-patch=diff' untuk melihat tambalan yang gagal"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Tidak ada perubahan - direkam sebagai komit kosong."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10335,7 +10431,7 @@ msgstr ""
 "Jika tidak ada lagi yang diterapkan, sepertinya sesuatu yang lain sudah \n"
 "memasukkan perubahan yang sama; mungkin Anda ingin melewatkan tambalan ini."
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10348,17 +10444,17 @@ msgstr ""
 "Anda mungkin jalankan `git rm` pada berkas untuk menerima \"penghapusan oleh "
 "mereka\" untuk itu."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Tidak dapat mengurai objek '%s'."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "gagal membersihkan indeks"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10366,160 +10462,168 @@ msgstr ""
 "Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n"
 "Tidak memutar ulang ke ORIG_HEAD"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Nilai tidak valid untuk --patch-format: %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Nilai tidak valid untuk --show-current-patch: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s tidak kompatibel untuk --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "Opsi '%s=%s' dan '%s=%s' tidak dapat digunakan bersamaan"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opsi>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opsi>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "jalankan secara interaktif"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "opsi bersejarah -- no-op"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "perbolehkan mundur ke penggabungan 3 arah jika diperlukan"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "jadi senyap"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "tambahkan trailer Signed-off-by kepada pesan komit"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "koding ulang ke dalam utf8 (asali)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "lewatkan opsi -k ke git-mailinfo"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "lewatkan opsi -b ke git-mailinfo"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "lewatkan opsi -m ke git-mailinfo"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "copot semuanya sebelum garis gunting"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "lewatkannya melalui git-mailinfo"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "lewatkannya melalui git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "format tambalan yang ada di"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "timpa pesan error ketika kegagalan penambalan terjadi"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "lanjutkan penerapan tambalan setelah menyelesaikan konflik"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "sinonim untuk --continue"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "lewati tambalan saat ini"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "kembalikan cabang asli dan batalkan operasi penambalan"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "batalkan operasi penambalan tetapi simpan HEAD dimanapun itu"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "perlihatkan tambalan yang diterapkan"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "rekam tambalan kosong sebagai komit kosong"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "berbohong soal tanggal pengkomit"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "gunakan stempel waktu saat ini untuk tanggal pengarang"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "tandatangani komit dengan GPG"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "bagaimana cara menangani tambalan kosong"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(penggunaan internal untuk git-rebase)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -10527,17 +10631,17 @@ msgstr ""
 "Opsi -b/--binary telah menjadi no-op untuk waktu yang lama, dan\n"
 "itu akan dihapus. Mohon jangan gunakan itu lagi."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "gagal membaca indeks"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "direktori pendasaran ulang sebelumnya %s masih ada tapi mbox diberikan."
 
-#: builtin/am.c:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10546,11 +10650,11 @@ msgstr ""
 "Direktori menyimpang %s ditemukan.\n"
 "Gunakan \"git am --abort\" untuk menghapusnya."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operasi penguraian tidak berjalan, kami tidak melanjutkan."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "mode interaktif butuh tambalan pada baris perintah"
 
@@ -11006,11 +11110,11 @@ msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
 msgid "show work cost statistics"
 msgstr "perlihatkan statistik biaya usaha"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "paksa laporkan perkembangan"
@@ -11059,7 +11163,7 @@ msgstr "perlihatkan email pengarang daripada nama (asali: off)"
 msgid "ignore whitespace differences"
 msgstr "abaikan perbedaan spasi putih"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "revisi"
 
@@ -11111,7 +11215,7 @@ msgstr "rentang"
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress tidak dapat digunakan dengan --incremental atau format porselen"
@@ -11124,18 +11228,18 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 tahun, 11 bulan yang lalu"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "berkas %s hanya punya %lu baris"
 msgstr[1] "berkas %s hanya punya %lu baris"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Menyalahkan baris"
 
@@ -11167,7 +11271,7 @@ msgstr "git branch [<opsi>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opsi>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11176,7 +11280,7 @@ msgstr ""
 "menghapus cabang '%s' yang sudah digabungkan ke\n"
 "         '%s', tapi belum digabungkan ke HEAD."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11185,12 +11289,12 @@ msgstr ""
 "tidak menghapus cabang '%s' yang belum digabungkan ke\n"
 "         '%s', walaupun tergabung ke HEAD."
 
-#: builtin/branch.c:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Tidak dapat mencari objek komit untuk '%s'"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11199,7 +11303,7 @@ msgstr ""
 "Cabang '%s' belum sepenuhnya tergabung.\n"
 "Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'."
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "Pembaruan berkas konfigurasi gagal"
 
@@ -11211,99 +11315,99 @@ msgstr "tidak dapat gunakan -a dengan -d"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Tidak dapat mencari objek komit untuk HEAD"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Tidak dapat menghapus cabang '%s' yang ter-checkout pada '%s'"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "cabang pelacak remote '%s' tidak ditemukan."
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "cabang '%s' tidak ditemukan."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n"
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Cabang %s (yaitu %s) dihapus.\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "tidak dapat menguraikan untai format"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "tidak dapat menguraikan HEAD"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) merujuk diluar refs/heads/"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Cabang %s sedang didasarkan ulang pada %s"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Cabang %s sedang dibagi dua pada %s"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada."
 
-#: builtin/branch.c:516
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr "tidak dapat mengganti nama cabang saat ini ketika tidak ada."
 
-#: builtin/branch.c:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nama cabang tidak valid: '%s'"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Penggantian nama cabang gagal"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Penyalinan cabang gagal"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Salinan cabang salah nama '%s' dibuat"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Cabang salah nama '%s' berganti nama"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Cabang berganti nama ke %s, tapi HEAD tidak diperbarui!"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11314,180 +11418,176 @@ msgstr ""
 "  %s\n"
 "Baris yang diawali dengan '%c' akan dicopot.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Opsi generik"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "perlihatkan hash dan subjek, berikan dua kali untuk cabang hulu"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "sembunyikan pesan informasi"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "pasang mode pelacakan (lihat git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "setel konfigurasi pelacakan cabang"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "jangan gunakan"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "hulu"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "ubah info hulu"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "batal-setel info hulu"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "gunakan keluaran berwarna"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "lakukan pada cabang pelacak remote"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "cetak hanya cabang yang berisi komit"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "cetak hanya cabang yang tak berisi komit"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Aksi git-branch spesifik:"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "sebut baik cabang pelacak remote dan cabang lokal"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "hapus cabang yang tergabung sepenuhnya"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "hapus cabang (walaupun tak tergabung)"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "pindah/ganti nama cabang dan reflog-nya"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "pindah/ganti nama cabang, walaupun target ada"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "salin cabang dan reflog-nya"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "salin cabang, walapun target ada"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "sebut nama cabang"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "perlihatkan nama cabang saat ini"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "buat reflog cabang"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "sunting deskripsi cabang"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "paksa buat, pindah/ganti nama, hapus"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "cetak hanya cabang yang tergabung"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "cetak hanya cabang yang tak tergabung"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "sebut cabang dalam kolom"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "objek"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "cetak hanya cabang objek"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "pengurutan dan penyaringan tak peka kapital"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format yang digunakan untuk keluaran"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD tidak ditemukan di bawah refs/heads!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column dan --verbose tidak kompatibel"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "nama cabang diperlukan"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Belum ada komit pada cabang '%s'."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Tidak ada cabang bernama '%s'."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "terlalu banyak cabang untuk operasi penyalinan"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "terlalu banyak argumen untuk operasi penggantian nama"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "terlalu banyak argumen untuk menyetel hulu baru"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11495,32 +11595,32 @@ msgstr ""
 "tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
 "apapun."
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "tidak ada cabang '%s'"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "cabang '%s' tidak ada"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "terlalu banyak argumen untuk batal-setel hulu"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "tidak dapat membatal-setel hulu HEAD ketika itu tak menunjuk pada cabang "
 "apapun."
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Cabang '%s' tidak ada informasi hulu"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -11528,7 +11628,7 @@ msgstr ""
 "Opsi -a dan -r tidak mengambil nama cabang.\n"
 "Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -11783,8 +11883,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -11842,10 +11942,10 @@ msgid "git checkout--worker [<options>]"
 msgstr ""
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr ""
 
@@ -11909,100 +12009,95 @@ msgstr "git switch [<opsi>] [<cabang>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "jalur '%s' tidak punya versi kami"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "jalur '%s' tidak punya versi mereka"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "jalur '%s' tidak punya semua versi yang diperlukan"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "jalur '%s' tidak punya versi yang diperlukan"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "jalur '%s': tidak dapat gabung"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Konflik penggabungan %d dibuat ulang"
 msgstr[1] "Konflik penggabungan %d dibuat ulang"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d jalur diperbarui dari %s"
 msgstr[1] "%d jalur diperbarui dari %s"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d jalur diperbarui dari indeks"
 msgstr[1] "%d jalur diperbarui dari indeks"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' tidak dapat digunakan untuk %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
 "bersamaan."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "baik '%s' atau '%s' tidak disebutkan"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "jalur '%s' tak tergabung"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12012,50 +12107,50 @@ msgstr ""
 "berikut:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD sekarang berada di"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "tidak dapat memperbarui HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Ganti ulang cabang '%s'\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Sudah berada pada '%s'\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Ganti ke dan ganti cabang '%s'\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Ganti ke cabang baru '%s'\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Ganti ke cabang '%s'\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "... dan %d lainnya.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12078,7 +12173,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12101,19 +12196,19 @@ msgstr[1] ""
 "saat yang tepat untuk dilakukan dengan:\n"
 "git branch <nama-cabang-baru> %s\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "kesalahan internal dalam jalan revisi"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Posisi HEAD sebelumnya adalah"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "Anda berada pada cabang yang belum lahir"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12122,7 +12217,7 @@ msgstr ""
 "'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
 "Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12142,51 +12237,51 @@ msgstr ""
 "seperti remote 'origin', pertimbangkan untuk menyetel\n"
 "checkout.defaultRemote=origin di konfigurasi Anda"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "hanya satu referensi yang diharapkan"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "hanya satu referensi yang diharapkan, %d diberikan"
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referensi tidak valid: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensi bukan pohon: %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "sebuah cabang diharapkan, dapat tag '%s'"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "sebuah cabang diharapkan, dapat '%s'"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "sebuah cabang diharapkan, dapat komit '%s'"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12195,7 +12290,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12203,7 +12298,7 @@ msgstr ""
 "tidak dapat mengganti cabang di tengah sesi am\n"
 "Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12212,7 +12307,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12221,7 +12316,7 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
 "worktree add\"."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12230,138 +12325,126 @@ msgstr ""
 "Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add"
 "\"."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "Anda mengganti cabang saat pembagian dua"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' tidak dapat digunakan dengan '%s'"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' tidak bisa mengambil <titik-awal>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "kehilangan argumen cabang atau komit"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "lakukan penggabungan 3 arah dengan cabang baru"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "gaya"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "gaya konflik (merge atau diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "gaya konflik (merge, diff3, atau zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "lepas HEAD pada komit bernama"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "setel info hulu untuk cabang baru"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "pasang mode pelacakan (lihat git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "paksa checkout (buang modifikasi lokal)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "cabang baru"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "cabang baru tanpa induk"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "perbarui berkas yang diabaikan (default)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "checkout versi kami untuk berkas yang tak tergabung"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "checkout versi mereka untuk berkas yang tak tergabung"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "jangan batasi jalur spek hanya ke entri tipis"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c dan --orphan saling eksklusif"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p dan --overlay saling eksklusif"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "opsi '-%c', '-%c', dan '%s' tidak dapat digunakan bersamaan"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track butuh nama cabang"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "kehilangan nama cabang; coba -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "tidak dapat menyelesaikan %s"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "spesifikasi jalur tidak valid"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'"
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file tidak kompatible dengan --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12369,71 +12452,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force dan --merge tidak kompatibel saat\n"
 "men-checkout index"
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "Anda harus sebutkan jalur untuk dipulihkan"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "cabang"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "buat dan checkout cabang baru"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "buat/setel ulang dan checkout cabang"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "buat reflog untuk cabang baru"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "gunakan mode hamparan (default)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "buat dan ganti ke cabang baru"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "buat/setel ulang dan ganti ke cabang"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "buang modifikasi lokal"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "mana mirip-cabang untuk di-checkout"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "pulihkan indeks"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "pulihkan pohon kerja (default)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "abaikan entri yang tak tergabung"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "gunakan mode hamparan"
 
@@ -12468,7 +12551,15 @@ msgstr "Akan melewatkan repositori %s\n"
 msgid "could not lstat %s\n"
 msgstr "tidak dapat me-lstat %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Menolak menghapus direktori kerja saat ini\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Akan menolak menghapus direktori kerja saat ini\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12481,7 +12572,7 @@ msgstr ""
 "foo        - pilih item berdasarkan prefiks unik\n"
 "           - (kosong) tidak pilih apa-apa\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12502,33 +12593,33 @@ msgstr ""
 "*          - pilih semua item\n"
 "           - (kosong) selesai memilih\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Huh (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Masukkan pola pengabaian>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Pilih item untuk dihapus"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Hapus %s [y/N]? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12546,52 +12637,52 @@ msgstr ""
 "help                - layar ini\n"
 "?                   - bantuan untuk bisik pemilihan"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Akan menghapus item berikut:"
 msgstr[1] "Akan menghapus item berikut:"
 
-#: builtin/clean.c:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "jangan cetak nama berkas yang dihapus"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "paksa"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "pembersihan interaktif"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "hapus keseluruhan direktori"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "pola"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "tambahkan <pola> ke aturan pengabaian"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "juga hapus berkas terabaikan"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "hanya hapus berkas terabaikan"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -12599,7 +12690,7 @@ msgstr ""
 "clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; "
 "menolak membersihkan"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -12607,7 +12698,7 @@ msgstr ""
 "clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
 "menolak membersihkan"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x dan -X tidak dapat digunakan bersamaan"
 
@@ -12663,19 +12754,20 @@ msgstr "direktori templat"
 msgid "directory from which templates will be used"
 msgstr "direktori dimana templat akan digunakan"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "repositori rujukan"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "gunakan --reference hanya pada saat kloning"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "nama"
@@ -12692,7 +12784,7 @@ msgstr "checkout <cabang> daripada HEAD remote"
 msgid "path to git-upload-pack on the remote"
 msgstr "jalur ke git-upload-pack pada remote"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "kedalaman"
@@ -12701,7 +12793,7 @@ msgstr "kedalaman"
 msgid "create a shallow clone of that depth"
 msgstr "buat klon dangkal sedalam kedalaman tersebut"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "waktu"
@@ -12710,17 +12802,17 @@ msgstr "waktu"
 msgid "create a shallow clone since a specific time"
 msgstr "buat klon dangkal sejak waktu yang disebutkan"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "revisi"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klon hanya satu cabang, HEAD atau --branch"
 
@@ -12748,22 +12840,22 @@ msgstr "kunci=nilai"
 msgid "set config inside the new repository"
 msgstr "setel konfigurasi di dalam repositori baru"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "spesifik ke server"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "opsi untuk transmisi"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "gunakan hanya alamat IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "gunakan hanya alamat IPv6"
@@ -12857,29 +12949,25 @@ msgstr "tidak dapat memaket ulang untuk pembersihan"
 msgid "cannot unlink temporary alternates file"
 msgstr "tidak dapat batal-taut berkas alternatif sementara"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Terlalu banyak argumen."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Anda harus sebutkan repositori untuk diklon."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare dan --origin %s tidak kompatibel."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare dan --separate-git-dir tidak kompatibel."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositori '%s' tidak ada"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "kedalaman %s bukan bilangan positif"
@@ -12899,8 +12987,8 @@ msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong"
 msgid "working tree '%s' already exists."
 msgstr "pohon kerja '%s' sudah ada."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "tidak dapat membuat direktori pendahulu '%s'"
@@ -13016,7 +13104,7 @@ msgid ""
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 msgstr ""
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr ""
 
@@ -13096,7 +13184,7 @@ msgstr ""
 msgid "Collecting commits from input"
 msgstr ""
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr ""
@@ -13114,7 +13202,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "induk duplikat %s diabaikan"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "bukan nama objek valid %s"
@@ -13137,13 +13225,13 @@ msgstr "induk"
 msgid "id of a parent commit object"
 msgstr "id objek komit induk"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "pesan"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "pesan komit"
 
@@ -13151,7 +13239,7 @@ msgstr "pesan komit"
 msgid "read commit log message from file"
 msgstr "baca pesan log komit dari berkas"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Tandatangani komit dengan GPG"
@@ -13230,10 +13318,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "gagal membuka objek pohon HEAD"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file dengan -a tidak masuk akal"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
@@ -13321,8 +13405,8 @@ msgstr "tidak dapat membaca berkas log '%s'"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "tidak dapat menggabungkan -m dengan --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "opsi '%s' dan '%s:%s' tidak dapat digunakan bersamaan"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -13429,7 +13513,7 @@ msgstr "tidak dapat melewatkan trailer ke --trailers"
 msgid "Error building trees"
 msgstr "Kesalahan membangun pohon"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Mohon berikan pesan baik dengan opsi -m atau -F.\n"
@@ -13445,15 +13529,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode terabaikan '%s' tidak valid"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode berkas tak terlacak '%s' tidak valid"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long dan -z tidak kompatibel"
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang."
@@ -13464,113 +13544,111 @@ msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat menulis ulang."
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr ""
-"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "opsi reword '%s' dan jalur '%s' tidak dapat digunakan bersamaan"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "opsi reword '%s' dan '%s' tidak dapat digunakan bersamaan"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Menggunakan baik --reset-author dan --author tidak masuk akal"
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Anda tidak punya apapun untuk diubah."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Anda berada di tengah penggabungan -- tidak dapat mengubah."
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Anda berada di tengah pemetikan ceri -- tidak dapat mengubah."
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Anda berada di tengah pendasaran ulang -- tidak dapat mengubah."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Hanya salah satu dari -c/-C/-F/--fixup yang dapat digunakan."
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author hanya dapat digunakan dengan -C, -c atau --amend."
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Hanya salah satu dari --include/--only/--all/--interactive/--patch yang "
 "dapat digunakan."
 
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr ""
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "jalur '%s ...' dengan -a tidak masuk akal"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "perlihatkan status dengan ringkas"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "perlihatkan informasi cabang"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "perlihatkan informasi stase"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "hitung nilai didepan/dibelakang penuh"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "versi"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "keluaran yang dapat dibaca mesin"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "perlihatkan status dalam format panjang (asali)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "akhiri entri dengan NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "perlihatkan berkas tak terlacak, mode opsional: all, normal, no. (Asali: all)"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13578,11 +13656,11 @@ msgstr ""
 "perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
 "(Asali: traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "bila"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -13590,192 +13668,192 @@ msgstr ""
 "abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
 "all)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "sebut berkas tak terlacak dalam kolom"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "jangan deteksi penggantian nama"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "sembunyikan rangkuman setelah komit berhasil"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "perlihatkan diff dalam templat pesan komit"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Opsi pesan komit"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "Baca pesan dari berkas"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "pengarang"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "timpa pengarang komit"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "tangal"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "timpa tanggal komit"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "komit"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "gunakan kembali pesan dari komit tersebut"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]komit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "gunakan pesan terformat autosquash untuk perbaiki atau ubah/tulis ulang "
 "komit yang disebutkan"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "komit sekarang dikarang olehku (gunakan dengan -C/-c/--amend)"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr ""
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr ""
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "tambahkan trailer Signed-off-by"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "gunakan templat berkas tersebut"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "paksa sunting komit"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "masukkan status dalam templat pesaan komit"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Opsi isi komit"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "komit semua berkas terubah"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "tambah berkas secara interaktif"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "tambah perubahan secara interaktif"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "hanya komit berkas tersebut"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "lewati kail pre-commit dan commit-msg"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "perlihatkan apa yang akan dikomit"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "ubah komit sebelumnya"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "lewati kail post-rewrite"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "ok merekam perubahan kosong"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "ok merekam perubahan dengan pesan kosong"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Berkas MERGE_HEAD (%s) rusak"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "tidak dapat membaca MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "tidak dapat membaca pesan komit: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Batalkan komit karena pesan komit kosong.\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Batalkan komit karena badan pesan komit kosong.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14279,7 +14357,7 @@ msgstr "hanya pertimbangkan tag yang cocok dengan <pola>"
 msgid "do not consider tags matching <pattern>"
 msgstr "jangan pertimbangkan tag yang cocok dengan <pola>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "perlihatkan objek komit singkat sebagai langkah terakhir"
 
@@ -14295,25 +14373,14 @@ msgstr "tambahkan <tanda> pada direktori kerja kotor (asali: \"-dirty\")"
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long tidak kompatibel dengan --abbrev=0"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty tidak kompatibel dengan mirip-komit"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken tidak kompatibel dengan mirip-komit"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin dan --merge-base saling eksklusif"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "opsi '%s' dan mirip-komit tidak dapat digunakan bersamaan"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14334,26 +14401,26 @@ msgstr "opsi tidak valid: %s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: tidak ada dasar penggabungan"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "bukan repositori git"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objek yang diberikan '%s' tidak valid"
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "lebih dari dua blob diberikan: '%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objek tak tertangani '%s' diberikan"
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
@@ -14362,22 +14429,22 @@ msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opsi>] [<komit> [<komit>]] [--] [<jalur>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "tidak dapat membaca tautan simbolik %s"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "tidak dapat membaca berkas tautan simbolik %s"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "tidak dapat membaca objek %s untuk symlink %s"
 
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14385,58 +14452,58 @@ msgstr ""
 "format diff tergabung ('-c' dan '--cc') tidak didukung dalam\n"
 "mode diff direktori ('-d' dan '--dir-diff')."
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "kedua berkas berubah: '%s' dan '%s'."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "berkas pohon kerja telah ditinggalkan."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "berkas sementara ada di '%s'."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "mungkin Anda ingin membersihkan atau memulihkan itu."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "gagal: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "gunakan `diff.guitool` daripada `diff.tool`"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "lakukan diff direktori penuh"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "jangan bisiki sebelum meluncurkan alat diff"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "gunakan tautan simbolik dalam mode diff direktori"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "alat"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "gunakan alat diff yang disebutkan"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "cetak daftar alat diff yang bisa digunakan dengan `--tool`"
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -14444,31 +14511,23 @@ msgstr ""
 "buat 'git-difftool' keluar ketika alat diff yang dijalankan mengembalikan "
 "kode keluar bukan nol"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "sebutkan perintah kustom untuk melihat diff"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "dilewatkan ke `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool butuh pohon kerja atau --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff tidak kompatibel dengan --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool dan --extcmd saling eksklusif"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>"
 
@@ -14504,127 +14563,118 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opsi rev-list]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Kesalahan: Tidak dapat mengekspor tag bersarang kecuali jika --mark-tags "
 "disebutkan."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "token --anonymize-map tidak bisa kosong"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "perlihatkan perkembangan setelah <n> objek"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "pilih penanganan tag bertandatangan"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "pilih penanganan tag yang men-tag objek tersaring"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "pilih penanganan pesan komit dalam pengkodean alternatif"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "buang tanda ke berkas ini"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "impor tanda dari berkas ini"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "impor tanda dari berkas ini jika ada"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "palsukan pen-tag ketika tidak ada pada tag"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "keluarkan pohon penuh untuk setiap komit"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "gunakan fitur selesai untuk mengakhiri arus"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "lewati keluaran data blob"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "spek referensi"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "terapkan spek referensi ke referensi terekspor"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonimkan keluaran"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "dari:ke"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "ubah <dari> ke <ke> pada keluaran teranonim"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "referensikan induk yang tidak ada dalam arus fast-export oleh id objek"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "perlihatkan id objek asli dari blob/komit"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "label tag dengan id tanda"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map tanpa --anonymize tidak masuk akal"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr ""
-"Tidak dapat melewatkan baik --import-marks dan --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Kehilangan tanda dari untuk submodul '%s'"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Kehilangan tanda ke untuk submodul '%s'"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Perintah 'mark' diharapkan, dapat %s"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Perintah 'to' diharapkan, dapat %s"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr ""
 "Format nama:nama berkas diharapkan untuk operasi penulisan ulang submodul"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
@@ -14634,116 +14684,118 @@ msgstr "fitur '%s' dilarang dalam input tanpa --allow-unsafe-features"
 msgid "Lockfile created but not reported: %s"
 msgstr "Berkas kunci dibuat tetapi tidak dilaporkan: %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opsi>] <grup>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opsi>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel tidak dapat bernilai negatif"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "ambil dari semua remote"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "setel hulu untuk git pull/fetch"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr ""
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "jalur ke paket unggah pada sisi remote"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "paksa timpa referensi lokal"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "ambil dari banyak remote"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "ambil semua tag dan objek yang bersesuaian"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "jangan ambil semua tag (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "jumlah submodul yang diambil secara bersamaan"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
+"modifikasi spek referensi untuk tempatkan semua referensi di dalam refs/"
+"prefetch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "buang cabang pelacak remote yang tidak ada pada remote"
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "sesuai permintaan"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "kontrol pengambilan submodul rekursif"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "simpan paket yang diunduh"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "bolehkan perbarui referensi HEAD"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "perdalam riwayat klon dangkal"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "ubah ke repositori penuh"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "tambahkan ini ke jalur keluaran submodul"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -14751,143 +14803,148 @@ msgstr ""
 "default untuk ambil submodul secara rekursif (prioritas lebih rendah "
 "dariberkas konfigurasi)"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "terima referensi yang memperbarui .git/shallow"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "peta referensi"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "sebutkan ambil peta referensi"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 "laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "jangan ambil berkas pak; sebagai gantinya cetak leluhur dari ujung negosiasi"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "lakukan 'maintenance --auto' setelah pengambilan"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "periksa pembaruan terpaksa pada semua cabang"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "tulis grafik komit setelah pengambilan"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "terima spek referensi dari masukan standar"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
 msgstr "tidak dapat menemukan referensi remote HEAD"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objek %s tidak ditemukan"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[terkini]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[tertolak]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "tidak dapat mengambil di cabang saat ini"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "ter-check out di dalam pohon kerja lainnya"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[pembaruan tag]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "tidak dapat memperbarui referensi lokal"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "akan klob tag yang ada"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[tag baru]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[cabang baru]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[referensi baru]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "pembaruan terpaksa"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "bukan-maju-cepat"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"Ambil secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
-"tapi pemeriksaan tersebut dinonaktifkan. Untuk aktifkan kembali, gunakan\n"
-"'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
-"true'."
+"fetch secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
+"tapi pemeriksaan tersebut sudah dinonaktifkan. Untuk aktifkan kembali, "
+"gunakan\n"
+"bendera '--show-forced-updates' atau jalankan 'git config fetch."
+"showForcedUpdates true'."
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"Butuh waktu %2.f detik untuk periksa pembaruan terpaksa. Anda dapat\n"
+"Butuh waktu %2.f detik untuk memeriksa pembaruan terpaksa; Anda dapat\n"
 "menggunakan '--no-show-forced-updates' atau jalankan\n"
 "'git config fetch.showForcedUpdates false'\n"
-" untuk menghindari pemeriksaan ini.\n"
+"untuk menghindari pemeriksaan ini.\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s tidak mengirim semua objek yang diperlukan\n"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Dari %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -14896,141 +14953,142 @@ msgstr ""
 "beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
 " 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
 
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s akan menjadi terjuntai)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s telah menjadi terjuntai)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[dihapus]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "menolak mengambil ke dalam cabang '%s' yang ter-checkout pada '%s'"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Opsi \"%s\" diabaikan untuk %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "opsi \"%s\" diabaikan untuk %s\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "objek '%s' tidak ada"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"tidak dapat menyetel hulu HEAD ke %s dari '%s' ketika itu tak menunjuk pada "
+"cabang apapun."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "tidak setel hulu untuk cabang remote pelacak remote"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "tidak setel hulu untuk tag remote"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "tipe cabang tidak diketahui"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
-"cabang sumber tidak ditemukan.\n"
+"cabang sumber tidak ditemukan;\n"
 "Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Mengambil %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
-msgstr "Tidak dapat mengambil %s"
+msgid "could not fetch %s"
+msgstr "tidak dapat mengambil %s"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
-"Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n"
-"cabang yang mana revisi baru sebaiknya diambil."
+"repositori remote tidak disebutkan; mohon sebutkan baik URL atau nama\n"
+"remote yang mana revisi baru sebaiknya diambil"
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Anda perlu sebutkan nama tag"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "Anda perlu sebutkan sebuah nama tag"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Kedalaman negatif di --deepen tidak didukung"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen dan --depth saling eksklusif"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "kedalaman negatif pada --deepen tidak didukung"
 
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow pada repositori penuh tidak masuk akal"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tidak mengambil argumen repositori"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all tidak masuk akal dengan spek referensi"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "tidak ada remote atau grup remote seperti itu: %s"
+msgid "no such remote or remote group: %s"
+msgstr "tidak ada remote atau grup remote seperti: %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "mengambil sebuah grup dan menyebutkan spek referensi tidak masuk akal"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "harus suplai remote ketika menggunakan --negotiate-only"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokol tidak mendukung --negotiate-only, keluar."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol tidak mendukung --negotiate-only, keluar."
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15038,11 +15096,11 @@ msgstr ""
 "--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
 "extensions.partialclone"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
 
@@ -15051,23 +15109,27 @@ msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr ""
 
@@ -15087,47 +15149,47 @@ msgstr ""
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr ""
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr ""
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr ""
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr ""
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr ""
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr ""
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr ""
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr ""
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
@@ -15278,124 +15340,124 @@ msgstr "%s: objek rusak atau hilang: %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: objek bertipe tidak dikenal '%s': %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objek tidak dapat diuraikan: %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "sha1 berkas jelek: %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Memeriksa direktori objek"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Memeriksa direktori objek"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Memeriksa tautan %s"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s tidak valid"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s menunjuk ke sesuatu yang aneh (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: HEAD terpisah tidak menunjuk ke apapun"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "catatan: %s menunjuk ke cabang yang belum lahir (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Memeriksa pohon tembolok"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: penunjuk sha1 tidak valid pada pohon tembolok"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "bukan pohon pada pohon tembolok"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opsi>] [<objek>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "perlihatkan objek yang tak dapat dicapai"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "perlihatkan objek teruntai"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "laporkan tag"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "laporkan simpul akar"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "buat objek indeks simpul kepala"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "buat log referensi simpul kepala (asali)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "juga pertimbangkan pak dan objek alternatif"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "hanya periksa konektivitas"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "aktifkan pemeriksaan lebih ketat"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "tulis objek teruntai dalam .git/lost-found"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "perlihatkan perkembangan"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "perlihatkan nama lantung untuk objek yang dapat dicapai"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Memeriksa objek"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objek hilang"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parameter tidak valid: sha1 diharapkan, dapat '%s'"
@@ -15414,17 +15476,12 @@ msgstr "Gagal men-fstat %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "gagal menguraikan nilai '%s' '%s'"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "tidak dapat men-stat '%s'"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "tidak dapat membaca '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -15439,265 +15496,265 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "pangkas objek tak tereferensi"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "jadi lebih cermat (waktu yang dijalankan bertambah)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "aktifkan mode gc otomatis"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "paksa jalankan gc bahkan jika mungkin ada gc lain yang berjalan"
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "pak ulang semua pak yang lain kecuali pak terbesar"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "gagal menguraikan nilai gc.logexpiry %s"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "gagal menguraikan nilai pangkas kadaluarsa %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "Mempak otomatis repositori di latar belakang untuk performa optimal.\n"
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Mempak otomatis repositori untuk performa optimal.\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Lihat \"git help gc\" untuk pembenahan manual.\n"
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 "gc sudah berjalan pada mesin '%s' pid %<PRIuMAX> (gunakan --force jika tidak)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Ada terlalu banyak objek longgar yang tak dapat dicapai; jalankan 'git "
 "prune' untuk menghapusnya."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<tugas>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule tidak diperbolehkan"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "argumen --schedule tidak dikenal '%s'"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "gagal menulis grafik komit"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "gagal mem-praambil remote"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "gagal memulai proses 'git pack-objects'"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "gagal menyelesaikan proses 'git pack-objects'"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "gagal menulis indeks multipak"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' gagal"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' gagal"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "melewatkan tugas pengepakan tambahan karena core.multiPackIndex dinonaktifkan"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "berkas kunci '%s' ada, melewatkan pemeliharaan"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "tugas '%s' gagal"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' bukan tugas yang valid"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "tugas '%s' tidak dapat dipilih berulang kali"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "jalankan tugas berdasarkan keadaan repositori"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "frekuensi"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "jalankan tugas berdasarkan frekuensi"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr ""
 "jangan laporkan perkembangan atau informasi lainnya ke kesalahan standar"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tugas"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "jalankan tugas spesifik"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "gunakan paling banyak satu dari --auto dan --schedule=<frekuensi>"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "gagal menjalankan 'git config'"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "gagal memperluas jalur '%s'"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "gagal menjalankan launchctl"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "gagal membuat direktori untuk '%s'"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "gagal men-tali-botkan layanan %s"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "gagal membuat berkas xml sementara"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "gagal menjalankan schtasks"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "gagal menjalankan 'crontab -l'; sistem Anda mungkin tidak mendukung 'cron'"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr ""
 "gagal menjalankan 'crontab'; sistem Anda mungkin tidak mendukung 'cron'"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "gagal membuka masukan standar dari 'crontab'"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' mati"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "gagal memulai systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "gagal menjalankan systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "gagal menghapus '%s'"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "argumen --scheduler tidak dikenal '%s'"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "baik pewaktu systemd atau crontab tidak tersedia"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "penjadwal %s tidak tersedia"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "proses lainnya sedang menjadwalkan peme"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<penjadwal>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "penjadwal"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "penjadwal untuk memicu git maintenance run"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "gagal menambahkan repositori ke konfigurasi global"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <subperintah> [<opsi>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "subperintah tidak valid: %s"
@@ -16067,25 +16124,25 @@ msgstr ""
 msgid "unrecognized help format '%s'"
 msgstr "format bantuan tidak dikenal '%s'"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "gagal menjalankan emacsclient."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "gagal menguraikan versi emacsclient."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "versi emacsclient '%d' terlalu usang (< 22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "gagal menjalankan '%s'"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16094,7 +16151,7 @@ msgstr ""
 "'%s': jalur untuk pembaca man yang tidak didukung.\n"
 "Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16103,39 +16160,39 @@ msgstr ""
 "'%s': cmd untuk pembaca man yang didukung.\n"
 "Mohon gunakan 'man.<tool>.path' sebagai gantinya."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': pembaca man tidak dikenal"
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "tidak ada pembaca man yang menangani permintaan"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "tidak ada pembaca info yang menangani permintaan"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' dialiaskan ke '%s'"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "untai alias.%s jelek: %s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "opsi ini tidak mengambil argumen lainnya"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "penggunaan: %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' untuk informasi lebih lanjut"
 
@@ -16402,18 +16459,10 @@ msgstr "%s jelek"
 msgid "unknown hash algorithm '%s'"
 msgstr "algoritma hash tak dikenal '%s'"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin memerlukan repositori git"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format tidak dapat digunakan dengan --stdin"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify tanpa nama berkas paket diberikan"
@@ -16540,10 +16589,6 @@ msgstr ""
 msgid "specify the hash algorithm to use"
 msgstr "tentukan algoritma hash yang akan digunakan"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir dan --bare saling eksklusif"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -16675,85 +16720,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Keluaran terakhir: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: berkas jelek"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "tidak dapat membaca objek %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipe tidak dikenal: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: sampul tidak valid dari mode deskripsi"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers tanpa nilai"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "tidak dapat membuka berkas tambalan %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "butuh tepatnya satu rentang"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "bukan sebuah rentang"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "sampul surat butuh format email"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "gagal membuat berkas sampul surat"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to gila: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "dua direktori keluaran?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "komit tidak dikenal %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "gagal menguraikan '%s' sebagai referensi valid"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "tidak dapat menemukan dasar penggabungan eksak"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -16765,292 +16810,276 @@ msgstr ""
 "Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id "
 "dasar komit>"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "tidak dapat menemukan dasar penggabungan eksak"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "dasar komit seharusnya menjadi leluhur daftar revisi"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "dasar komit tidak seharusnya dalam daftar revisi"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "tidak dapat mendapatkan id tambalan"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "gagal menduga asal range-diff dari seri saat ini"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "gunakan [PATCH] bahkan dengan banyak tambalan"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "cetak tambalan ke keluaran standar"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "buat sampul surat"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "gunakan <akhiran> daripada '.patch'"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "mulai menomorkan tambalan pada <n> daripada 1"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr ""
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "tandai seri sebagai gulung ulang ke-N"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "panjang nama berkas keluaran maksimum"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "gunakan [RFC PATCH] daripada [PATCH]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "gunakan [<prefix>] daripada [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "simpan hasil berkas di <direktori>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "jangan copot/tambah [PATCH]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "jangan keluarkan diff biner"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "keluarkan hash semua-nol di kepala From"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "jangan termasuk tambalan yang cocok dengan komit hulu"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Perpesanan"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "kepala"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "tambahkan kepala email"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "tambahkan kepala To:"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "tambahkan kepala Cc:"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "buat surat pertama balasan ke <id pesan>"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "perbatasan"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "lampirkan tambalan"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "bariskan tambalan"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktifkan utasan pesan, gaya: shallow, deep"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "tanda tangan"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "tambah tanda tangan"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "dasar komit"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "tambahkan info pohon prasyarat ke seri tambalan"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "tambahkan tandatangan dari berkas"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "jangan cetak nama berkas tambalan"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "perlihatkan perkembangan ketika membuat tambalan"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu "
 "tambalan"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "persentase dimana pembuatan tertimbang"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "baris identitas tidak valid: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n dan -k saling eksklusif"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc dan -k saling eksklusif"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only tidak masuk akal"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status tidak masuk akal"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check tidak masuk akal"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, dan --output-directory saling eksklusif"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff butuh --cover-letter atau satu tambalan"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff terhadap v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor butuh --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff butuh --cover-letter atau satu tambalan"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff terhadap v%d:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "tidak dapat membaca berkas tanda tangan '%s'"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Membuat tambalan"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "tidak dapat membuat berkas keluaran"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17058,119 +17087,123 @@ msgstr ""
 "Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
 "secara manual.\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opsi>] [<berkas>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "pisahkan jalur dengan karakter NUL"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifikasi status berkas dengan tag"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "gunakan huruf kecil untuk berkas 'asumsikan tak berubah'"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "gunakan huruf kecil untuk berkas 'fsmonitor bersih'"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "perlihatkan berkas tertembolok di dalam keluaran (asali)"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "perlihatkan berkas yang dihapus di dalam keluaran"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "perlihatkan berkas yang berubah di dalam keluaran"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "perlihatkan berkas lainnya di dalam keluaran"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "perlihatkan berkas terabaikan di dalam keluaran"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "perlihatkan nama objek dari konten tergelar di dalam keluaran"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "perlihatkan berkas pada sistem berkas yang perlu dihapus"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "hanya perlihatkan nama direktori 'lainnya'"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "perlihatkan akhiran baris berkas"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "jangan perlihatkan direktori kosong"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "perlihatkan berkas tak tergabung di dalam keluaran"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "perlihatkan informasi resolve-undo"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "lewati berkas yang cocok dengan pola"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "baca pola pengecualian dari <berkas>"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "baca pola pengecualian tambahan per direktor dalam <berkas>"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "tambahkan pengecualian git standar"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "buat keluaran relatif terhadap direktori puncak proyek"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "rekursi melalui submodul"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 "jika <berkas> apapun tidak berada di indeks, perlakukan sebagai kesalahan"
 
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "mirip-pohon"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "berpura-pura bahwa jalur yang dihapus sejak <mirip-pohon> masih ada"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "perlihatkan data penirkutuan"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "hapus entri duplikat"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "perlihatkan direktori tipis di hadapan indeks tipis"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -17365,26 +17398,30 @@ msgid "use a diff3 based merge"
 msgstr ""
 
 #: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
+msgid "use a zealous diff3 based merge"
 msgstr ""
 
 #: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
+msgid "for conflicts, use our version"
 msgstr ""
 
 #: builtin/merge-file.c:41
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr ""
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr ""
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr ""
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr ""
 
@@ -17423,180 +17460,184 @@ msgstr ""
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opsi>] [<komit>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "tombol `m' butuh sebuah nilai"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opsi `%s' butuh sebuah nilai"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Strategi yang tersedia:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Strategi kustom yang tersedia:"
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "jangan perlihatkan diffstat pada akhir penggabungan"
 
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "perlihatkan diffstat pada akhir penggabungan"
 
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(sinonim untuk --stat)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "tambah (paling banyak <n>) entri dari log pendek ke pesan komit penggabungan"
 
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "buat satu komit daripada melakukan penggabungan"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "lakukan komit jika penggabungan sukses (asali)"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "sunting pesan sebelum komit"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "perbolehkan maju cepat (asali)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "batalkan jika maju cepat tidak dimungkinkan"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "periksa bahwa komit bernama punya tandatangan GPG yang valid"
 
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "strategi penggabungan yang digunakan"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "opsi=nilai"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "opsi untuk strategi penggabungan yang dipilih"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)"
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "gunakan <nama> daripada target sebenarnya"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "batalkan penggabungan yang sedang berlangsung saat ini"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort tapi biarkan indeks dan pohon kerja"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "perbolehkan penggabungan riwayat yang tak terkait"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "lewati kail pre-merge-commit dan commit-msg"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "tidak dapat menjalankan stase."
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "stase gagal"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "bukan objek valid: %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree gagal"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Lumat komit -- tak perbarui HEAD\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' tidak menunjuk pada sebuah komit"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Untai branch.%s.mergeoptions jelek: %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "Tak tangani apapun selain penggabungan dua kepala."
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "opsi strategi tidak dikenal: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "tidak dapat menulis %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Tidak dapat membaca dari '%s'"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Tak mengkomit penggabungan; gunakan 'git commit' untuk menyelesaikan "
 "penggabungan.\n"
 
-#: builtin/merge.c:829
+#: builtin/merge.c:831
 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"
@@ -17606,11 +17647,11 @@ msgstr ""
 "diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
 "topik.\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Pesan kosong membatalkan komit.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -17619,72 +17660,72 @@ msgstr ""
 "Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
 "komit.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Pesan komit kosong"
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Luar biasa.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "Penggabungan otomatis gagal; selesaikan konflik lalu komit hasilnya.\n"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Tidak ada cabang saat ini."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Tidak ada remote untuk cabang saat ini."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "bukan sesuatu yang kami bisa gabungkan"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort harap tanpa argumen"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit harap tanpa argumen"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue harap tanpa argumen"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17692,7 +17733,7 @@ msgstr ""
 "Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
 "Mohon komit perubahan Anda sebelum Anda gabungkan."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17700,85 +17741,77 @@ msgstr ""
 "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
 "Mohon komit perubahan Anda sebelum Anda gabungkan."
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada)."
 
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Lumat komit ke kepala kosong belum didukung"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Komit nir maju cepat tidak masuk akal ke kepala kosong"
 
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "menolak menggabungkan riwayat tak terkait"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Memperbarui %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Tidak.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Memutar ulang pohon ke asli...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Mencoba strategi penggabungan %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Tidak ada strategi yang menangani penggabungan.\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Penggabungan dengan strategi %s gagal.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -17822,7 +17855,7 @@ msgstr ""
 msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr ""
 
@@ -17884,7 +17917,7 @@ msgstr ""
 msgid "refs snapshot for selecting bitmap commits"
 msgstr ""
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -17982,52 +18015,52 @@ msgstr "%s, source=%s, destination=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Mengganti nama %s ke %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gagal mengganti nama '%s'"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr ""
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr ""
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr ""
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr ""
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr ""
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr ""
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr ""
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr ""
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr ""
 
@@ -18140,25 +18173,25 @@ msgstr ""
 msgid "Write/edit the notes for the following object:"
 msgstr ""
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr ""
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr ""
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr ""
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr ""
 
@@ -18167,7 +18200,7 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
@@ -18209,8 +18242,8 @@ msgstr ""
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr ""
 
@@ -18255,7 +18288,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr ""
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr ""
@@ -18371,17 +18404,17 @@ msgstr ""
 msgid "unknown -s/--strategy: %s"
 msgstr ""
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr ""
 
-#: builtin/notes.c:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr ""
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18389,41 +18422,41 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr ""
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr ""
 
-#: builtin/notes.c:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr ""
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr ""
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr ""
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
@@ -18805,10 +18838,6 @@ msgstr ""
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr ""
@@ -18825,7 +18854,7 @@ msgstr ""
 msgid "Enumerating objects"
 msgstr ""
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -18861,19 +18890,19 @@ msgstr ""
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr ""
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr ""
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
@@ -18906,7 +18935,7 @@ msgstr "perbolehkan maju cepat"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "kontrol penggunaan kail pre-merge-commit dan commit-msg"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "stash/stash pop otomatis sebelum dan sesudah"
 
@@ -18983,6 +19012,7 @@ msgid "<remote>"
 msgstr "<remote>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<cabang>"
 
@@ -19015,13 +19045,13 @@ msgstr "Tidak dapat mengakses komit %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19036,30 +19066,31 @@ msgstr ""
 "Anda dapat melakukannya dengan menjalankan salah satu perintah berikut\n"
 "suatu saat sebelum penarikan berikutnya:\n"
 "\n"
-"  git config pull.rebase false  # penggabungan (strategi asali)\n"
+"  git config pull.rebase false  # penggabungan\n"
 "  git config pull.rebase true   # pendasaran ulang\n"
 "  git config pull.ff only       # hanya maju cepat\n"
 "\n"
 "Anda dapat mengganti \"git config\" dengan \"git config --global\" untuk\n"
-"menyetel pilihan asali untuk semua repositori. Anda juga dapat melewatkan\n"
+"menyetel preferensi asali untuk semua repositori. Anda juga dapat "
+"melewatkan\n"
 "--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
 "asali terkonfigurasi untuk setiap invokasi.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Memperbarui cabang yang belum lahir dengan perubahan yang ditambahkan ke "
 "indeks."
 
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "tarik dengan pendasaran ulang"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "mohon komit atau stase itu."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19069,7 +19100,7 @@ msgstr ""
 "fetch memperbarui kepala cabang saat ini.\n"
 "memajukan-cepat pohon kerja Anda dari komit %s."
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19086,23 +19117,23 @@ msgstr ""
 "$ git reset --hard\n"
 "untuk memulihkan."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Tidak dapat maju cepat ke banyak cabang."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Perlu sebutkan cara merujukkan cabang yang berlainan."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
@@ -19278,7 +19309,7 @@ msgstr "Mendorong ke %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "gagal dorong beberapa referensi ke '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "repositori"
 
@@ -19351,10 +19382,6 @@ msgstr "Tandatangan GPG dorong"
 msgid "request atomic transaction on remote side"
 msgstr "minta transaksi atomik pada sisi remote"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags "
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete tidak masuk akal tanpa referensi"
@@ -19386,26 +19413,14 @@ msgstr ""
 "\n"
 "    git push <nama>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all dan --tags tidak kompatibel"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all tidak dapat digabung dengan spek referensi"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror dan --tags tidak kompatibel"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all dan --mirror tidak kompatibel"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "opsi dorong harus tidak ada karakter baris baru"
@@ -19829,18 +19844,6 @@ msgstr "Sepertinya 'git am' sedang berjalan. Tidak dapat mendasarkan ulang"
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges digantikan oleh --rebase-merges"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--onto'"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "tidak dapat menggabungkan '--keep-base' dengan '--root'"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
@@ -19906,8 +19909,8 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy butuh --merge atau --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "tidak dapat menggabungkan opsi penerapan dengan opsi penggabungan"
+msgid "apply options and merge options cannot be used together"
+msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -19948,7 +19951,7 @@ msgid "no such branch/commit '%s'"
 msgstr "tidak ada cabang/komit seperti '%s'"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Tidak ada referensi seperti: %s"
@@ -20018,7 +20021,7 @@ msgstr "Maju-cepat %s ke %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <direktori git>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -20047,7 +20050,7 @@ msgstr ""
 "Untuk mematikan pesan ini dan tetap menjaga kebiasaan asali, setel\n"
 "variabel konfigurasi 'receive.denyCurrentBranch' ke 'refuse'."
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -20067,13 +20070,13 @@ msgstr ""
 "\n"
 "Untuk mematikan pesan ini, Anda dapat menyetelnya ke 'refuse'."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "diam"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Anda harus menyebutkan sebuah direktori."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "Anda harus menyebutkan sebuah direktori"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20097,41 +20100,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referensi>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' bukan stempel waktu valid"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Menandai objek yang bisa dicapai..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s tidak menunjuk ke apapun!"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "tidak ada log referensi yang disebutkan untuk dihapus"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "bukan sebuah log referensi: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "tidak ada log referensi untuk '%s'"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format referensi tidak valid: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -20222,6 +20225,11 @@ msgstr "git remote update [<opsi>] [<group> | <remote>]..."
 msgid "Updating %s"
 msgstr "Memperbarui %s"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Tidak dapat mengambil %s"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -20671,151 +20679,143 @@ msgstr ""
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "tidak dapat memulai pack-objects untuk mengepak ulang objek pejanji"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack: Mengharapkan baris ID objek hex penuh hanya dari pack-objects."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "tidak dapat menyelesaikan pack-objects untuk mengepak ulang objek pejanji"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "tidak dapat membuka indeks untuk %s"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "pak %s terlalu besar untuk dipertimbangkan dalam deret geometri"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "pak %s terlalu besar untuk digulung"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "tidak dapat membuka berkas sementara '%s' untuk ditulis"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "tidak dapat menutup berkas sementara jepretan referensi"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "pak semuanya dalam satu pak"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "sama seperti -a, dan jadikan objek yang tak dapat dicapai longgar"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "hapus pak berlebihan, dan jalankan git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "lewatkan --no-reuse-delta ke git-pack-objects"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "lewatkan --no-reuse-object ke git-pack-objects"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "jangan jalankan git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "lewatkan --local ke git-pack-objects"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "tulis indeks bitmap"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "lewatkan --delta-islands ke git-pack-objects"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "tanggal aproksimasi"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "dengan -A, jangan longgarkan objek lebih lama dari ini"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "dengan -a, pak ulang objek yang tak dapat dicapai"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "ukuran jendela yang digunakan untuk kompresi delta"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "bita"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "sama seperti yang diatas, tetapi batasi penggunaan memori daripada hitungan "
 "entri"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "batasi kedalaman delta maksimum"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "batasi jumlah utas maksimum"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "ukuran maksimum setiap berkas pak"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "pak ulang objek dalam pak yang ditandai dengan .keep"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "jangan pak ulang pak ini"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "temukan deret geometri dengan faktor <N>"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "tulis indeks multipak dari pak yang dihasilkan"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "tidak dapat menghapus pak dalam repositori objek berharga"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable dan -A tidak kompatibel"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric tidak kompatibel dengan -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Tidak ada yang baru untuk dipak."
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "berkas yang diperlukan hilang: %s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "tidak dapat membatal taut: %s"
@@ -20893,169 +20893,163 @@ msgstr ""
 msgid "unable to open %s for reading"
 msgstr ""
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr ""
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr ""
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr ""
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr ""
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr ""
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr ""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr ""
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr ""
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr ""
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr ""
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr ""
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr ""
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr ""
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr ""
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr ""
 
@@ -21076,132 +21070,124 @@ msgstr ""
 msgid "unable to generate diff for '%s'"
 msgstr ""
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<mirip-pohon>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "campuran"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "lunak"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "keras"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "gabungan"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "simpan"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Anda tidak punya HEAD yang valid."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Gagal menemukan pohon HEAD."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Gagal menemukan pohon dari %s."
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD sekarang pada %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan."
 
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "diam, hanya laporkan kesalahan"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "setel ulang HEAD dan indeks"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "hanya setel ulang HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "setel ulang HEAD, indeks dan pohon kerja"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "setel ulang HEAD tapi simpan perubahan lokal"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr "hanya rekam fakta bahwa jalur yang terhapus akan ditambahkan nanti"
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid."
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed dengan jalur usang; sebagai gantinya gunakan 'git reset --<jalur>'."
 
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Tidak dapat lakukan reset %s dengan jalur."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "Reset %s tidak diperbolehkan dalam repositori bare"
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N hanya dapat digunakan dengan --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Perubahan tak tergelar setelah setel ulang:"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21214,19 +21200,15 @@ msgstr ""
 "Anda dapat menggunakan '--quiet' untuk hindari hal ini. Setel konfigurasi\n"
 "reset.quiet ke true untuk membuat hal tersebut asali.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'."
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Tidak dapat menulis berkas indeks baru."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "tidak dapat menggabungkan --exclude-promisor-objects dan --missing"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "penyaringan objek memerlukan --objects"
@@ -21236,8 +21218,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list tidak mendukung penampilan catatan"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "penghitungan tertanda tidak kompatibel dengan --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "hitungan tertanda dan '%s' tidak dapat digunakan bersamaan."
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21679,13 +21662,6 @@ msgstr "<n>[,<dasar>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --"
-"merge-base"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid"
@@ -21706,19 +21682,19 @@ msgstr[1] "hanya %d entri yang bisa diperlihatkan pada satu waktu."
 msgid "no such ref %s"
 msgstr "tidak ada referensi seperti %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "tidak dapat menangani lebih dari %d revisi."
 msgstr[1] "tidak dapat menangani lebih dari %d revisi."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' bukan sebuah referensi yang valid."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "tidak dapat menemukan komit %s (%s)"
@@ -21779,94 +21755,122 @@ msgstr ""
 
 #: builtin/sparse-checkout.c:22
 msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
-msgstr ""
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opsi>"
 
 #: builtin/sparse-checkout.c:46
 msgid "git sparse-checkout list"
-msgstr ""
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "pohon kerja ini bukan tipis"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
-msgstr ""
+msgstr "pohon kerja ini bukan tipis (berkas sparse-checkout mungkin tidak ada)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr ""
+"directori '%s' berisi berkas tak teracak, tapi tidak di dalam kerucut "
+"sparse-checkout"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
-msgstr ""
+msgstr "gagal menghapus direktori '%s'"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
-msgstr ""
+msgstr "gagal membuat direktori untuk berkas sparse-checkout"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
-msgstr ""
+msgstr "gagal mengupgrade format repositori untuk mengaktifkan worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
-msgstr ""
+msgstr "gagal menyetel setelan extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "gagal memodifikasi konfigurasi sparse-index"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
-msgstr ""
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
-msgstr ""
+msgstr "inisialisasi checkout tipis dalam mode kerucut"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
-msgstr ""
+msgstr "gunakan indeks tipis"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr ""
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
-msgstr ""
+msgstr "gagal membuka '%s'"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
-msgstr ""
-
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr ""
+msgstr "tidak dapat menormalkan jalur %s"
 
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
-msgstr ""
+msgstr "tidak dapat membatal-kutip untai gaya C '%s'"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
-msgstr ""
+msgstr "tidak dapat memuat pola checkout tipis yang sudah ada"
 
-#: builtin/sparse-checkout.c:667
-msgid "read patterns from standard in"
-msgstr ""
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "pola checkout tipis yang sudah ada tidak menggunakan mode kerucut"
 
 #: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <pola>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
+msgid "read patterns from standard in"
+msgstr "baca pola dari masukan standar"
+
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "tidak ada checkout tipis untuk ditambahkan"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
 msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<pola>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "harus berada di dalam checkout tipis untuk menerapkan ulang pola kejarangan"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
-msgstr ""
+msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
-msgstr ""
+msgstr "kesalahan saat menyegarkan direktori kerja"
 
 #: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
@@ -21890,23 +21894,25 @@ msgstr "git stash branch <nama cabang> [<stase>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
-"          [--pathspec-from-file=<berkas> [--pathspec-file-nul]]\n"
-"          [--] [<spek jalur>...]]"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
+"          [-q|--quiet] [-u|--include-untracked] [-a|--all]\n"
+"          [-m|--message <pesan>] [--pathspec-from-file=<berkas>\n"
+"          [--pathspec-file-nul]] [--] [<spek jalur>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [<pesan>]"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index]\n"
+"          [-q|--quiet] [-u|--include-untracked] [-a|--all] [<pesan>]"
 
 #: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
@@ -21999,142 +22005,160 @@ msgstr "Menggabungkan %s dengan %s"
 msgid "Index was not unstashed."
 msgstr "Indeks tak dibatal-stasekan."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "tidak dapat mengembalikan berkas tak terlacak dari stase"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "coba membuat ulang indeks"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) dijatuhkan"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Tidak dapat menjatuhkan entri stase"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' bukan referensi stase"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Entri stase disimpan jika Anda butuh itu lagi."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Tidak ada nama cabang yang disebutkan"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "gagal menguraikan pohon"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "gagal membongkar pohon"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "masukkan berkas tak terlacak ke dalam stase"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Tidak dapat memperbarui %s dengan %s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "pesan stase"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" butuh satu argumen <komit>"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Tidak ada perubahan yang tergelar"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "Tidak ada perubahan yang dipilih"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Anda belum punya komit awal"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Tidak dapat menyimpan berkas tak terlacak"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Tidak dapat menyimpan keadaan tergelar saat ini"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Tidak dapat merekam keadaan pohon kerja"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Tidak dapat menggunakan --patch dan --include-untracked atau --all pada "
 "waktu yang bersamaan"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Tidak dapat menggunakan --staged dan --include-untracked atau --all pada "
+"waktu yang bersamaan"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Anda lupa untuk 'git add'?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Tidak ada perubahan lokal untuk disimpan"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Tidak dapat menginisialisasi stase"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Tidak dapat menyimpan status saat ini"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Direktori kerja dan keadaan indeks %s disimpan"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Tidak dapat menghapus perubahaan pohon kerja"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "jaga indeks"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "hanya stase perubahan tergelar"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "stase dalam mode tambalan"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "mode hening"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "masukkan berkas tak terlacak ke dalam stase"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "masukkan berkas ignore"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22158,7 +22182,7 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Mengharapkan nama referensi penuh, dapat %s"
@@ -22181,7 +22205,7 @@ msgstr ""
 "tidak dapat mencari konfigurasi '%s'. Asumsi bahwa repositori ini adalah "
 "hulu otoritatif tersendiri."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "jangkar alternatif untuk jalur relatif"
 
@@ -22277,7 +22301,7 @@ msgstr "tidak dapat menguraikan referensi HEAD di dalam submodul '%s'"
 msgid "failed to recurse into submodule '%s'"
 msgstr "gagal merekursi ke dalam submodul '%s'"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "sembunyikan keluaran status submodul"
 
@@ -22346,10 +22370,6 @@ msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
 msgid "could not fetch a revision for HEAD"
 msgstr "tidak dapat mengambil revisi untuk HEAD"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached dan --files saling eksklusif"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -22378,16 +22398,16 @@ msgstr "sembunyikan keluaran mensinkronisasi url submodul"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda "
-"benar-benar ingin menghapus itu termasuk semua riwayatnya)"
+"Pohon kerja submodul '%s' berisi direktori .git. Ini akan diganti dengan  "
+"berkas .git oleh dengan menggunakan absorbgitdirs."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22396,46 +22416,46 @@ msgstr ""
 "Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
 "menyingkirkan itu"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Direktori '%s' dibersihkan\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "tidak dapat membuat direktori submodul kosong %s"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Submodul '%s' (%s) tak terdaftar untuk jalur '%s'\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "hapus pohon kerja submodul bahkan jika itu berisi perubahan lokal"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "batal daftar semua submodul"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Gunakan '--all' jika Anda benar-benar ingin deinisialisasi semua submodul"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -22447,68 +22467,68 @@ msgstr ""
 " itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
 "kloning degan '--reference-if-able' daripada '--reference'."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
 
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 "menolak membuat/menggunakan '%s' di dalam direktori git submodul yang lain"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "direktori tidak kosong: '%s'"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "di mana submodul baru akan dikloning"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "nama submodul baru"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "url di mana submodul dikloning"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "kedalaman untuk kloning dangkal"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "paksa perkembangan kloning"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22518,93 +22538,93 @@ msgstr ""
 "<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
 "<url> --path <jalur>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "Mode pembaruan '%s' tidak valid untuk jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Jalur submodul '%s' tidak diinisialisasi"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Melewati submodul tak tergabung %s"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Melewati submodul '%s'"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Tidak dapat men-checkout '%s' pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Gagal mendasarkan ulang '%s' pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Tidak dapat menggabungkan '%s' pada jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "Eksekusi '%s %s' gagal di jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Jalur submodul '%s': ter-checkout '%s'\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Jalur submodul '%s: terdasarkan ulang ke '%s''\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Jalur submodul '%s': tergabung dalam '%s'\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Jalur submodul '%s': '%s %s'\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 "Tidak dapat mengambil di dalam jalur submodul '%s'; mencoba mengambil "
 "langsung %s:"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -22613,85 +22633,85 @@ msgstr ""
 "Terambil di dalam jalur submodul '%s', tetapi itu tidak berisi %s. "
 "Pengambilan langsung komit tersebut gagal."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "jalur ke dalam pohon kerja"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "buat klon dangkal terpotong hingga sejumlah revisi yang disebutkan"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "pekerjaan paralel"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "jangan cetak perkembangan pengkloningan"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "nilai jelek untuk parameter pembaruan"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr ""
 "sembunyikan keluaran untuk pembaruan oleh pendasaran ulang atau penggabungan"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "paksa pembaruan checkout"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "jangan ambil objek baru dari situs remote"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr "timpa mode pembaruan jika repositori adalah kloning segar"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "kedalaman untuk pengambilan dangkal"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "SHA1 diharapkan oleh proyek super"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "SHA1 dari HEAD submodul"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<opsi>] <jalur>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -22700,94 +22720,90 @@ msgstr ""
 "Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
 "super, tapi proyek super tidak pada cabang apapun"
 
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "tidak dapat mendapat pegangan repositori untuk submodul '%s'"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "rekursi ke dalam submodul"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "batal setel konfigurasi dalam berkas .gitmodules"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nama> [<nilai>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nama>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "mohom pastikan berkas .gitmodules di dalam pohon kerja"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "sembunyikan keluaran penyetelan url submodule"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "setel cabang pelacak asali ke master"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "setel cabang pelacak asali"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <jalur>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <cabang> <jalur>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch atau --default dibutuhkan"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch dan --default saling eksklusif"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "Menambahkan repo yang sudah ada pada '%s' ke indeks\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' sudah ada dan bukan repo git valid"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22804,84 +22820,84 @@ msgstr ""
 "atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi '--"
 "name'."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "Mengaktifkan ulang direktori git lokal untuk submodul '%s'\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Tidak dapat men-checkout submodul '%s'"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Tidak dapat menambahkan submodul '%s'"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Gagal mendaftarkan jalur submodul '%s'"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' sudah ada di dalam indeks"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' sudah ada di dalam indeks dan bukan submodul"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "cabang repositori untuk ditambahkan sebagai submodul"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "perbolehkan menambah jalur submodul yang diabaikan"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "hanya cetak pesan kesalahan"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "pinjam objek dari repositori referensi"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr ""
 "setel nama submodul ke untai yang diberikan daripada diasalkan ke jalurnya"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<opsi>] [--] <repositori> [<jalur>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "Jalur relatif hanya dapat digunakan dari level atas dari pohon kerja"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "URL repo: '%s' harus absolut atau diawali dengan ./|../"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' bukan nama submodul yang valid"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s tidak mendukung --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' bukan subperintah submodule--helper valid"
@@ -22980,11 +22996,11 @@ msgstr ""
 "Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapus itu bila "
 "Anda mau.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "tidak dapat menandatangani tag"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -22998,15 +23014,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "tipe objek jelek."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "tidak ada pesan tag?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Pesan tag dibiarkan di %s\n"
@@ -23087,45 +23103,22 @@ msgstr "hanya cetak tag yang tak tergabung"
 msgid "print only tags of the object"
 msgstr "hanya cetak tag dari objek"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column dan -n tidak kompatibel"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "opsi -n hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "opsi --contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "opsi --no-contains hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "opsi --points-at hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "opsi --merged dan --no-merged hanya diperbolehkan dalam mode daftar"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "hanya satu opsi -F atau -m yang diperbolehkan."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "opsi '%s' hanya diperbolehkan dalam mode daftar"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' bukan nama tag yang valid."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "tag '%s' sudah ada"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' diperbarui (yaitu %s)\n"
@@ -23548,195 +23541,183 @@ msgstr ""
 msgid "initializing"
 msgstr ""
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr ""
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr ""
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr ""
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr ""
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr ""
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr ""
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr ""
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr ""
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr ""
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr ""
@@ -23788,21 +23769,16 @@ msgstr ""
 "untuk baca tentang perintah atau konsep spesifik.\n"
 "Lihat 'git help git' untuk gambaran tentang sistem."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "tidak ada direktori yang diberikan untuk --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "tidak ada direktori yang diberikan untuk opsi '%s'\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "tidak ada direktori yang diberikan untuk --work-tree\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -23818,11 +23794,6 @@ msgstr "-c mengharapkan sebuah untai konfigurasi\n"
 msgid "no config key given for --config-env\n"
 msgstr "tidak ada kunci konfigurasi yang diberikan untuk --config-env\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "tidak ada direktori yang diberikan untuk -C\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -23852,29 +23823,29 @@ msgstr "alias kosong untuk %s"
 msgid "recursive alias: %s"
 msgstr "alias rekursif: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "kegagalan menulis pada keluaran standar"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "kegagal menulis tidak diketahui pada keluaran standar"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "penutupan gagal pada keluaran standar"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "putaran alias terdeteksi: perluasan '%s' tidak berhenti:%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "tidak dapat menangani %s sebagai bawaan"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23883,33 +23854,25 @@ msgstr ""
 "penggunaan: %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "perluasan alias '%s' gagal; '%s' bukan sebuah perintah git\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "gagal menjalankan perintah '%s': %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr ""
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr ""
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr ""
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr ""
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr ""
@@ -24182,6 +24145,170 @@ msgstr ""
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr ""
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr ""
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr ""
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr ""
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr ""
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr ""
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr ""
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr ""
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr ""
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr ""
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr ""
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr ""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr ""
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr ""
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr ""
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr ""
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr ""
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr ""
@@ -24206,36 +24333,36 @@ msgstr ""
 msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr ""
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr ""
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr ""
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr ""
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr ""
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr ""
 
@@ -24304,15 +24431,15 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr ""
 
 #: command-list.h:65
-msgid "Switch branches or restore working tree files"
+msgid "Ensures that a reference name is well formed"
 msgstr ""
 
 #: command-list.h:66
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
 msgstr ""
 
 #: command-list.h:67
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
 msgstr ""
 
 #: command-list.h:68
@@ -24508,55 +24635,55 @@ msgid "Add or parse structured information in commit messages"
 msgstr ""
 
 #: command-list.h:116
-msgid "The Git repository browser"
+msgid "Show commit logs"
 msgstr ""
 
 #: command-list.h:117
-msgid "Show commit logs"
+msgid "Show information about files in the index and the working tree"
 msgstr ""
 
 #: command-list.h:118
-msgid "Show information about files in the index and the working tree"
+msgid "List references in a remote repository"
 msgstr ""
 
 #: command-list.h:119
-msgid "List references in a remote repository"
+msgid "List the contents of a tree object"
 msgstr ""
 
 #: command-list.h:120
-msgid "List the contents of a tree object"
+msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
 #: command-list.h:121
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "Simple UNIX mbox splitter program"
 msgstr ""
 
 #: command-list.h:122
-msgid "Simple UNIX mbox splitter program"
+msgid "Run tasks to optimize Git repository data"
 msgstr ""
 
 #: command-list.h:123
-msgid "Run tasks to optimize Git repository data"
+msgid "Join two or more development histories together"
 msgstr ""
 
 #: command-list.h:124
-msgid "Join two or more development histories together"
+msgid "Find as good common ancestors as possible for a merge"
 msgstr ""
 
 #: command-list.h:125
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Run a three-way file merge"
 msgstr ""
 
 #: command-list.h:126
-msgid "Run a three-way file merge"
+msgid "Run a merge for files needing merging"
 msgstr ""
 
 #: command-list.h:127
-msgid "Run a merge for files needing merging"
+msgid "The standard helper program to use with git-merge-index"
 msgstr ""
 
 #: command-list.h:128
-msgid "The standard helper program to use with git-merge-index"
+msgid "Show three-way merge without touching index"
 msgstr ""
 
 #: command-list.h:129
@@ -24564,179 +24691,179 @@ msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
+msgid "Creates a tag object with extra validation"
 msgstr ""
 
 #: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
+msgid "Build a tree-object from ls-tree formatted text"
 msgstr ""
 
 #: command-list.h:132
-msgid "Creates a tag object with extra validation"
+msgid "Write and verify multi-pack-indexes"
 msgstr ""
 
 #: command-list.h:133
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Move or rename a file, a directory, or a symlink"
 msgstr ""
 
 #: command-list.h:134
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Find symbolic names for given revs"
 msgstr ""
 
 #: command-list.h:135
-msgid "Find symbolic names for given revs"
+msgid "Add or inspect object notes"
 msgstr ""
 
 #: command-list.h:136
-msgid "Add or inspect object notes"
+msgid "Import from and submit to Perforce repositories"
 msgstr ""
 
 #: command-list.h:137
-msgid "Import from and submit to Perforce repositories"
+msgid "Create a packed archive of objects"
 msgstr ""
 
 #: command-list.h:138
-msgid "Create a packed archive of objects"
+msgid "Find redundant pack files"
 msgstr ""
 
 #: command-list.h:139
-msgid "Find redundant pack files"
+msgid "Pack heads and tags for efficient repository access"
 msgstr ""
 
 #: command-list.h:140
-msgid "Pack heads and tags for efficient repository access"
+msgid "Compute unique ID for a patch"
 msgstr ""
 
 #: command-list.h:141
-msgid "Compute unique ID for a patch"
+msgid "Prune all unreachable objects from the object database"
 msgstr ""
 
 #: command-list.h:142
-msgid "Prune all unreachable objects from the object database"
+msgid "Remove extra objects that are already in pack files"
 msgstr ""
 
 #: command-list.h:143
-msgid "Remove extra objects that are already in pack files"
+msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
 #: command-list.h:144
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Update remote refs along with associated objects"
 msgstr ""
 
 #: command-list.h:145
-msgid "Update remote refs along with associated objects"
+msgid "Applies a quilt patchset onto the current branch"
 msgstr ""
 
 #: command-list.h:146
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
 #: command-list.h:147
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Reads tree information into the index"
 msgstr ""
 
 #: command-list.h:148
-msgid "Reads tree information into the index"
+msgid "Reapply commits on top of another base tip"
 msgstr ""
 
 #: command-list.h:149
-msgid "Reapply commits on top of another base tip"
+msgid "Receive what is pushed into the repository"
 msgstr ""
 
 #: command-list.h:150
-msgid "Receive what is pushed into the repository"
+msgid "Manage reflog information"
 msgstr ""
 
 #: command-list.h:151
-msgid "Manage reflog information"
+msgid "Manage set of tracked repositories"
 msgstr ""
 
 #: command-list.h:152
-msgid "Manage set of tracked repositories"
+msgid "Pack unpacked objects in a repository"
 msgstr ""
 
 #: command-list.h:153
-msgid "Pack unpacked objects in a repository"
+msgid "Create, list, delete refs to replace objects"
 msgstr ""
 
 #: command-list.h:154
-msgid "Create, list, delete refs to replace objects"
+msgid "Generates a summary of pending changes"
 msgstr ""
 
 #: command-list.h:155
-msgid "Generates a summary of pending changes"
+msgid "Reuse recorded resolution of conflicted merges"
 msgstr ""
 
 #: command-list.h:156
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Reset current HEAD to the specified state"
 msgstr ""
 
 #: command-list.h:157
-msgid "Reset current HEAD to the specified state"
+msgid "Restore working tree files"
 msgstr ""
 
 #: command-list.h:158
-msgid "Restore working tree files"
+msgid "Lists commit objects in reverse chronological order"
 msgstr ""
 
 #: command-list.h:159
-msgid "Revert some existing commits"
+msgid "Pick out and massage parameters"
 msgstr ""
 
 #: command-list.h:160
-msgid "Lists commit objects in reverse chronological order"
+msgid "Revert some existing commits"
 msgstr ""
 
 #: command-list.h:161
-msgid "Pick out and massage parameters"
+msgid "Remove files from the working tree and from the index"
 msgstr ""
 
 #: command-list.h:162
-msgid "Remove files from the working tree and from the index"
+msgid "Send a collection of patches as emails"
 msgstr ""
 
 #: command-list.h:163
-msgid "Send a collection of patches as emails"
+msgid "Push objects over Git protocol to another repository"
 msgstr ""
 
 #: command-list.h:164
-msgid "Push objects over Git protocol to another repository"
+msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 
 #: command-list.h:165
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Common Git shell script setup code"
 msgstr ""
 
 #: command-list.h:166
-msgid "Summarize 'git log' output"
+msgid "Restricted login shell for Git-only SSH access"
 msgstr ""
 
 #: command-list.h:167
-msgid "Show various types of objects"
+msgid "Summarize 'git log' output"
 msgstr ""
 
 #: command-list.h:168
-msgid "Show branches and their commits"
+msgid "Show various types of objects"
 msgstr ""
 
 #: command-list.h:169
-msgid "Show packed archive index"
+msgid "Show branches and their commits"
 msgstr ""
 
 #: command-list.h:170
-msgid "List references in a local repository"
+msgid "Show packed archive index"
 msgstr ""
 
 #: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
+msgid "List references in a local repository"
 msgstr ""
 
 #: command-list.h:172
-msgid "Common Git shell script setup code"
+msgid "Initialize and modify the sparse-checkout"
 msgstr ""
 
 #: command-list.h:173
-msgid "Initialize and modify the sparse-checkout"
+msgid "Add file contents to the staging area"
 msgstr ""
 
 #: command-list.h:174
@@ -24744,167 +24871,167 @@ msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
+msgid "Show the working tree status"
 msgstr ""
 
 #: command-list.h:176
-msgid "Show the working tree status"
+msgid "Remove unnecessary whitespace"
 msgstr ""
 
 #: command-list.h:177
-msgid "Remove unnecessary whitespace"
+msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: command-list.h:178
-msgid "Initialize, update or inspect submodules"
+msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
 #: command-list.h:179
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Switch branches"
 msgstr ""
 
 #: command-list.h:180
-msgid "Switch branches"
+msgid "Read, modify and delete symbolic refs"
 msgstr ""
 
 #: command-list.h:181
-msgid "Read, modify and delete symbolic refs"
+msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 #: command-list.h:182
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 
 #: command-list.h:183
-msgid "Creates a temporary file with a blob's contents"
+msgid "Unpack objects from a packed archive"
 msgstr ""
 
 #: command-list.h:184
-msgid "Unpack objects from a packed archive"
+msgid "Register file contents in the working tree to the index"
 msgstr ""
 
 #: command-list.h:185
-msgid "Register file contents in the working tree to the index"
+msgid "Update the object name stored in a ref safely"
 msgstr ""
 
 #: command-list.h:186
-msgid "Update the object name stored in a ref safely"
+msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
 #: command-list.h:187
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Send archive back to git-archive"
 msgstr ""
 
 #: command-list.h:188
-msgid "Send archive back to git-archive"
+msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 
 #: command-list.h:189
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Show a Git logical variable"
 msgstr ""
 
 #: command-list.h:190
-msgid "Show a Git logical variable"
+msgid "Check the GPG signature of commits"
 msgstr ""
 
 #: command-list.h:191
-msgid "Check the GPG signature of commits"
+msgid "Validate packed Git archive files"
 msgstr ""
 
 #: command-list.h:192
-msgid "Validate packed Git archive files"
+msgid "Check the GPG signature of tags"
 msgstr ""
 
 #: command-list.h:193
-msgid "Check the GPG signature of tags"
+msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Manage multiple working trees"
 msgstr ""
 
 #: command-list.h:195
-msgid "Show logs with difference each commit introduces"
+msgid "Create a tree object from the current index"
 msgstr ""
 
 #: command-list.h:196
-msgid "Manage multiple working trees"
+msgid "Defining attributes per path"
 msgstr ""
 
 #: command-list.h:197
-msgid "Create a tree object from the current index"
+msgid "Git command-line interface and conventions"
 msgstr ""
 
 #: command-list.h:198
-msgid "Defining attributes per path"
+msgid "A Git core tutorial for developers"
 msgstr ""
 
 #: command-list.h:199
-msgid "Git command-line interface and conventions"
+msgid "Providing usernames and passwords to Git"
 msgstr ""
 
 #: command-list.h:200
-msgid "A Git core tutorial for developers"
+msgid "Git for CVS users"
 msgstr ""
 
 #: command-list.h:201
-msgid "Providing usernames and passwords to Git"
+msgid "Tweaking diff output"
 msgstr ""
 
 #: command-list.h:202
-msgid "Git for CVS users"
+msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 
 #: command-list.h:203
-msgid "Tweaking diff output"
+msgid "Frequently asked questions about using Git"
 msgstr ""
 
 #: command-list.h:204
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "A Git Glossary"
 msgstr ""
 
 #: command-list.h:205
-msgid "Frequently asked questions about using Git"
+msgid "Hooks used by Git"
 msgstr ""
 
 #: command-list.h:206
-msgid "A Git Glossary"
+msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
 #: command-list.h:207
-msgid "Hooks used by Git"
+msgid "The Git repository browser"
 msgstr ""
 
 #: command-list.h:208
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Map author/committer names and/or E-Mail addresses"
 msgstr ""
 
 #: command-list.h:209
-msgid "Map author/committer names and/or E-Mail addresses"
+msgid "Defining submodule properties"
 msgstr ""
 
 #: command-list.h:210
-msgid "Defining submodule properties"
+msgid "Git namespaces"
 msgstr ""
 
 #: command-list.h:211
-msgid "Git namespaces"
+msgid "Helper programs to interact with remote repositories"
 msgstr ""
 
 #: command-list.h:212
-msgid "Helper programs to interact with remote repositories"
+msgid "Git Repository Layout"
 msgstr ""
 
 #: command-list.h:213
-msgid "Git Repository Layout"
+msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
 #: command-list.h:214
-msgid "Specifying revisions and ranges for Git"
+msgid "Mounting one repository inside another"
 msgstr ""
 
 #: command-list.h:215
-msgid "Mounting one repository inside another"
+msgid "A tutorial introduction to Git"
 msgstr ""
 
 #: command-list.h:216
@@ -24912,7 +25039,7 @@ msgid "A tutorial introduction to Git: part two"
 msgstr ""
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
+msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 
 #: command-list.h:218
@@ -24984,39 +25111,39 @@ msgstr ""
 msgid "usage: $dashless $USAGE"
 msgstr ""
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
@@ -25084,7 +25211,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25093,7 +25220,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25102,7 +25229,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25111,7 +25238,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25120,7 +25247,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25129,7 +25256,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25138,7 +25265,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25147,7 +25274,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25156,7 +25283,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25169,90 +25296,90 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -25263,56 +25390,56 @@ msgid ""
 "changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr ""
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "offset waktu lokal lebih dari atau sama dengan 24 jam\n"
 
-#: git-send-email.perl:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "fatal: perintah '%s' mati dengan kode keluar %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "penyunting keluar dengan kotor, membatalkan semua"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' berisi versi menengah dari email yang Anda buat.\n"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' berisi email yang dibuat.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases tidak kompatibel dengan opsi yang lain\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25323,11 +25450,11 @@ msgstr ""
 "Setel sendemail.forbidSendmailVariables ke false untuk menonaktifkan "
 "pemeriksaan ini.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "tidak dapat menjalankan git format-patch diluar repositori\n"
 
-#: git-send-email.perl:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -25335,37 +25462,37 @@ msgstr ""
 "`batch-size` dan `relogin` harus disebutkan bersamaan (lewat baris perintah "
 "atau opsi konfigurasi)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Bidang --suppress-cc tidak dikenal: '%s'\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Setelan --confirm tidak dikenal: '%s'\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "peringatan: alias sendmail dengan kutipan tidak didukung: %s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "peringatan: `:include:` tidak didukung: %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "peringatan: pengalihan `/file` atau `|pipe` tidak didukung: %s\n"
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "peringatan: baris sendmail tidak dikenal: %s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25380,12 +25507,12 @@ msgstr ""
 "    * Sebutkan \"./%s\" jika maksud Anda sebuah berkas; atau\n"
 "    * Berikan opsi --format-patch jika maksud Anda sebuah rentang.\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gagal membuka direktori %s: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25395,17 +25522,17 @@ msgstr ""
 "Tidak ada berkas tambalan yang disebutkan!\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Tidak ada baris subjek di %s?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gagal membuka untuk menulis %s: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25419,38 +25546,38 @@ msgstr ""
 "\n"
 "Bersihkan konten badan jika Anda tidak ingin mengirimkan rangkuman.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gagal membuka %s: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Gagal membuka %s.final: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Surel rangkuman kosong, lewati\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Anda yakin ingin menggunakan <%s> [y/N]? "
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 "Berkas berikut 8bit, tetapi tidak menyebutkan Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Pengkodean 8bit apa yang harus saya sebut [UTF-8]? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25463,22 +25590,22 @@ msgstr ""
 "punya subjek templat '*** SUBJECT HERE ***'. Lewatkan --force jika Anda "
 "benar-benar ingin mengirim.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Kepada siapa surel harus dikirim (jika ada)?"
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: alias '%s' diperluas ke dirinya sendiri\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID yang akan digunakan sebagai In-Reply-To untuk surel pertama (jika "
 "ada)?"
 
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %s\n"
@@ -25486,17 +25613,17 @@ msgstr "kesalahan: tidak dapat mengekstrak alamat yang valid dari: %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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Apa yang Anda lakukan dengan alamat ini? ([q] keluar|[d] jatuh|[e] sunting): "
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Jalur CA \"%s\" tidak ada"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -25521,114 +25648,114 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Kirim surel ini? ([y]a|[n] tidak|[e] sunting|[q] keluar|semu[a]): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Balasan kirim surel ini diperlukan"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Peladen SMTP yang diperlukan tidak dijelaskan dengan baik."
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Peladen tidak mendukung STARTTLS! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gagal! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Tidak dapat menginisialisasi SMTP dengan benar. Periksa konfigurasi dan "
 "gunakan --smtp-debug."
 
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gagal mengirim %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Terkirim-kering %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Terkirim %s\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "OK-kering. Log berkata:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Log berkata:\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Hasil: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Hasil: OK\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "tidak dapat membuka berkas %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Menambahkan to: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Menambahkan cc: %s dari baris '%s'\n"
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Tidak dapat menjalankan '%s'"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Menambahkan %s: %s dari: '%s'\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) gagal menutup pipa ke '%s'"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "tidak dapat mengirim pesan sebagai 7bit"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "pengkodean transfer tidak valid"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -25639,12 +25766,12 @@ msgstr ""
 "%s\n"
 "peringatan: tidak ada tambalan yang dikirimkan\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -25653,13 +25780,13 @@ msgstr ""
 "fatal: %s:%d lebih panjang dari 998 karakter\n"
 "peringatan: tidak ada tambalan yang dikirimkan\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Melewati %s dengan akhiran cadangan '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Anda benar-benar ingin mengirim %s? [y|N]: "
diff --git a/po/sv.po b/po/sv.po
index e3b17b6a0e..fd32edee89 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish translations for Git.
-# Copyright (C) 2010-2021 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2022 Peter Krefting <peter@softwolves.pp.se>
 # This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010-2021.
+# Peter Krefting <peter@softwolves.pp.se>, 2010-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: git 2.34.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-11 23:20+0100\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
+"PO-Revision-Date: 2022-01-11 16: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,15 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 3.30.1\n"
+"X-Generator: Gtranslator 3.38.0\n"
 
 #: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Vadå (%s)?"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "kunde inte läsa indexet"
@@ -53,7 +53,7 @@ msgstr "Uppdatera"
 msgid "could not stage '%s'"
 msgstr "kunde inte köa \"%s\""
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "kunde inte skriva indexet"
 
@@ -69,8 +69,8 @@ msgstr[1] "uppdaterade %d sökvägar\n"
 msgid "note: %s is untracked now.\n"
 msgstr "observera: %s spåras inte längre.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
@@ -111,21 +111,21 @@ msgstr[1] "lade till %d sökvägar\n"
 msgid "ignoring unmerged: %s"
 msgstr "ignorerar ej sammanslagen: %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Endast binära filer ändrade.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Inga ändringar.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Uppdatera patch"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Granska diff"
 
@@ -193,11 +193,11 @@ msgstr "markera en numrerad post"
 msgid "(empty) select nothing"
 msgstr "(tomt) markera ingenting"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Kommandon ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Vad nu"
 
@@ -209,13 +209,13 @@ msgstr "köad"
 msgid "unstaged"
 msgstr "ej köad"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "sökväg"
@@ -224,27 +224,27 @@ msgstr "sökväg"
 msgid "could not refresh index"
 msgstr "kunde inte uppdatera indexet"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Hej då.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Köa tillägg [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Köa stycket [y,n,q,a,d%s,?]? "
@@ -271,22 +271,22 @@ msgstr ""
 "a - köa stycket och alla följande i filen\n"
 "d - köa inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
@@ -313,22 +313,22 @@ msgstr ""
 "a - \"stash\":a stycket och alla följande i filen\n"
 "d - \"stash\":a inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
@@ -355,22 +355,22 @@ msgstr ""
 "a - ta bort stycket och alla följande i filen från kön\n"
 "d - ta inte bort stycket eller något av de följande i filen från kön\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
@@ -397,26 +397,26 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
@@ -443,22 +443,22 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
@@ -477,22 +477,22 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
@@ -630,7 +630,7 @@ msgstr "\"git apply --cached\" misslyckades"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -641,11 +641,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Markerade stycken kan inte appliceras på indexet!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Applicera dem på arbetskatalogen trots det? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Ingenting applicerades.\n"
 
@@ -683,11 +683,11 @@ msgstr "Inget följande stycke"
 msgid "No other hunks to goto"
 msgstr "Inga andra stycken att gå till"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "gå till vilket stycke (<ret> för att se fler)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "gå till vilket stycke? "
 
@@ -707,7 +707,7 @@ msgstr[1] "Beklagar, det finns bara %d stycken."
 msgid "No other hunks to search"
 msgstr "Inga andra stycken att söka efter"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "sök efter reguljärt uttryck? "
 
@@ -798,7 +798,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar på grund av olöst konflikgt."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
@@ -896,21 +896,33 @@ 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:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject och --3way kan inte användas samtidigt."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way utanför arkiv"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index utanför arkiv"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached utanför arkiv"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "\"%s\" utanför arkiv"
 
 #: apply.c:800
 #, c-format
@@ -1123,8 +1135,8 @@ msgstr "patch misslyckades: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "misslyckades läsa %s"
@@ -1134,382 +1146,380 @@ msgstr "misslyckades läsa %s"
 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:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "sökvägen %s har ändrat namn/tagits bort"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "Utför trevägssammanslagning...\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Misslyckades utföra trevägssammanslagning...\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tillämpade patchen på  \"%s\" rent.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Faller tillbaka på direkt tillämpning...\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "patch för borttagning lämnar kvar filinnehåll"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, förväntade %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "ogiltig sökväg \"%s\""
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: apply.c:3998
+#: apply.c:4000
 #, 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:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, 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:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillämpas"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, 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:4141
+#: apply.c:4143
 #, 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:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "kunde inte lägga till %s till temporärt index"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "kunde inte skriva temporärt index till %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s från indexet"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch för undermodulen %s"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
 
-#: apply.c:4349
+#: apply.c:4351
 #, 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:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kan inte lägga till cachepost för %s"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "misslyckades skriva till \"%s\""
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "stänger filen \"%s\""
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" läge %o"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillämpade patchen %s rent."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "internt fel"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillämpades rent."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Ignorerar patch \"%s\"."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "indata känns inte igen"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "kan inte läsa indexfilen"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kan inte öppna patchen \"%s\": %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, 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:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, 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:4973
+#: apply.c:4977
 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "antal"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillägg gjorda av patchen"
 
-#: apply.c:5028
+#: apply.c:5032
 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:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: apply.c:5034
+#: apply.c:5038
 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:5036
+#: apply.c:5040
 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:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "se till att patchen kan tillämpas på aktuellt index"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "markera nya filer med \"git add --intent-to-add\""
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "tillämpa en patch utan att röra arbetskatalogen"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "godta en patch som rör filer utanför arbetskatalogen"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "försök en trevägssammanslagning, fall tillbaka på normal patch om det "
 "misslyckas"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att åtminstone <n> rader sammanhang är lika"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "åtgärd"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "var pratsam"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte på antalet linjer i styckehuvuden"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "rot"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "lägg till <rot> i alla filnamn"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "ge inte någon felkod för tomma patchar"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1520,16 +1530,16 @@ msgstr "kan inte strömma blob:en %s"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "kunde inte starta filtret \"%s\""
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "kan inte omdirigera handtag"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "filtret \"%s\" rapporterade fel"
@@ -1573,19 +1583,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "kan inte läsa %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "kunde inte läsa \"%s\""
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -1627,7 +1631,7 @@ msgstr "fmt"
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "prefix"
 
@@ -1637,9 +1641,9 @@ msgstr "lägg till prefix till varje sökväg i arkivet"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "fil"
@@ -1669,7 +1673,7 @@ msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "arkiv"
 
@@ -1677,7 +1681,7 @@ msgstr "arkiv"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "hämta arkivet från fjärrarkivet <arkiv>"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "kommando"
@@ -1690,18 +1694,20 @@ msgstr "sökväg till kommandot git-upload-archive på fjärren"
 msgid "Unexpected option --remote"
 msgstr "Oväntad flagga --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "flaggan \"%s\" kräver \"%s\""
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Oväntad flagga --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1810,7 +1816,7 @@ msgstr "en %s-revision behövs"
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen \"%s\""
@@ -1864,10 +1870,10 @@ msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1890,105 +1896,93 @@ msgstr "sökvägen %s i %s finns inte"
 msgid "cannot read blob %s for path %s"
 msgstr "kan inte läsa objektet %s för sökvägen %s"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"När du har rättat felorsaken kan du försöka rätta\n"
-"fjärrspårningsinformationen genom att utföra\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"kan inte ärva uppströmsspårningsinformation från flera referenser när "
+"ombasering är vald"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "ställer inte in grenen %s som sin egen uppströmsgren"
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-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."
+msgid "branch '%s' set up to track '%s' by rebasing."
+msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering."
 
-#: branch.c:94
+#: branch.c:145
 #, 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 '%s'."
+msgstr "grenen \"%s\" inställd på att spåra \"%s\"."
 
-#: branch.c:98
+#: branch.c:148
 #, 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:"
+msgstr "grenen \"%s\" inställd på att spåra:"
 
-#: 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\"."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "kan inte skriva inställningar för uppströmsgren"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
-"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
+"\n"
+"När du har rättat felorsaken kan du försöka rätta\n"
+"fjärrspårningsinformationen genom att utföra:"
 
-#: branch.c:105
+#: branch.c:203
 #, 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 "asked to inherit tracking from '%s', but no remote is set"
+msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
-"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
-"ombasering."
+"bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning "
+"är vald"
 
-#: branch.c:110
+#: branch.c:252
 #, 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\"."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Kan inte skriva inställningar för uppströmsgren"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "spårar inte: tvetydig information för referensen %s"
 
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Spårar inte: tvetydig information för referensen %s"
+msgid "'%s' is not a valid branch name"
+msgstr "\"%s\" är inte ett giltigt grennamn"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-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:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "Det finns redan en gren som heter \"%s\"."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Kan inte tvinga uppdatering av aktuell gren."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr ""
+"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""
 
-#: branch.c:233
+#: branch.c:336
 #, 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."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr ""
+"kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2008,27 +2002,28 @@ 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:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Objektnamnet är inte giltigt: \"%s\"."
+msgid "not a valid object name: '%s'"
+msgstr "objektnamnet är inte giltigt: \"%s\""
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Objektnamnet är tvetydigt: \"%s\"."
+msgid "ambiguous object name: '%s'"
+msgstr "objektnamnet är tvetydigt: \"%s\""
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Avgreningspunkten är inte giltig: \"%s\"."
+msgid "not a valid branch point: '%s'"
+msgstr "avgreningspunkten är inte giltig: \"%s\""
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "\"%s\" är redan utcheckad på \"%s\""
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
@@ -2053,7 +2048,7 @@ msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "okänt huvud: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2112,7 +2107,7 @@ msgstr "version %d för bunt stöds ej"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "kan inte skriva bunt med version %d med algoritmen %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "okänt argument: %s"
@@ -2149,7 +2144,7 @@ msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "felaktigt färgvärde: %.*s"
@@ -2199,190 +2194,190 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
 msgid "unable to find all commit-graph files"
 msgstr "kan inte hitta alla incheckingsgraffiler"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "kunde inte hitta incheckningen %s"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "kunde inte hämta typ för objektet %s"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "Läser in kända incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Rensar incheckningsmärken i incheckningsgraf"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "Beräknar topografiska nivåer för incheckningsgraf"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "Beräknar generationsvärden för incheckningsgraf"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Samlar refererade incheckningar"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "fel vid tillägg av paketet %s"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "fel vid öppning av indexet för %s"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "Söker ytterligare kanter i incheckingsgraf"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "kunde inte skapa inledande kataloger för %s"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "kan inte skapa temporärt graflager"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "kan inte justera delade behörigheter för \"%s\""
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Skriver ut incheckningsgraf i %d pass"
 msgstr[1] "Skriver ut incheckningsgraf i %d pass"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "kunde inte byta namn på temporär incheckningsgraffil"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Söker sammanslagna incheckningar"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "Slår ihop incheckningsgraf"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "för många incheckningar för att skriva graf"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "
 "trasig"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "Bekräftar incheckningar i incheckningsgrafen"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "incheckningsgrafens förälder för %s är %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2390,7 +2385,7 @@ msgstr ""
 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
 "noll på annan plats"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2398,22 +2393,22 @@ msgstr ""
 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
 "%s, men noll på annan plats"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
 "%<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
 "= %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "kunde inte tolka %s"
@@ -2443,29 +2438,29 @@ msgstr ""
 "Slå av detta meddelande genom att skriva\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1239
+#: commit.c:1241
 #, 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."
 
-#: commit.c:1243
+#: commit.c:1245
 #, 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."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Incheckning %s har inte någon GPG-signatur."
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2532,7 +2527,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s"
 msgid "key does not contain variable name: %s"
 msgstr "nyckeln innehåller inte variabelnamn: %s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "felaktig nyckel: %s"
@@ -2690,145 +2685,145 @@ msgstr "core.commentChar kan bara vara ett tecken"
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt läge för skapande av objekt: %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "felformat värde för %s"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "felformat värde för %s: %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "måste vara en av nothing, matching, simple, upstream eller current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "felaktig paketkomprimeringsgrad %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referensen \"%s\" pekar inte på en blob"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "kunde inte tolka %s"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Felaktigt %s: \"%s\""
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
 
-#: config.c:2549
+#: config.c:2552
 #, 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:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "felaktigt sektionsnamn \"%s\""
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s har flera värden"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "kunde inte låsa konfigurationsfilen %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "öppnar %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "ogiltigt mönster: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "ogiltig konfigurationsfil: \"%s\""
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat misslyckades på %s"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "kunde inte utföra mmap på \"%s\"%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod misslyckades på %s"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "kunde inte skriva konfigurationsfilen %s"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "kunde inte ställa in \"%s\" till \"%s\""
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "kunde inte ta bort inställning för \"%s\""
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "felaktigt namn på stycke: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "värde saknas för \"%s\""
@@ -3007,7 +3002,7 @@ msgstr "kunde inte grena (fork)"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Kontrollerar konnektivitet"
 
@@ -3308,17 +3303,17 @@ msgstr ""
 "Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
 "en arbetskatalog."
 
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Okänd dirstat-parameter \"%s\"\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3326,7 +3321,7 @@ msgstr ""
 "färginställningen för flyttade block måste vara en av \"no\", \"default\", "
 "\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3336,7 +3331,7 @@ msgstr ""
 "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
 "\""
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3344,12 +3339,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change kan inte kombineras med andra "
 "blankstegslägen"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3358,50 +3353,53 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr ""
+"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr ""
-"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "
-"-S"
+"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\""
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
-"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"
-"all med -G och -S"
+"flaggorna \"%s\" och  \"%s\" kan inte användas samtidigt, använd \"%s\" med "
+"\"%s\" och \"%s\""
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "ogiltigt värde för --stat: %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s förväntar ett numeriskt värde"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3410,42 +3408,42 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "okänt värde efter ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "kunde inte slå upp \"%s\""
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s förväntar formen <n>/<m>"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s förväntar ett tecken, fick \"%s\""
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "felaktigt argument till --color-moved: %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ogiltigt läge %s\" i --color-moved-ws"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3453,154 +3451,154 @@ msgstr ""
 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
 "\"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ogiltigt argument för %s"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "felaktigt argument --word-diff: %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Formatflaggor för diff-utdata"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "skapar patch"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "skapa diffar med <n> rader sammanhang"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "generera diff i råformat"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "synonym till \"-p --raw\""
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "synonym till \"-p --stat\""
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "maskinläsbar --stat"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "skriv bara ut den sista raden för --stat"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonym för --dirstat=cumulative"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonym för --dirstat=filer,param1,param2..."
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "visa endast namnen på ändrade filer"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "visa endast namn och status för ändrade filer"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "skapa diffstat"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<bredd>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "generera en diffstat med given bredd"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "generera en diffstat med given namnbredd"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "generera en diffstat med given grafbredd"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<antal>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "generera diffstat med begränsade rader"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "skapa kompakt översikt i diffstat"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "skapa en binärdiff som kan appliceras"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "visa färgad diff"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<typ>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3608,7 +3606,7 @@ msgstr ""
 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
 "\"new\" (nya) rader i diffen"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3616,87 +3614,87 @@ msgstr ""
 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
 "eller --numstat"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "visa givet källprefix istället för \"a/\""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "visa givet målprefix istället för \"b/\""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "lägg till ytterligare prefix på alla rader i utdata"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "visa inte käll- eller målprefix"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<tecken>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "ange tecken för att ange ny rad istället för \"+\""
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "ange tecken för att ange gammal rad istället för \"-\""
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "ange tecken för att ange sammanhang istället för \" \""
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Diff-namnbytesflaggor"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "detektera namnändringar"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "ta bort för-version för borttagningar"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "detektera kopior"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "använd oförändrade som källa för att hitta kopior"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "inaktivera detektering av namnbyten"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "använd tomma blob:ar som namnändringskälla"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "fortsätt lista historiken för en fil bortom namnändringar"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3704,163 +3702,163 @@ msgstr ""
 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
 "given gräns"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Alternativ för diff-algoritm"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "skapa minsta möjliga diff"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorera blanktecken vid radjämförelse"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorera blanktecken vid radslut"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "ignorera CR-tecken vid radslut"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorera ändringar i rader som är helt blanka"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<reguttr>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "heuristik för att flytta diff-gränser för lättare läsning"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"patience diff\""
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"histogram diff\""
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algoritm>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "välj en diff-algoritm"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"anchored diff\""
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<läge>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "använd <reguttr> för att bestämma vad som är ett ord"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "flyttade kodrader färgas på annat sätt"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "hur blanktecken ignoreras i --color-moved"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Andra diff-flaggor"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "
 "sökvägar"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "hantera alla filer som text"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "växla två indatafiler, vänd diffen"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "avsluta med 1 vid ändringar, annars 0"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "slå av alla utdata från programmet"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "tillåt köra en extern diff-hjälpare"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<när>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorera ändringar i undermoduler när diffen skapas"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "ange hur ändringar i undermoduler visas"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "dölj \"git add -N\"-poster från indexet"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "tolka \"git add -N\"-poster som äkta i indexet"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<sträng>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3868,66 +3866,66 @@ msgstr ""
 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
 "uttryck"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "styr ordningen i vilken filer visas i utdata"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<sökväg>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "visa ändringen i angiven sökväg först"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "hoppa över utdata fram till angiven sökväg"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<objekt-id>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "välj filter efter diff-typ"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<fil>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Skriv utdata till en specifik fil"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 "uttömmande namnbytesdetektering hoppades över på grund av för många filer."
 
-#: diff.c:6309
+#: diff.c:6260
 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:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3970,29 +3968,29 @@ msgstr ""
 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
 "gånger"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "inaktiverar konmönstermatchning"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "kan inte använda %s som exkluderingsfil"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "kunde inte öppna katalogen \"%s\""
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hämta kärnans namn och information"
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr "ospårad cache är inaktiverad på systemet eller platsen"
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4000,36 +3998,36 @@ msgstr ""
 "Kunde inte gissa katalognamn.\n"
 "Ange en katalog på kommandoraden"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "indexfilen trasig i arkivet %s"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "kunde inte skapa kataloger för %s"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "Filtrerar innehåll"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status på filen \"%s\""
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "felaktig git-namnrymdssökväg \"%s\""
@@ -4039,273 +4037,269 @@ msgstr "felaktig git-namnrymdssökväg \"%s\""
 msgid "too many args to run %s"
 msgstr "för många flaggor för att köra %s"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: förväntade grund lista"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, 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:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "kunde inte skriva till fjärren"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ogiltig \"shallow\"-rad: %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ogiltig \"unshallow\"-rad: %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "objektet hittades inte: %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "fel i objekt: %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ingen \"shallow\" hittades: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "förväntade shallow/unshallow, fick %s"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "fick %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "ogiltig incheckning %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "ger upp"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "klart"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "fick %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markerar %s som komplett"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "har redan %s (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "protokollfel: felaktigt packhuvud"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-patch: kunde inte grena av %s"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-patch: ogiltig utdata från index-pack"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "fel i sidbands-avmultiplexare"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Serverversionen är %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Servern stöder %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Servern stöder inte klienter med grunda arkiv"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Servern stöder inte --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Servern stöder inte --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Servern stöder inte --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Servern stöder inte det här arkivets objektformat"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "inga gemensamma incheckningar"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "källarkivet är grunt, tillåter inte kloning."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: hämtning misslyckades."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "omaka algoritmer: klient %s; server %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "servern stöder inte algoritmen \"%s\""
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Servern stöder inte grunda förfrågningar"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Servern stöder filter"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "kunde inte skriva anrop till fjärren"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "fel vid läsning av styckehuvudet \"%s\""
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "förväntade \"%s\", tog emot \"%s\""
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "oväntad bekräftelserad: \"%s\""
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "fel vid hantering av bekräftelser: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "väntade att paketfil skulle sändas efter \"ready\""
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "fel vid hantering av grund (\"shallow\") info: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "förväntade wanted-ref, fick %s"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "oväntad wanted-ref: \"%s\""
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "fel vid hantering av önskade referenser: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: förväntade svarsavslutningspaket"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "inget motsvarande fjärrhuvud"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "fjärren sände inte alla nödvändiga objekt"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "oväntat \"ready\" från fjärr"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ingen sådan fjärreferens: %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, 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"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "kunde inte skapa temporära fil"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "misslyckades skriva fristående signatur till \"%s\""
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4313,7 +4307,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"
 "signaturer"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4321,56 +4315,56 @@ msgstr ""
 "\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"
 "signaturer (tillgängligt i openssh version 8.2p1+)"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "felaktig/inkompatibel signatur \"%s\""
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 "måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg misslyckades signera data"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "user.signingkey måste anges för ssh-signering"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4378,7 +4372,7 @@ msgstr ""
 "\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "
 "version 8.2p1+)"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
@@ -4388,7 +4382,7 @@ msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4396,18 +4390,18 @@ msgstr ""
 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
 "P under PCRE v2"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte läsa %s"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "misslyckades ta status på \"%s\""
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "\"%s\": kort läsning"
@@ -4528,8 +4522,8 @@ msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Köra \"%s\" istället? (j/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Köra \"%s\" istället (j/N)?"
 
 #: help.c:654
 #, c-format
@@ -4753,7 +4747,7 @@ msgstr "förväntade \"flush\" efter ls-refs-argument"
 msgid "quoted CRLF detected"
 msgstr "citerad CRLF upptäcktes"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "felaktig funktion \"%s\" för \"%s\""
@@ -4986,7 +4980,7 @@ msgstr "undermodul"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4995,7 +4989,7 @@ msgstr ""
 "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
 "lämnad i trädet."
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5007,7 +5001,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
@@ -5022,7 +5016,7 @@ msgstr ""
 "sammanslagning:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Redan à jour."
 
@@ -5304,7 +5298,7 @@ msgstr "sammanslagningen returnerade ingen incheckning"
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Kunde inte skriva indexet."
@@ -5313,8 +5307,8 @@ msgstr "Kunde inte skriva indexet."
 msgid "failed to read the cache"
 msgstr "misslyckades läsa cachen"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "kunde inte skriva ny indexfil"
@@ -5323,212 +5317,212 @@ msgstr "kunde inte skriva ny indexfil"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "multi-pack-indexets OID-utbredning har fel storlek"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-indexfilen %s är för liten"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-indexversionen %d stöds inte"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index saknar krävd paketnamn-stycke"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "bad pack-int-id: %u (%u paket totalt)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "misslyckades läsa paketfilen \"%s\""
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "misslyckades öppna paketindexet \"%s\""
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "misslyckades hitta objekt %d i paketfilen"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "kan inte spara reverse-index-fil"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "kunde inte tolka rad: %s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "felaktig rad: %s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "kunde inte läsa paket{"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "kunde inte öppna indexet för %s"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Lägger till paketfiler till multi-pack-index"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "okänt föredraget paket: %s"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "kan inte välja föredraget paket %s som inte har några objekt"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "såg inte paketfilen %s som skulle kastas"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "föredraget paket \"%s\" har löpt ut"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "inga paketfiler att indexera."
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "kunde inte skriva fler-paketsbitkarta"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "kunde inte skriva flerpakets-index"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "misslyckades ta bort %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "misslyckades städa multi-pack-index på %s"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "felaktig kontrollsumma"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Ser efter refererade packfiler"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx saknar oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Bekräftar OID-ordning i multi-pack-index"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Sorterar objekt efter packfil"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Bekräftar offset för objekt"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "misslyckades läsa paketpost för oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "misslyckades läsa paketindex för paketfil %s"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Räknar refererade objekt"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Ser efter och tar bort orefererade packfiler"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "kunde inte starta pack-objects"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "kunde inte avsluta pack-objects"
 
@@ -5587,258 +5581,258 @@ 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-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "kunde inte normalisera supplerande objektsökväg: %s"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "kan inte normalisera objektkatalogen: %s"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "kan inte läsa \"alternates\"-filen"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "kan inte flytta ny \"alternates\"-fil på plats"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "sökvägen \"%s\" finns inte"
 
-#: object-file.c:722
+#: object-file.c:762
 #, 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."
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "referensarkivet \"%s\" är grunt"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "referensarkivet \"%s\" är ympat"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "kunde inte hitta objektkatalog för %s"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap misslyckades%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "objektfilen %s är tom"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "trasigt löst objekt \"%s\""
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "skräp i slutet av löst objekt \"%s\""
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "kan inte tolka %s-huvud"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "felaktig objekttyp"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "kan inte packa upp %s-huvudet"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "huvudet för %s är för långt, mer än %d byte"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "misslyckades läsa objektet %s"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "ersättningen %s hittades inte för %s"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "löst objekt %s (lagrat i %s) är trasigt"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "packat objekt %s (lagrat i %s) är trasigt"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "kunde inte skriva filen %s"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "kan inte sätta behörigheten till \"%s\""
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "fel vid stängning av fil för löst objekt"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "kan inte skapa temporär fil"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "kunde inte skriva fil för löst objekt"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "förvirrad av instabil objektkälldata för %s"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "\"utime()\" misslyckades på %s"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "kan inte läsa objekt för %s"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "trasik incheckning"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "trasig tagg"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "läsfel vid indexering av %s"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "för lite lästes vid indexering av %s"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: misslyckades lägga in i databasen"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: filtypen stöds ej"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s är inte ett giltigt objekt"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s är inte ett giltigt \"%s\"-objekt"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "kan inte öppna %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "hash stämmer inte för %s (förväntade %s)"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "kan inte utföra \"mmap\" för %s"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "kan inte packa upp huvud för %s"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "kan inte tolka huvud för %s"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "kan inte tolka innehåll i %s"
@@ -5965,25 +5959,25 @@ msgstr "kunde inte tolka objektet: %s"
 msgid "hash mismatch %s"
 msgstr "hashvärde stämmer inte överens %s"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index: kunde inte öppna paket"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "kan inte hämta storlek på %s"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "kan inte hämta diskanvändning för %s"
@@ -6032,46 +6026,51 @@ msgstr "kunde inte göra %s läsbar"
 msgid "could not write '%s' promisor file"
 msgstr "kunde inte skriva kontraktsfilen \"%s\""
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset före slutet av packfilen (trasig .idx?)"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "paketfilen %s kunde inte kopplas%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, 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:1927
+#: packfile.c:1928
 #, 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-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "flaggan \"%s\" antar ett numeriskt värde"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "trasigt utlöpsdatum: \"%s\""
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr ""
 "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "felformat objektnamn \"%s\""
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6107,36 +6106,36 @@ msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffi
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "menade du \"--%s\" (med två bindestreck)?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "alias för --%s"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "okänd flagga \"%c\""
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
@@ -6144,7 +6143,7 @@ msgstr "användning: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
@@ -6168,17 +6167,17 @@ msgstr "     eller: %s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-TAL"
 
@@ -6307,17 +6306,17 @@ msgstr "läsfel"
 msgid "the remote end hung up unexpectedly"
 msgstr "fjärren lade på oväntat"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "protokollfel: felaktig radlängdstecken: %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "protokollfel: felaktig radlängd: %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "fjärrfel: %s"
@@ -6369,7 +6368,7 @@ msgstr "kunde inte starta \"log\""
 msgid "could not read `log` output"
 msgstr "kunde inte läsa utdata från \"log\""
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "kunde inte tolka incheckningen \"%s\""
@@ -6392,60 +6391,56 @@ msgstr "kunde inte tolka git-huvudet \"%.*s\""
 msgid "failed to generate diff"
 msgstr "misslyckades skapa diff"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only och --right-only är ömsesidigt uteslutande"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "kunde inte tolka loggen för \"%s\""
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "kan inte skapa tom blob i objektdatabasen"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "\"%s\" har inte någon utcheckad incheckning"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "kan inte indexera filen \"%s\""
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "kan inte lägga till \"%s\" till indexet"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "kan inte ta status på \"%s\""
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "\"%s\" finns både som en fil och en katalog"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Uppdatera indexet"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6454,7 +6449,7 @@ msgstr ""
 "index.version satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6463,143 +6458,143 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "felaktig signatur 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "felaktig indexversion %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "felaktig sha1-signatur för indexfil"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorerar filtillägget %.4s"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "okänt format 0x%08x på indexpost"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "osorterade köposter i index"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "flera köposter för den sammanslagna filen \"%s\""
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "osorterade köposter för \"%s\""
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "indexfilen trasig"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "kunde inte skapa tråd för load_cache_entries: %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: öppning av indexfilen misslyckades"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: kan inte ta startus på det öppna indexet"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: indexfilen mindre än förväntat"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s: kan inte koppla indexfilen%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "kunde inte skapa load_index_extensions-tråden: %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "kunde inte uppdatera delat index \"%s\""
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "trasigt index, förväntade %s i %s, fick %s"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "kunde inte stänga \"%s\""
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "misslyckades omvandla till glest index"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "kunde inte ta status på \"%s\""
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "kunde inte öppna git-katalog: %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "misslyckades ta bort länken: %s"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "kan inte rätta behörighetsbitar på \"%s\""
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: kan inte återgå till kö 0"
@@ -6723,8 +6718,8 @@ msgstr ""
 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6769,7 +6764,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s: \"preserve\" har ersatts av \"merges\""
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "försvunnen"
 
@@ -6808,7 +6803,8 @@ msgstr "Heltalsvärde förväntades refname:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Heltalsvärde förväntades refname:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "okänt %%(%s)-argument: %s"
@@ -6818,11 +6814,6 @@ msgstr "okänt %%(%s)-argument: %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) tar inte argument"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "okänt %%(objectsize)-argument: %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6833,11 +6824,6 @@ msgstr "%%(deltabase) tar inte argument"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) tar inte argument"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "okänt %%(subject)-argument: %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6853,26 +6839,11 @@ msgstr "okänt %%(trailers)-argument: %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "positivt värde förväntat contents:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "okänt %%(contents)-argument: %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "okänt %%(raw)-argument: %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "positivt värde förväntat \"%s\" i %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "okänt argument \"%s\" i %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6893,21 +6864,11 @@ msgstr "okänd position:%s"
 msgid "unrecognized width:%s"
 msgstr "okänd bredd:%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "okänt %%(align)-argument: %s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "positiv bredd förväntad med atomen %%(align)"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "okänt %%(if)-argument: %s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6930,15 +6891,10 @@ msgid ""
 msgstr ""
 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
 
-#: ref-filter.c:844
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-
-#: ref-filter.c:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom"
 
 #: ref-filter.c:912
 #, c-format
@@ -6950,16 +6906,6 @@ msgstr "format: atomen %%(then) använd mer än en gång"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atomen %%(then) använd efter %%(else)"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7034,22 +6980,22 @@ msgstr "felformat objekt vid \"%s\""
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "ignorerar trasig referens %s"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "flaggan \"%s\" måste peka på en incheckning"
@@ -7094,71 +7040,71 @@ msgstr "kunde inte hämta \"%s\""
 msgid "invalid branch name: %s = %s"
 msgstr "felaktigt namn på gren: %s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "ignorerar dinglande symbolisk referens %s"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "loggen för referensen %s har lucka efter %s"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "loggen för referensen %s slutade oväntat på %s"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "loggen för %s är tom"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref misslyckades för referensen \"%s\": %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "referensuppdateringar förbjudna i karantänmiljö"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "referensuppdateringar avbrutna av krok"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "\"%s\" finns; kan inte skapa \"%s\""
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "kunde inte ta bort referensen %s"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "kunde inte ta bort referensen %s: %s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "kunde inte ta bort referenser: %s"
@@ -7168,50 +7114,50 @@ msgstr "kunde inte ta bort referenser: %s"
 msgid "invalid refspec '%s'"
 msgstr "felaktig referensspecifikation: \"%s\""
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "mer än en receivepack angavs, använder den första"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "mer än en uploadpack angavs, använder den första"
 
-#: remote.c:590
+#: remote.c:699
 #, 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:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s spårar vanligtvis %s, inte %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s spårar både %s och %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "käll-referensspecifikationen %s motsvarar ingen"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "käll-referensspecifikationen %s motsvarar mer än en"
@@ -7220,7 +7166,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7243,7 +7189,7 @@ msgstr ""
 "\n"
 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7254,7 +7200,7 @@ msgstr ""
 "Var det meningen att skapa en ny gren genom att sända\n"
 "till \"%s:refs/heads/%s\"?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7265,7 +7211,7 @@ msgstr ""
 "Var det meningen att skapa en ny tagg genom att sända\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7276,7 +7222,7 @@ msgstr ""
 "Var det meningen att tagga ett nytt träd genom att sända\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7287,114 +7233,114 @@ msgstr ""
 "Var det meningen att tagga en ny blob genom att sända\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s kan inte slås upp till en gren"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD pekar inte på en gren"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "okänd gren: \"%s\""
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ingen standarduppström angiven för grenen \"%s\""
 
-#: remote.c:1742
+#: remote.c:1852
 #, 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:1757
+#: remote.c:1867
 #, 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:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "grenen \"%s\" har ingen fjärr för \"push\""
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "\"enkel push\" motsvarar flera olika mål"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "Kunde inte hitta fjärr-referensen %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignorerar märklig referens \"%s\" lokalt"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Din gren är à jour med \"%s\".\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (använd \"%s\" för detaljer)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (använd \"git push\" för att publicera dina lokala incheckningar)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7404,11 +7350,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (använd \"git pull\" för att uppdatera din lokala gren)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7423,11 +7369,11 @@ msgstr[1] ""
 "Din gren och \"%s\" har divergerat,\n"
 "och har %d respektive %d olika incheckningar.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 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"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "kan inte tolka förväntat objektnamn \"%s\""
@@ -7460,7 +7406,7 @@ msgstr "kunde inte skriva rerere-post"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "fel vid skrivning av \"%s\" (%s)"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "misslyckades spola \"%s\""
@@ -7505,8 +7451,8 @@ msgstr "kan inte ta bort lös länk \"%s\""
 msgid "Recorded preimage for '%s'"
 msgstr "Sparade förhandsbild för \"%s\""
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
@@ -7544,37 +7490,29 @@ msgstr "kan inte uppdatera katalogen rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "kunde inte bestämma HEAD-revision"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "kunde inte hitta trädet för %s."
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input är inkompatibelt med --no-walk"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<paketfil> stöds inte längre"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk är inkompatibelt med --unsorted-input"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2693
+#: revision.c:2689
 #, 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:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L stöder ännu inte andra diff-format än -p och -s"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "kan inte skapa asynkron tråd: %s"
@@ -7639,8 +7577,8 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
 msgid "could not delete '%s'"
 msgstr "kunde inte ta bort \"%s\""
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "kunde inte ta bort \"%s\""
@@ -7702,13 +7640,13 @@ msgstr ""
 "För att avbryta och återgå till där du var före \"git revert\",\n"
 "kör \"git revert --abort\"."
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "kunde inte låsa \"%s\""
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "kunde inte skriva till \"%s\""
@@ -7718,12 +7656,18 @@ msgstr "kunde inte skriva till \"%s\""
 msgid "could not write eol to '%s'"
 msgstr "kunde inte skriva radslut till \"%s\""
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "misslyckades färdigställa \"%s\""
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7738,7 +7682,7 @@ msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
 msgid "%s: fast-forward"
 msgstr "%s: snabbspola"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt städningsläge %s"
@@ -7769,8 +7713,8 @@ msgstr "ingen nyckel i  \"%.*s\""
 msgid "unable to dequote value of '%s'"
 msgstr "kan inte ta bort citering av värdet \"%s\""
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "kunde inte öppna \"%s\" för läsning"
@@ -7833,11 +7777,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "kroken \"prepare-commit-msg\" misslyckades"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7864,7 +7808,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7889,350 +7833,351 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "kunde inte slå upp en precis skapad incheckning"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "kunde inte tolka en precis skapad incheckning"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "frånkopplad HEAD"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (rotincheckning)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "kunde inte tolka HEAD"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s är inte en incheckning!"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "kunde inte tolka HEAD:s incheckning"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "kunde inte tolka incheckningens författare"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree misslyckades skriva ett träd"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "ogiltig författar-identitet \"%s\""
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "trasig författare: saknar datuminformation"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "kunde inte skriva incheckningsobjekt"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "kunde inte uppdatera %s"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "kunde inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "okänt kommando: %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Det här är 1:a incheckningsmeddelandet:"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Det här är incheckningsmeddelande %d:"
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Incheckningsmeddelande %d kommer hoppas över:"
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Det här är en kombination av %d incheckningar."
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "kan inte skriva \"%s\""
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "behöver en HEAD-incheckning att rätta"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "kunde inte läsa HEAD"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "kunde inte läsa incheckningsmeddelande för %s"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "din indexfil har inte slagits ihop."
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "kan inte göra \"fixup\" på rotincheckning"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, 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:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "incheckning %s har inte förälder %d"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kan inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "kunde inte byta namn på \"%s\" till \"%s\""
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "kunde inte ångra %s... %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "kunde inte tillämpa %s... %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: misslyckades läsa indexet"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: misslyckades uppdatera indexet"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s tar inte argument: \"%s\""
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument saknas för %s"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "kunde inte tolka \"%s\""
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ogiltig rad %d: %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "kunde inte läsa \"%s\"."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "avbryter pågående \"cherry-pick\""
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "avbryter pågående \"revert\""
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "rätta det med \"git rebase --edit-todo\"."
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "oanvändbart manus: \"%s\""
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "inga incheckningar lästes."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "felaktigt värde för %s: %s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "oanvändbar squash-onto"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "trasigt manus: \"%s\""
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "den angivna uppsättningen incheckningar är tom"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "en \"revert\" pågår redan"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "en \"cherry-pick\" pågår redan"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "kunde inte låsa HEAD"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "kan inte bestämma HEAD"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 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:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kan inte öppna \"%s\""
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kan inte läsa \"%s\": %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "oväntat filslut"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, 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:3198
+#: sequencer.c:3200
 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:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "ingen \"revers\" pågår"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "ingen \"cherry-pick\" pågår"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "kunde inte hoppa över incheckningen"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "ingenting att hoppa över"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8241,16 +8186,16 @@ msgstr ""
 "har du redan checkat in?\n"
 "testa \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "kan inte läsa HEAD"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "kan inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8269,27 +8214,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Kunde inte tillämpa %s... %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Kunde inte slå ihop %.*s"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Kör: %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8304,11 +8249,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 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:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8325,90 +8270,90 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "ogiltigt etikettnamn: \"%.*s\""
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "skriver fejkad rotincheckning"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "skriver squash-onto"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "kunde inte upplösa \"%s\""
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "kan inte slå ihop utan en aktuell incheckning"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "kan inte tolka \"%.*s\""
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "inget att slå samman: \"%.*s\""
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "kunde inte ens försöka slå ihop \"%.*s\""
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "sammanslagning: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Kan inte utföra \"autostash\""
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Oväntat svar från stash: \"%s\""
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Kunde inte skapa katalog för \"%s\""
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Skapade autostash: %s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "kunde inte utföra \"reset --hard\""
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Tillämpade autostash.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "kan inte spara %s"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8419,29 +8364,29 @@ 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:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Tillämpning av autostash gav konflikter."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Autostash finns; skapar ny stash-post."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "kunde inte koppla från HEAD"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Stoppade på HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Stoppade på %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8462,58 +8407,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Ombaserar (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Stoppade på %s... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "okänt kommando %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "kunde inte läsa orig-head"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "kunde inte läsa \"onto\""
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "kunde inte uppdatera HEAD till %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Lyckades ombasera och uppdatera %s.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "kan inte ombasera: Du har oköade ändringar."
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "kan inte lägga till incheckning som inte finns"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ogiltig fil: \"%s\""
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ogiltigt innehåll: \"%s\""
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8523,68 +8468,68 @@ msgstr ""
 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
 "först och kör sedan \"git rebase --continue\" igen."
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "kunde inte skriva fil: \"%s\""
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "kunde inte checka in köade ändringar."
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "kan inte ångra som första incheckning"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "hoppade över tidigare applicerad incheckning %s"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr "använd --reapply-cherry-picks för att ta med överhoppade incheckningar"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: flaggor som inte stöds"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: fel när revisioner skulle förberedas"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "inget att göra"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "skriptet har redan omordnats."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "\"%s\" är utanför arkivet på \"%s\""
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8594,7 +8539,7 @@ msgstr ""
 "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
 "lokalt."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8606,12 +8551,12 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8622,100 +8567,100 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "funktionen måste köras i en arbetskatalog"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Förväntade git-arkivversion <= %d, hittade %d"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "okänd arkivutökning hittades:"
 msgstr[1] "okända arkivutökningar hittades:"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"
 msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "fel vid öppning av \"%s\""
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "för stor för att vara en .git-fil: \"%s\""
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid läsning av %s"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ogiltigt gitfilformat: %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "ingen sökväg i gitfil: %s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "inte ett git-arkiv: %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "\"$%s\" för stor"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "inte ett git-arkiv: \"%s\""
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "kan inte byta katalog (chdir) till \"%s\""
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "misslyckades ta status på \"%*ss%s%s\""
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Kan inte läsa aktuell arbetskatalog"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "kan inte byta till \"%s\""
 
-#: setup.c:1251
+#: setup.c:1315
 #, 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:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8725,7 +8670,7 @@ msgstr ""
 "monteringspunkten %s)\n"
 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8734,15 +8679,15 @@ 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."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "\"fork\" misslyckades"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "\"setsid\" misslyckades"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "indexposten är en katalog, men inte gles (%08x)"
@@ -8799,13 +8744,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u bytes/s"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "kunde inte öppna \"%s\" för skrivning"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "kunde inte redigera \"%s\""
@@ -8897,7 +8842,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "process för undermodulen \"%s\" misslyckades"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Misslyckades slå upp HEAD som giltig referens."
 
@@ -9146,7 +9091,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
 msgid "invalid remote service path"
 msgstr "felaktig sökväg till fjärrtjänst"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "funktionen stöds inte av protokollet"
 
@@ -9367,7 +9312,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "Avbryter."
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "kunde inte sända alla nödvändiga undermoduler"
 
@@ -9387,7 +9332,7 @@ msgstr "tomt filnamn i trädpost"
 msgid "too-short tree file"
 msgstr "trädfil för kort"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9396,7 +9341,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:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9405,7 +9350,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9415,7 +9360,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9425,7 +9370,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9434,7 +9379,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:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9443,7 +9388,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9453,7 +9398,16 @@ msgstr ""
 "dem:\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Vägrar ta bort aktuell arbetskatalog:\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9462,7 +9416,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:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9471,7 +9425,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9481,7 +9435,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du slår samman."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9491,7 +9445,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9500,7 +9454,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:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9509,7 +9463,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9520,7 +9474,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9531,7 +9485,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9541,7 +9495,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9551,7 +9505,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9560,7 +9514,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:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9569,12 +9523,12 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9583,7 +9537,7 @@ msgstr ""
 "Kan inte uppdatera undermodul:\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9593,7 +9547,7 @@ msgstr ""
 "Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9603,7 +9557,7 @@ msgstr ""
 "mönster:\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9614,12 +9568,12 @@ msgstr ""
 "gles-mönster:\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "Avbryter\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9628,11 +9582,11 @@ msgstr ""
 "Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna "
 "ovan.\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "Uppdaterar filer"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9642,16 +9596,16 @@ msgstr ""
 "sökvägar på ett okänsligt filsystem) och endast en från samma\n"
 "kollisionsgrupp finns i arbetskatalogen:\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "Uppdaterar indexflaggor"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "förväntade \"flush\" efter \"fetch\"-argument"
 
@@ -9688,99 +9642,99 @@ msgstr "felaktigt \"..\"-sökvägssegment"
 msgid "Fetching objects"
 msgstr "Hämtar objekt"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "misslyckades läsa \"%s\""
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" finns inte"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "\"%s\" är inte en .git-fil, felkod %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "\"%s\" pekar inte tillbaka till \"%s\""
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "inte en katalog"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git är inte en fil"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git-filen är trasig"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git-filen är felaktig"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "inte en giltig sökväg"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "hittar inte arkivet; .git är inte en fil"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "hittar inte arkivet; .git-filen är trasig"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir är oläsbar"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir är felaktig"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "inte i en giltig katalog"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir-filen existerar inte"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "kunde inte läsa gitdir-filen (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "ogiltig gitdir-fil"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir-filen pekar på en ickeexisterande plats"
 
@@ -9839,11 +9793,11 @@ msgstr "  (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (använd \"git rm <fil>...\" för att ange lösning)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Ändringar att checka in:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Ändringar ej i incheckningskön:"
 
@@ -9946,22 +9900,22 @@ msgstr "ändrat innehåll, "
 msgid "untracked content, "
 msgstr "ospårat innehåll, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, 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:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Undermodulers ändringar att checka in:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9969,7 +9923,7 @@ msgstr ""
 "Raden ovan får inte ändras eller tas bort.\n"
 "Allt under den kommer tas bort."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9980,107 +9934,114 @@ msgstr ""
 "Det tog %.2f sekunder att räkna före/bakom-värden.\n"
 "Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Du har ej sammanslagna sökvägar."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (använd \"git merge --abort\" för att avbryta sammanslagningen)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 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:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 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:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Aktuell patch är tom."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (använd \"git am --allow-empty\" för att registrera patchen som en tom "
+"incheckning)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (använd \"git am --abort\" för att återställa ursprungsgrenen)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo saknas."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Inga kommandon utförda."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (se fler i filen %s)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Inga kommandon återstår."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (använd \"git rebase --edit-todo\" för att visa och redigera)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Du håller på med en ombasering."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git rebase --continue\")"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (använd \"git rebase --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git rebase --continue\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10088,159 +10049,159 @@ msgstr ""
 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
 "ovanpå \"%s\"."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Du håller på att dela upp en incheckning i en ombasering."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
 "ovanpå \"%s\"."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "Du håller på att redigera en incheckning under en ombasering."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick pågår."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (kör \"git cherry-pick --continue\" för att fortsätta)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git cherry-pick --continue\")"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (använd \"git cherry-pick --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
 "operationen)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Ångring pågår."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Du håller på med att ångra incheckningen %s."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git revert --continue\")"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (kör \"git revert --continue\" för att fortsätta)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git revert --continue\")"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (använd \"git revert --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (använd \"git revert --abort\" för att avbryta ångrandet)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Du håller på med en \"bisect\"."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Du är i en gles utcheckning."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "PÃ¥ grenen "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "interaktiv ombasering pågår; ovanpå "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "ombasering pågår; ovanpå "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD frånkopplad vid "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD frånkopplad från "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Inte på någon gren för närvarande."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Första incheckning"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Inga incheckningar ännu"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Ospårade filer"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Ignorerade filer"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10252,32 +10213,32 @@ msgstr ""
 "lägga till nya filer själv (se \"git help status\")."
 
 # %s är nästa sträng eller tom.
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ospårade filer visas ej%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (använd flaggan -u för att visa ospårade filer)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Inga ändringar"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
 "\")\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "inga ändringar att checka in\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10286,80 +10247,80 @@ msgstr ""
 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
 "\")\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "inget köat för incheckning, men ospårade filer finns\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "inget att checka in\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "inget att checka in, arbetskatalogen ren\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Inga incheckningar ännu på "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (ingen gren)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "olika"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "efter "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "före "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "kan inte %s: Du har oköade ändringar."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "kunde inte sända IPC-kommando"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "kunde inte läsa IPC-svar"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "kunde inte ta status \"accept_thread\" \"%s\""
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "kunde inte starta \"worker[0]\" för \"%s\""
@@ -10396,107 +10357,113 @@ msgstr "ta bort \"%s\"\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Kunde inte läsa indexet"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Kunde inte skriva patch"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "redigering av patch misslyckades"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Kunde inte ta status på \"%s\""
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Tom patch. Avbryter."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Kunde inte tillämpa \"%s\""
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 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:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "testkörning"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "var pratsam"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "redigera aktuell diff och applicera"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "tillåt lägga till annars ignorerade filer"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "uppdatera spårade filer"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 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:381
+#: builtin/add.c:378
 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:384
+#: builtin/add.c:381
 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:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "lägg inte till, uppdatera endast indexet"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 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:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "se om - även saknade - filer ignoreras i testkörning"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "tillåt uppdatera poster utanför området angivet i \"sparse-checkout\""
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "överstyr exekveringsbiten för angivna filer"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "varna när ett inbyggt arkiv läggs till"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "bakända för \"git stash -p\""
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10527,12 +10494,12 @@ msgstr ""
 "\n"
 "Se \"git help submodule\" för ytterligare information."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "lägger till inbäddat git-arkiv: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10542,51 +10509,27 @@ msgstr ""
 "Slå av detta meddelande med\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "misslyckades lägga till filer"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file är inkompatibelt med --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A och -u är ömsesidigt inkompatibla"
-
-#: builtin/add.c:547
-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:551
+#: builtin/add.c:548
 #, 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:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul kräver --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "\"%s\" kan inte användas tillsammans med sökvägsangivelser"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Inget angivet, inget tillagt.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10596,109 +10539,117 @@ msgstr ""
 "Slå av detta meddelande genom att köra\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Felaktigt värde för --empty: %s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "kunde inte tolka författarskript"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "\"%s\" togs bort av kroken applypatch-msg"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Felaktig indatarad: \"%s\"."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "kunde inte tolka patchen \"%s\""
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 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:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstämpel"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, 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:1128
+#: builtin/am.c:1154
 #, 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:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"För att registrera den tomma patchen som en tom incheckning, kör \"%s --"
+"allow-empty\"."
+
+#: builtin/am.c:1161
 #, 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:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Patchen är tom."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "saknad \"author\"-rad i incheckningen %s"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 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:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Använder indexinfo för att återskapa ett basträd..."
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10706,25 +10657,25 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillämpas på blobbar som antecknats i dess index."
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte återuppta: %s finns inte."
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -10732,41 +10683,59 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 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:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Hoppar över: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "Skapar en tom incheckningar: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Patchen är tom."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillämpar: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "Använd \"git am --show-current-patch=diff\" för att se patchen som "
 "misslyckades"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Inga ändringar - sparat som en tom incheckning."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10776,7 +10745,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:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10788,17 +10757,17 @@ msgstr ""
 "lösta.\n"
 "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Kan inte tolka objektet \"%s\"."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10806,159 +10775,167 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Felaktigt värde för --patch-format: %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Felaktigt värde för --show-current-patch: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "flaggorna \"%s=%s\" och \"%s=%s\" kan inte användas samtidigt"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "var tyst"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 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:2292
+#: builtin/am.c:2348
 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:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "sänd det genom git-mailinfo"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "sänd det genom git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "återställ originalgrenen och avbryt patchningen"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "avbryt patchningen men behåll HEAD där det är"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "visa patchen som tillämpas"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "lagra den tomma patchen som en tom incheckning"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "nyckel-id"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "hantering av tomma patchar"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(används internt av git-rebase)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -10966,16 +10943,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:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, 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:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10984,11 +10961,11 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lösningsoperation pågår inte, vi återupptar inte."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "interaktivt läge kräver patchar på kommandoraden"
 
@@ -11448,11 +11425,11 @@ msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
 msgid "show work cost statistics"
 msgstr "visa statistik över arbetskostnad"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "tvinga förloppsrapportering"
@@ -11501,7 +11478,7 @@ msgstr "visa författarens e-post istället för namn (Standard: av)"
 msgid "ignore whitespace differences"
 msgstr "ignorera ändringar i blanksteg"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "incheckning"
 
@@ -11554,7 +11531,7 @@ msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 
@@ -11566,18 +11543,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 år, 11 månader sedan"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "filen %s har bara %lu rad"
 msgstr[1] "filen %s har bara %lu rader"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
@@ -11609,7 +11586,7 @@ msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<flaggor>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11618,7 +11595,7 @@ msgstr ""
 "tar bort grenen \"%s\" som har slagits ihop med\n"
 "         \"%s\", men ännu inte slagits ihop med HEAD."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11627,12 +11604,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:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11641,7 +11618,7 @@ 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:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "Misslyckades uppdatera konfigurationsfil"
 
@@ -11653,100 +11630,100 @@ msgstr "kan inte ange -a med -d"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, 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:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "fjärrspårande grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, 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:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Tog bort grenen %s (var %s).\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "kan inte tolka formatsträng"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "kunde inte slå upp HEAD"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) pekar utenför refs/heads/"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Grenen %s ombaseras på %s"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Grenen %s är i en \"bisect\" på %s"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 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:516
+#: builtin/branch.c:520
 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:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Felaktigt namn på gren: \"%s\""
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Misslyckades byta namn på gren"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Misslyckades kopiera gren"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, 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:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11757,211 +11734,207 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 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:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "undertryck informationsmeddelanden"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "ställ in spårningsläge (se git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "ställ in inställningar för spårad gren"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "använd ej"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "uppströms"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "ändra uppströmsinformationen"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "ta bort uppströmsinformationen"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "använd färgad utdata"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "arbeta på fjärrspårande grenar"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "visa endast grenar som innehåller incheckningen"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "visa endast grenar som inte innehåller incheckningen"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Specifika git-branch-åtgärder:"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "visa både fjärrspårande och lokala grenar"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "ta bort helt sammanslagen gren"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "ta bort gren (även om inte helt sammanslagen)"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "flytta/ta bort en gren och dess reflogg"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "flytta/ta bort en gren, även om målet finns"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "kopiera en gren och dess reflogg"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "kopiera en gren, även om målet finns"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "lista namn på grenar"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "visa namn på aktuell gren"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "skapa grenens reflogg"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "visa endast sammanslagna grenar"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "objekt"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "sortering och filtrering skiljer gemener och VERSALER"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "format att använda för utdata"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column och --verbose är inkompatibla"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "grennamn krävs"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Kan inte beskriva frånkopplad HEAD"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "kan inte redigera beskrivning för mer än en gren"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Inga incheckningar på grenen \"%s\" ännu."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ingen gren vid namnet \"%s\"."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "för många grenar för kopiering"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "för många flaggor för namnbyte"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "för många flaggor för att byta uppström"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, 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:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "okänd gren \"%s\""
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "grenen \"%s\" finns inte"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "för många flaggor för att ta bort uppström"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 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:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Grenen \"%s\" har ingen uppströmsinformation"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -11969,7 +11942,7 @@ msgstr ""
 "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n"
 "Menade du att använda: -a|-r --list <mönster>?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12240,8 +12213,8 @@ 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:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "undertryck förloppsrapportering"
 
@@ -12299,10 +12272,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<flaggor>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "sträng"
 
@@ -12366,98 +12339,93 @@ msgstr "git switch [<flaggor>] [<gren>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "sökvägen \"%s\" har inte vår version"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "sökvägen \"%s\" har inte deras version"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "sökväg \"%s\": kan inte slå ihop"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Ã…terskapade %d sammanslagningskonflikt"
 msgstr[1] "Ã…terskapade %d sammanslagningskonflikter"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Uppdaterade %d sökväg från %s"
 msgstr[1] "Uppdaterade %d sökvägar från %s"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Uppdaterade %d sökväg från indexet"
 msgstr[1] "Uppdaterade %d sökvägar från indexet"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "\"%s\" kan inte användas med %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "varken \"%s\" eller \"%s\" har angivits"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "\"%s\" måste användas när \"%s\" inte anges"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "sökvägen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "du måste lösa ditt befintliga index först"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12466,50 +12434,50 @@ msgstr ""
 "kan inte fortsätta med köade ändringar i följande filer:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Växlade till och nollställde grenen \"%s\"\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Växlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12532,7 +12500,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12559,19 +12527,19 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 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:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12580,7 +12548,7 @@ msgstr ""
 "\"%s\" kan vara både en lokal fil och en spårande gren.\n"
 "Använd -- (och möjligen --no-guess) för att göra otvetydig"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12600,51 +12568,51 @@ msgstr ""
 "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
 "checkout.defaultRemote=origin i din konfiguration."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "endast en referens förväntades"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "endast en referens förväntades, %d gavs."
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen är inte ett träd: %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "förväntade gren, fick taggen \"%s\""
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "förväntade gren, fick fjärrgrenen \"%s\""
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "förväntade gren, fick \"%s\""
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "förväntade gren, fick incheckningen \"%s\""
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12652,7 +12620,7 @@ msgstr ""
 "kan inte växla gren vid sammanslagning\n"
 "Överväg \"git merge --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12660,7 +12628,7 @@ msgstr ""
 "kan inte växla gren mitt i en \"am\"-körning\n"
 "Överväg \"git am --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12668,7 +12636,7 @@ msgstr ""
 "kan inte växla gren vid ombasering\n"
 "Överväg \"git rebase --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12676,7 +12644,7 @@ msgstr ""
 "kan inte växla gren i en \"cherry-pick\"\n"
 "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12684,139 +12652,127 @@ msgstr ""
 "kan inte växla gren i en \"revert\"\n"
 "Överväg \"git revert --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "då växlar grenar medan du gör en \"bisect\""
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "sökvägar kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "\"%s\" kan inte användas med \"%s\""
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "\"%s\" kan inte ta <startpunkt>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "saknar gren- eller incheckingsargument"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 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:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "konfliktstil (merge eller diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "konfliktstil (merge, diff3 eller zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "sätt uppströmsinformation för ny gren"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "ställ in spårningsläge (se git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 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:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vår version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begränsa inte sökvägar till endast glesa poster"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "flaggorna \"%-c\", \"-%c\" och \"%s\" kan inte användas samtidigt"
 
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p och --overlay är ömsesidigt uteslutande"
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "grennamn saknas; försök med -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "kunde inte upplösa %s"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, 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:1725
+#: builtin/checkout.c:1745
 #, 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:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file är inkompatibelt med --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file är inkompatibelt med --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12824,71 +12780,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
 "du checkar ut från indexet."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "du måste ange katalog(er) att återställa"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "gren"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "använd överläggsläge (standard)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "skapa och växla till en ny gren"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "skapa/nollställ och växla till en gren"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "kasta bort lokala ändringar"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "vilken träd-igt att checka ut från"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "återställ indexet"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "återställ arbetskatalogen (förval)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "ignorera ej sammanslagna poster"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "använd överläggsläge"
 
@@ -12924,7 +12880,15 @@ msgstr "Skulle hoppa över arkivet %s\n"
 msgid "could not lstat %s\n"
 msgstr "kunde inte ta status (\"lstat\") på %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Vägrar ta bort aktuell arbetskatalog\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Skulle vägra ta bort aktuell arbetskatalog\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12937,7 +12901,7 @@ msgstr ""
 "foo        - markera post baserad på unikt prefix\n"
 "           - (tomt) markera ingenting\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12958,33 +12922,33 @@ msgstr ""
 "*          - välj alla poster\n"
 "           - (tomt) avsluta markering\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Vadå (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ange ignoreringsmönster>>"
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "VARNING: Hittar inte poster som motsvarar: %s"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Välj poster att ta bort"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13002,52 +12966,52 @@ msgstr ""
 "help                - denna skärm\n"
 "?                   - hjälp för kommandoval"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 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:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Inga fler filer att städa, avslutar."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "skriv inte ut namn på borttagna filer"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "tvinga"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "städa interaktivt"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mönster"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "lägg till <mönster> till ignoreringsregler"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "ta även bort ignorerade filer"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "ta endast bort ignorerade filer"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13055,7 +13019,7 @@ msgstr ""
 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
 "städa"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13063,7 +13027,7 @@ msgstr ""
 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "
 "angavs; vägrar städa"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x och -X kan inte användas samtidigt"
 
@@ -13119,19 +13083,20 @@ msgstr "mallkatalog"
 msgid "directory from which templates will be used"
 msgstr "katalog att använda mallar från"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "referensarkiv"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "använd --reference endast under kloningen"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "namn"
@@ -13148,7 +13113,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"
 msgid "path to git-upload-pack on the remote"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "djup"
@@ -13157,7 +13122,7 @@ msgstr "djup"
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon på detta djup"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "tid"
@@ -13166,17 +13131,17 @@ msgstr "tid"
 msgid "create a shallow clone since a specific time"
 msgstr "skapa en grund klon från en angiven tidpunkt"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "revision"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "fördjupa historik för grund klon, exkludera revisionen"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
@@ -13204,24 +13169,22 @@ msgstr "nyckel=värde"
 msgid "set config inside the new repository"
 msgstr "ställ in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "serverspecifik"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
-msgstr ""
-"inget att checka in\n"
-"flagga att sända"
+msgstr "flagga att sända"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "använd endast IPv4-adresser"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "använd endast IPv6-adresser"
@@ -13232,7 +13195,7 @@ msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
 
 #: builtin/clone.c:156
 msgid "initialize sparse-checkout file to include only files at root"
-msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
+msgstr "initiera sparse-checkout-filen till att bara ta med filer i roten"
 
 #: builtin/clone.c:231
 #, c-format
@@ -13314,29 +13277,25 @@ msgstr "kan inte packa om för att städa upp"
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Du måste ange ett arkiv att klona."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "flaggorna --bare och --origin %s är inkompatibla."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s %s\" kan inte användas samtidigt"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s är inte ett positivt tal"
@@ -13356,8 +13315,8 @@ msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog."
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "kunde inte skapa inledande kataloger för \"%s\""
@@ -13475,7 +13434,7 @@ msgstr ""
 "split[=<strategi>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <delnings-flaggor>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "kat"
 
@@ -13556,7 +13515,7 @@ msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
 msgid "Collecting commits from input"
 msgstr "Hämtar incheckningar från indata"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "okänt underkommando: %s"
@@ -13574,7 +13533,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "duplicerad förälder %s ignorerades"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "objektnamnet är inte giltigt: %s"
@@ -13597,13 +13556,13 @@ msgstr "förälder"
 msgid "id of a parent commit object"
 msgstr "id på ett förälderincheckningsobjekt"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "meddelande"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
@@ -13611,7 +13570,7 @@ msgstr "incheckningsmeddelande"
 msgid "read commit log message from file"
 msgstr "läs incheckningsloggmeddelande från fil"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG-signera incheckning"
@@ -13690,10 +13649,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file med -a ger ingen mening"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "Du måste ange sökvägar tillsammans med --include/--only."
@@ -13781,8 +13736,8 @@ msgstr "kunde inte läsa loggfilen \"%s\""
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "kan inte kombinera -m med --fixup:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "flaggorna \"%s\" och \"%s:%s\" kan inte användas samtidigt"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -13890,7 +13845,7 @@ msgstr "kan inte sända släprader till --trailers"
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
@@ -13906,15 +13861,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Ogiltigt ignorerat läge \"%s\""
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ogiltigt läge för ospårade filer: \"%s\""
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long och -z är inkompatibla"
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Du är i mitten av en sammanslagning -- kan inte omformulera."
@@ -13925,113 +13876,110 @@ msgstr "Du är i mitten av en cherry-pick -- kan inte omformulera."
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
-"kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
+"reword-flaggan till \"%s\" och sökvägen \"%s\" kan inte användas tillsammans"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
-"interactive/--all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "reword-flaggan till \"%s\" och \"%s\" kan inte användas tillsammans"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 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:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 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:1265
+#: builtin/commit.c:1266
 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:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "Du är i mitten av en ombasering -- kan inte utöka."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 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:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 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:1309
+#: builtin/commit.c:1310
 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:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "okänd flagga: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "beräkna fullständiga före-/efter-värden"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "maskinläsbar utdata"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "visa status i långt format (standard)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "läge"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14039,11 +13987,11 @@ msgstr ""
 "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
 "traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14051,194 +13999,194 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "detektera inte namnändringar"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "detektera namnändringar, möjligen sätt likhetsindex"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "läs meddelande från fil"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "incheckning"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "återanvänd och redigera meddelande från angiven incheckning"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "återanvänd meddelande från angiven incheckning"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]incheckning"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "använd autosquash-formaterat meddelande för att fixa/omformulera angiven "
 "incheckning"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 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:1635
+#: builtin/commit.c:1636
 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:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "släprad"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "använd skräddarsydd(a) släprad(er)"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "lägg till Signed-off-by-släprad"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
-msgstr "inkludera status i mallen för incheckningsmeddelandet"
+msgstr "ta med status i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "lägg till angivna filer till indexet för incheckning"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "förbigå pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "ok att registrera en ändring med tomt meddelande"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14745,7 +14693,7 @@ msgstr "överväg endast taggar som motsvarar <mönster>"
 msgid "do not consider tags matching <pattern>"
 msgstr "överväg inte taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "visa förkortade incheckningsobjekt som standard"
 
@@ -14761,25 +14709,14 @@ msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long är inkompatibel med --abbrev=0"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Inga namn hittades, kan inte beskriva något."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "flaggorna \"%s\" och incheckning-igter kan inte användas samtidigt"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14800,26 +14737,26 @@ msgstr "ogiltig flagga: %s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: ingen sammanslagningsbas"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Inte ett git-arkiv"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objektet \"%s\" som angavs är felaktigt."
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mer än två blobbar angavs: \"%s\""
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ej hanterat objekt \"%s\" angavs."
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: flera sammanslagningsbaser, använder %s"
@@ -14829,22 +14766,22 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "kunde inte läsa symbolisk länk-fil %s"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, 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:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14852,58 +14789,58 @@ msgstr ""
 "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
 "katalogdiffläge (\"-d\" och \"--dir-diff\")."
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "filen i arbetskatalogen lämnades kvar."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "temporära filer finns i \"%s\"."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "du kanske vill städa eller rädda dem."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "misslyckades: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "utför diff för hela katalogen"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "fråga inte vid start av diff-verktyg"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "använd symboliska länkar i katalogdiffläge"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "verktyg"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "använd angivet diff-verktyg"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 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:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -14911,31 +14848,23 @@ msgstr ""
 "låt \"git-difftool\" avsluta när ett anropat diff-verktyg ger returvärde "
 "skilt från noll"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "ange eget kommando för att visa diffar"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "sändes till \"diff\""
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool kräver en arbetskatalog eller --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff är inkompatibelt med --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "inget <verktyg> angavs för --tool=<verktyg>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 
@@ -14975,123 +14904,115 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-flaggor]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "symbolen för --anonymize-map kan inte vara tom"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "visa förlopp efter <n> objekt"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "välj hantering av signerade taggar"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "välj hantering av taggar som har taggfiltrerade objekt"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "dumpa märken till filen"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "importera märken från filen"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "importera märken från filen, om den finns"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "fejka taggare när taggen saknar en"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "skriv ut hela trädet för varje incheckning"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "använd done-funktionen för att avsluta strömmen"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "hoppa över skrivning av blob-data"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "referensspecifikation"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "applicera referensspecifikation på exporterade referenser"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "från:till"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "konvertera <från> till <till> i anonymiserad utdata"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "märk taggar med märke-id"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map utan --anonymize ger ingen mening"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Saknar från-märken för undermodulen \"%s\""
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Saknar till-märken för undermodulen \"%s\""
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Förväntade \"mark\"-kommando, fick %s"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Förväntade \"to\"-kommando, fick %s"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
@@ -15101,119 +15022,119 @@ msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
 msgid "Lockfile created but not reported: %s"
 msgstr "LÃ¥sfil skapad men inte rapporterad: %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<flaggor>] <grupp>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kan inte vara negativt"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "hämta från alla fjärrar"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "ställ in uppström för git pull/fetch"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 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:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "använd atomiska transaktioner för att uppdatera referenser"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "sökväg till upload pack på fjärren"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "tvinga överskrivning av lokal referens"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "hämta från flera fjärrar"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "hämta alla taggar och associerade objekt"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "hämta inte alla taggar (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "modifiera referensspecifikationen så att alla referenser hamnar i refs/"
 "prefetch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "rensa fjärrspårande grenar ej längre på fjärren"
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hämtning av undermoduler"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "behåll hämtade paket"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "tillåt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "fördjupa historik för grund klon"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "fördjupa historik för grund klon baserad på tid"
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "lägg till i början av undermodulens sökvägsutdata"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15221,141 +15142,145 @@ msgstr ""
 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "ange referenskarta för \"fetch\""
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr "hämta inte paketfil; skriv istället förfäder till förhandlingstips"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "kör \"maintenance --auto\" efter hämtning"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "skriv incheckingsgrafen efter hämtning"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "ta emot referenser från standard in"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Kunde inte hitta fjärr-referensen HEAD"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "kunde inte hitta fjärr-referensen HEAD"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, 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:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[àjour]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "kan inte hämta i aktuell gren"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "utcheckat i en annan arbetskatalog"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[uppdaterad tagg]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "kunde inte uppdatera lokal ref"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "skulle skriva över befintlig tagg"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
+"fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
 "slagits\n"
-"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
-"\"git config fetch.showForcedUpdates true\"."
+"av; för att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
+"\"git config fetch.showForcedUpdates true\""
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n"
+"det tog %.2f sekunder att se efter tvångsuppdateringar; Du kan använda\n"
 "\"--no-show-forced-updates\" eller köra \"git config fetch."
 "showForcedUpdates\n"
-"false\" för att undvika testet.\n"
+"false\" för att undvika testet\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, 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:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "avvisade %s då grunda rötter inte tillåts uppdateras"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Från %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15364,141 +15289,142 @@ 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:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, 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"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "vägrar hämta till grenen \"%s\" som är utcheckad på \"%s\""
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, 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"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "flaggan \"%s\" med värdet \"%s\" är inte giltigt för %s"
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Flaggan \"%s\" ignoreras för %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "flaggan \"%s\" ignoreras för %s\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "objektet %s finns inte"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"kunde inte sätta uppström för HEAD till \"%s\" från \"%s\" när det inte "
+"pekar mot någon gren."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "ställer inte in uppström för en fjärrtag"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "okänd grentyp"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
-"hittade ingen källgren.\n"
-"du måste ange exakt en gren med flaggan --set-upstream."
+"hittade ingen källgren;\n"
+"du måste ange exakt en gren med flaggan --set-upstream"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hämtar %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
-msgstr "Kunde inte hämta %s"
+msgid "could not fetch %s"
+msgstr "kunde inte hämta %s"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
-"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
-"fjärrarkiv som nya incheckningar ska hämtas från."
+"inget fjärrarkiv angavs; ange antingen en URL eller namnet på ett\n"
+"fjärrarkiv som nya incheckningar ska hämtas från"
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Du måste ange namnet på en tagg."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "du måste ange namnet på en tagg"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "Negativa djup stöds inte i --deepen"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen och --depth är ömsesidigt uteslutande"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "negativa djup stöds inte i --deepen"
 
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth och --unshallow kan inte användas samtidigt"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow kan inte användas på ett komplett arkiv"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tar inte namnet på ett arkiv som argument"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Fjärren eller fjärrgruppen finns inte: %s"
+msgid "no such remote or remote group: %s"
+msgstr "fjärren eller fjärrgruppen finns inte: %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "kan inte hämta från grupp och ange referensspecifikationer"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "måste ange fjärr när --negotiate-only anges"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokollet stöder inte --negotiate-only, avslutar."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokollet stöder inte --negotiate-only, avslutar"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15506,11 +15432,11 @@ msgstr ""
 "--filter kan endast användas med fjärren konfigurerad i extensions."
 "partialclone"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic kan bara användas vid hämtning från en fjärr"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin kan bara användas vid hämtning fårn en fjärr"
 
@@ -15520,23 +15446,27 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 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:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "alias för --log (avråds)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "inled meddelande med <text>"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "använd <namn> istället för den verkliga målgrenen"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "fil att läsa från"
 
@@ -15558,47 +15488,47 @@ msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 "git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "citera platshållare passande för skal"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "citera platshållare passande för perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "citera platshållare passande för python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "citera platshållare passande för Tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "visa endast <n> träffade refs"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "använd formatfärger"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "visa endast referenser som pekar på objektet"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "visa endast referenser som slagits samman"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "visa endast referenser som ej slagits samman"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "visa endast referenser som innehåller incheckningen"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "visa endast referenser som inte innehåller incheckningen"
 
@@ -15751,126 +15681,126 @@ msgstr "%s: objektet trasigt eller saknas: %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: objektet har okänd typ \"%s\": %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objektet kunde inte tolkas: %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ogiltig sha1-fil: %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Kontrollerar objektkatalog"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "Kontrollerar %s-länk"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pekar på något konstigt (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: frånkopplat HEAD pekar på ingenting"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "obs: %s pekar på en ofödd gren (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Kontrollerar cacheträd"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: ogiltig sha1-pekare i cacheträd"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "icke-träd i cacheträd"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ta även hänsyn till paket och supplerande objekt"
 
 # Vague original, not networking-related, but rather related to the actual
 # objects in the database.
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn för nåbara objekt"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objekt saknas"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
@@ -15889,17 +15819,12 @@ msgstr "Misslyckades ta status (fstat) på %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "misslyckades tolka \"%s\" värde \"%s\""
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "kan inte ta status på \"%s\""
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -15914,52 +15839,52 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "rensa ej refererade objekt"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "var mer grundlig (ökar körtiden)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "aktivera auto-gc-läge"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 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:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "packa om alla paket förutom det största paketet"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "kunde inte tolka värdet %s för gc.logexpiry"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "kunde inte tolka värdet %s för prune expiry"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, 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:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, 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:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -15967,212 +15892,212 @@ msgstr ""
 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
 "är fallet)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
 "dem."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule tillåts inte"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "okänt argument för --schedule, %s"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "kunde inte skriva incheckningsgraf"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "kunde inte förhämta fjärrar"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "kunde inte starta \"git pack-objects\"-process"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "kunde inte avsluta \"git pack-objects\"-process"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "kunde inte skriva multi-pack-index"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "\"git multi-pack-index expire\" misslyckades"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "\"git multi-pack-index repack\" misslyckades"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är "
 "inaktiverat"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "uppgiften \"%s\" misslyckades"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "\"%s\" är inte en giltig uppgift"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "kör uppgifter baserad på arkivets tillstånd"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "frekvens"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "kör uppgifter baserat på frekvens"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "rapportera inte framgång eller annan information över standard fel"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "uppgift"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "utför en specifik uppgift"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "använd som mest en av --auto och --schedule=<frekvens>"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "misslyckades köra \"git config\""
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "misslyckades expandera sökvägen \"%s\""
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "misslyckades starta launchctl"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "misslyckades skapa kataloger för \"%s\""
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "misslyckades starta tjänsten %s"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "misslyckades skapa temporär xml-fil"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "misslyckades starta schtasks"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\""
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\""
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "misslyckades öppna standard in för \"crontab\""
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "\"crontab\" dog"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "misslyckades starta systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "misslyckades att köra systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "okänt argument för --scheduler, \"%s\""
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "varken systemd-timer eller crontab är tillgänglig"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s-schemaläggare är inte tillgänglig"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "en annan process schemalägger bakgrundsunderhåll"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<schemaläggare>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "schemaläggare"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "schemaläggare som utlöser \"git maintenance\"-körning"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "misslyckades lägga till arkiv till global konfiguration"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <underkommando> [<flaggor>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "felaktigt underkommando: %s"
@@ -16541,25 +16466,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "okänt hjälpformat: \"%s\""
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Misslyckades starta emacsclient."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Kunde inte tolka emacsclient-version."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient version \"%d\" för gammal (< 22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "exec misslyckades för \"%s\""
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16568,7 +16493,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:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16577,39 +16502,39 @@ msgstr ""
 "\"%s\": kommando för man-visare som stöds.\n"
 "Använd \"man.<verktyg>.path\" istället."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "\"%s\": okänd man-visare."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "ingen man-visare hanterade förfrågan"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "ingen info-visare hanterade förfrågan"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "\"%s\" är ett alias för \"%s\""
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "felaktig alias.%s-sträng: %s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "flaggan tar inte några andra argument"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "användning: %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "\"git help config\" för mer information"
 
@@ -16876,18 +16801,10 @@ msgstr "felaktig %s"
 msgid "unknown hash algorithm '%s'"
 msgstr "okänd hashningsalgoritm \"%s\""
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin kan inte användas med --stdin"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin kräver ett git-arkiv"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format kan inte användas med --stdin"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
@@ -17013,10 +16930,6 @@ msgstr "hash"
 msgid "specify the hash algorithm to use"
 msgstr "ange hashningsalgoritm att använda"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17150,85 +17063,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "kunde inte läsa objektet %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "okänd typ: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: ogiltigt omslag från beskrivningsläge"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "kan inte öppna patchfilen %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "behöver precis ett intervall"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "inte ett intervall"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "misslyckades skapa fil för omslagsbrev"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "två utdatakataloger?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "okänd incheckning %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "misslyckades slå upp \"%s\" som en giltig referens"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -17238,405 +17151,393 @@ msgstr ""
 "använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
 "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "basincheckningen bör vara förfader till revisionslistan"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bör inte vara i revisionslistan"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "kan inte hämta patch-id"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 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:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "börja numrera patchar på <n> istället för 1"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "antal iterationer"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "maximal längd för utdatafilnamn"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "använd [RFC PATCH] istället för [PATCH]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-läge"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "använd [<prefix>] istället för [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "använd hashvärde med nollor i From-huvud"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istället för standard (patch + stat)"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 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:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "gör det första brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "lägg till förhandskrävd trädinfo i patchserien"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "visa förloppsindikator medan patchar skapas"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "procent som skapelse vägs med"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff mot v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor kräver --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Intervall-diff:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Intervall-diff mot v%d:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Skapar patchar"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "misslyckades skapa utdatafiler"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, 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:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<flaggor>] [<fil>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "identifiera filstatus med taggar"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 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:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "visa cachade filer i utdata (standard)"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "visa borttagna filer i utdata"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "visa modifierade filer i utdata"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "visa andra filer i utdata"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "visa ignorerade filer i utdata"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "visa köat innehålls objektnamn i utdata"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 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:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "visa endast namn för \"andra\" kataloger"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "visa radslut i filer"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "visa inte tomma kataloger"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "visa ej sammanslagna filer i utdata"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "visa \"resolve-undo\"-information"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "hoppa över filer som motsvarar mönster"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "läs exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "lägg till git:s standardexkluderingar"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "gör utdata relativ till projektets toppkatalog"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 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:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "träd-igt"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 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:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "visa felsökningsutdata"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "undertyck dublettposter"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "visa glesa kataloger när et glest index existerar"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -17705,7 +17606,7 @@ msgstr "terminera poster med NUL-byte"
 
 #: builtin/ls-tree.c:136
 msgid "include object size"
-msgstr "inkludera objektstorlek"
+msgstr "ta med objektstorlek"
 
 #: builtin/ls-tree.c:138 builtin/ls-tree.c:140
 msgid "list only filenames"
@@ -17830,26 +17731,30 @@ msgid "use a diff3 based merge"
 msgstr "använd diff3-baserad sammanslagning"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "använd nitisk diff3-baserad sammanslagning"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "för konflikter, använd vår version"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "för konflikter, använd deras version"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "för konflikter, använd en förenad version"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "för konflikter, använd denna markörstorlek"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "varna inte om konflikter"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "sätt etiketter för fil1/origfil/fil2"
 
@@ -17888,180 +17793,184 @@ msgstr "Slår ihop %s med %s\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<flaggor>] [<incheckning>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "flaggan \"%s\" behöver ett värde"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 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:260 builtin/pull.c:137
+#: builtin/merge.c:261 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:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 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:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "skapa en ensam incheckning istället för en sammanslagning"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte är möjlig"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 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:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategi"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "använd <namn> istället för det verkliga målet"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pågående sammanslagningen"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort men lämna index och arbetskatalog ensamma"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "fortsätt den pågående sammanslagningen"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "tillåt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Redan à jour. (inget att platta till)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "\"%s\" verkar inte peka på en incheckning"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "okänd strategiflagga: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "kunde inte skriva %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, 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:829
+#: builtin/merge.c:831
 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"
@@ -18072,11 +17981,11 @@ msgstr ""
 "temagren.\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18085,73 +17994,73 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, 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:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppström angiven för aktuell gren."
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, 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:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, 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:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "inte något vi kan slå ihop"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit tar inga argument"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18159,7 +18068,7 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18167,84 +18076,76 @@ 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:1386
+#: builtin/merge.c:1389
 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:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Du kan inte kombinera --squash med --no-ff."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Du kan inte kombinera --squash med --commit."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 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:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte något vi kan slå ihop"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 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:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "vägrar slå samman orelaterad historik"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Återspolar trädet till orört...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "Använder strategin %s för att förbereda lösning för hand.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18287,7 +18188,7 @@ msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll"
 msgid "tag on stdin did not refer to a valid object"
 msgstr "taggen på stdin pekar inte på ett giltigt objekt"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "kunde inte skriva tagg-filen"
 
@@ -18351,7 +18252,7 @@ msgstr "skriv flerpaketsindex som endast innehåller angivna index"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "refs-ögonblicksbild för att välja bitkarte-incheckningar"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18451,52 +18352,52 @@ msgstr "%s, källa=%s, mål=%s"
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn på \"%s\""
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<flaggor>] <incheckning>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<flaggor>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<flaggor>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "skriv endast referensbaserade namn (inga objektnamn)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "använd endast taggar för att namnge incheckningar"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "använd endast referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "ignorera referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr "lista alla incheckningar som kan nås alla referenser"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "läs från standard in"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "avreferera taggar i indata (används internt)"
 
@@ -18616,25 +18517,25 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Skriv/redigera anteckningar för följande objekt:"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "kunde inte starta \"show\" för objektet \"%s\""
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "kunde inte läsa utdata från \"show\""
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "ange innehåll för anteckningen med antingen -m eller -F"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "kunde inte skriva anteckningsobjekt"
 
@@ -18643,7 +18544,7 @@ 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:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "kunde inte öppna eller läsa \"%s\""
@@ -18685,8 +18586,8 @@ msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "för många argument"
 
@@ -18733,7 +18634,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "Skriver över befintliga anteckningar för objektet %s\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "Tar bort anteckning för objektet %s\n"
@@ -18857,17 +18758,17 @@ msgstr "måste ange en antecknings-referens att slå ihop"
 msgid "unknown -s/--strategy: %s"
 msgstr "okänd -s/--strategy: %s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, 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:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18878,41 +18779,41 @@ msgstr ""
 "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
 "sammanslagningen med \"git notes merge --abort\".\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "Objektet %s har ingen anteckning\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 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:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "rapportera borttagna anteckningar"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "anteckningar-ref"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "använd anteckningar från <anteckningsref>"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "okänt underkommando: %s"
@@ -19190,15 +19091,15 @@ msgstr "begränsa objekt till dem som ännu inte packats"
 
 #: builtin/pack-objects.c:3915
 msgid "include objects reachable from any reference"
-msgstr "inkludera objekt som kan nås från någon referens"
+msgstr "ta med objekt som kan nås från någon referens"
 
 #: builtin/pack-objects.c:3918
 msgid "include objects referred by reflog entries"
-msgstr "inkludera objekt som refereras från referensloggposter"
+msgstr "ta med objekt som refereras från referensloggposter"
 
 #: builtin/pack-objects.c:3921
 msgid "include objects referred to by the index"
-msgstr "inkludera objekt som refereras från indexet"
+msgstr "ta med objekt som refereras från indexet"
 
 #: builtin/pack-objects.c:3924
 msgid "read packs from stdin"
@@ -19210,7 +19111,7 @@ msgstr "skriv paket på standard ut"
 
 #: builtin/pack-objects.c:3928
 msgid "include tag objects that refer to objects to be packed"
-msgstr "inkludera taggobjekt som refererar objekt som ska packas"
+msgstr "ta med taggobjekt som refererar objekt som ska packas"
 
 #: builtin/pack-objects.c:3930
 msgid "keep unreachable objects"
@@ -19308,11 +19209,6 @@ msgstr "minsta packstorlek är 1 MiB"
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr ""
-"--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "kan inte använda --filter utan --stdout"
@@ -19329,7 +19225,7 @@ msgstr "kan inte använda intern revisionslista med --stdin-packs"
 msgid "Enumerating objects"
 msgstr "Räknar upp objekt"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19372,19 +19268,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "rapportera borttagna objekt"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "låt tid gå ut för objekt äldre än <tid>"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 
@@ -19417,7 +19313,7 @@ msgstr "tillåt snabbspolning"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "styr användning av pre-merge-commit- och commit-msg-krokar"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "utför automatiskt stash/stash pop före och efter"
 
@@ -19494,6 +19390,7 @@ msgid "<remote>"
 msgstr "<fjärr>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<gren>"
 
@@ -19524,13 +19421,13 @@ msgstr "kunde inte komma åt incheckningen %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures för ombasering"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19544,7 +19441,7 @@ msgstr ""
 "Du kan göra detta genom att köra ett av följande kommando innan du\n"
 "gör \"pull\" nästa gång: \n"
 "\n"
-"  git config pull.rebase false  # sammanslagning (förvald strategi)\n"
+"  git config pull.rebase false  # sammanslagning\n"
 "  git config pull.rebase true   # ombasering\n"
 "  git config pull.ff only       # endast snabbspolning\n"
 "\n"
@@ -19553,19 +19450,19 @@ msgstr ""
 "eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
 "förvalet vid körning.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 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:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "checka in eller använd \"stash\" på dem."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19576,7 +19473,7 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19593,23 +19490,23 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Kan inte snabbspola till flera grenar."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Måste ange hur avvikande grenar skall förlikas."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
 
@@ -19785,7 +19682,7 @@ msgstr "Sänder till %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "misslyckades sända vissa referenser till \"%s\""
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "arkiv"
 
@@ -19858,10 +19755,6 @@ msgstr "GPG-signera insändningen"
 msgid "request atomic transaction on remote side"
 msgstr "begär atomiska transaktioner på fjärrsidan"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kan inte användas utan referenser"
@@ -19892,26 +19785,14 @@ msgstr ""
 "\n"
 "    git push <namn>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all och --tags är inkompatibla"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror och --tags är inkompatibla"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all och --mirror är inkompatibla"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "push-flaggor kan inte innehålla radbrytning"
@@ -20331,18 +20212,6 @@ msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges har ersatts av --rebase-merges"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
@@ -20407,8 +20276,9 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy kräver --merge eller --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20449,7 +20319,7 @@ msgid "no such branch/commit '%s'"
 msgstr "ingen sådan gren/incheckning: \"%s\""
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Ingen sådan referens: %s"
@@ -20518,7 +20388,7 @@ msgstr "Snabbspolade %s till %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -20548,7 +20418,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:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -20569,13 +20439,13 @@ msgstr ""
 "\n"
 "För att undvika detta meddelande kan du sätta det till \"refuse\"."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "tyst"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Du måste ange en katalog."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "du måste ange en katalog"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20599,41 +20469,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referens>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "\"%s\" är inte en giltig tidsstämpel"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markerar nåbara objekt..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s pekar ingenstans!"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "ingen referenslogg att ta bort angavs"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "inte en referenslogg: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "ingen referenslogg för \"%s\""
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "felaktigt referensformat: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -20724,6 +20594,11 @@ msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
 msgid "Updating %s"
 msgstr "Uppdaterar %s"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Kunde inte hämta %s"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21171,149 +21046,141 @@ msgstr ""
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "kunde inte öppna indexet för %s"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "paketet %s för stort för att tas med i geometriskt förlopp"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "paketet %s för stort att rulla upp"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "kunde inte öppna temporär fil %s för skrivning"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "kunde inte stänga temporär fil för refs-ögonblicksbild"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "packa allt i ett enda paket"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "samma som -a, och gör onåbara objekt lösa"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "ta bort överflödiga paket, och kör git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "sänd --no-reuse-delta till git-pack-objects"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "sänd --no-reuse-object till git-pack-objects"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "kör inte git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "sänd --local till git-pack-objects"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "skriv bitkartindex"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "sänd --delta-islands till git-pack-objects"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "cirkadatum"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "med -A, lös inte upp objekt äldre än detta"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "med -a, packa om onåbara objekt"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "storlek på fönster använt för deltakomprimering"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "begränsa maximalt deltadjup"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "begränsar maximalt antal trådar"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "maximal storlek på varje paketfil"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "packa om objekt i paket märkta med .keep"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "packa inte om detta paket"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "hitta ett geometrisk förlopp med faktor <N>"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "skriv ett flerpaketsindex för de skapade paketen"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric är inkompatibel med -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Inget nytt att packa."
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "nödvändig fil saknas: %s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "kunde inte ta bort: \"%s\""
@@ -21396,67 +21263,61 @@ msgstr "cat-file rapporterade misslyckande"
 msgid "unable to open %s for reading"
 msgstr "kan inte öppna %s för läsning"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "kan inte starta mktree"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "kan inte läsa från mktree"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree rapporterade misslyckande"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree returnerade inte ett objektnamn"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "kan inte utföra \"fstat\" på %s"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "kan inte skriva objektet till databasen"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "objektnamnet är inte giltigt: \"%s\""
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "kan inte läsa objekttyp för %s"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "misslyckades redigera objektfilen"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "nytt objekt är samma som det gamla: \"%s\""
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "kunde inte tolka %s som incheckning"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21465,31 +21326,31 @@ msgstr ""
 "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
 "\" som har förkastats; använd --edit istället för --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "ympning för \"%s\" behövs inte"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "ny incheckning är samma som den gamla: \"%s\""
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21498,71 +21359,71 @@ msgstr ""
 "kunde inte konvertera följande ympning(ar):\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "visa ersättningsreferenser"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "ta bort ersättningsreferenser"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "redigera befintligt objekt"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "ändra en inchecknings föräldrar"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "konvertera befintlig ympningsfil"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "ersätt referensen om den finns"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "använd inte snygg visning av innehåll för --edit"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "använd detta format"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format kan inte användas utanför listning"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f kan endast användas vid skrivning av ersättning"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw kan bara användas med --edit"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d behöver minst ett argument"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "fel antal argument"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e tar exakt ett argument"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g tar minst ett argument"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file tar inga argument"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "endast ett mönster kan anges med -l"
 
@@ -21583,132 +21444,124 @@ msgstr "\"git rerere forget\" utan sökvägar är föråldrat"
 msgid "unable to generate diff for '%s'"
 msgstr "misslyckades skapa diff för \"%s\""
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "blandad"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "mjuk"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "hård"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "sammanslagning"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "behåll"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Du har inte en giltig HEAD."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Kunde inte hitta trädet för HEAD."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Kunde inte hitta trädet för %s."
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD är nu på %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, 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:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "var tyst, rapportera endast fel"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "återställ HEAD och index"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "återställ endast HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "återställ HEAD, index och arbetskatalog"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "återställ HEAD men behåll lokala ändringar"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 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:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, 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:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 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:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Kan inte göra %s återställning med sökvägar."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, 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:398
-msgid "-N can only be used with --mixed"
-msgstr "-N kan endast användas med --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Oköade ändringar efter återställning:"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21722,19 +21575,15 @@ msgstr ""
 "konfigurationsvariabeln\n"
 "reset.quiet till true för att göra detta till förval.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "objektfiltrering kräver --objects"
@@ -21744,8 +21593,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list stöder inte visning av anteckningar"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "markerad räkning är inkompatibelt med --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "markerad räkning och \"%s\" kan inte användas samtidigt."
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22146,7 +21996,7 @@ msgstr "undertyck namnsträngar"
 
 #: builtin/show-branch.c:655
 msgid "include the current branch"
-msgstr "inkludera aktuell gren"
+msgstr "ta med aktuell gren"
 
 #: builtin/show-branch.c:657
 msgid "name commits with their object names"
@@ -22184,13 +22034,6 @@ msgstr "<n>[,<bas>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "visa <n> nyaste refloggposter med början på bas"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
-"base"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "inga grenar angavs, och HEAD är inte giltigt"
@@ -22211,19 +22054,19 @@ msgstr[1] "maximalt %d poster kan visas samtidigt."
 msgid "no such ref %s"
 msgstr "ingen sådan referens %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "kan inte hantera mer än %d revision."
 msgstr[1] "kan inte hantera mer än %d revisioner."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "\"%s\" är inte en giltig referens."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "hittar inte incheckning %s (%s)"
@@ -22288,12 +22131,16 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "arbetskatalogen är inte gren"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22302,75 +22149,98 @@ msgstr ""
 "katalogen \"%s\" innehåller ospårade filer, men är inte i området som ages i "
 "\"sparse-checkout\""
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "misslyckades ta bort katalogen \"%s\""
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "misslyckades ändra inställning för sparse-index"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "initiera sparse-checkout i konläge"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "slå på/av använding av glest index"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "misslyckades ändra inställning för sparse-index"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "misslyckades öppna \"%s\""
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "kunde inte normalisera sökvägen \"%s\""
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "kan inte ta bort citering av C-sträng \"%s\""
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "befintliga filter för gles utcheckning använder inte konläge"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <mönster>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "läs mönster från standard in"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "ingen sparse-checkout att utöka"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<mönster>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"måste vara i en gles utcheckning för att tillämpa gleshetsmönster på nytt"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "fel vid uppdatering av arbetskatalog"
 
@@ -22396,22 +22266,26 @@ msgstr "git stash branch <grennamn> [<stash>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
 "          [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
 "          [--] [<sökväg>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<meddelande>]"
 
 #: builtin/stash.c:55
@@ -22504,140 +22378,157 @@ msgstr "Slår ihop %s med %s"
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits upp ur \"stash\":en"
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "kunde inte återställa ospårade filer från stash-post"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "försök återskapa indexet"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Kastade %s (%s)"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Kunde inte kasta \"stash\"-post"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "\"%s\" är inte en \"stash\"-referens"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Stash-posten behålls ifall du behöver den igen."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "misslyckades tolka träd"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "misslyckades packa upp träd"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "ta med ospårade filer i \"stash\""
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "visa bara ospårade filer i \"stash\""
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kan inte uppdatera %s med %s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "\"stash\"-meddelande"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" kräver ett <incheckning>-argument"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Inga köade ändringar"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "Inga ändringar valda"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Du har inte den första incheckningen ännu"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Kan inte spara aktuellt tillstånd för indexet"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Kan inte spara ospårade filer"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Kan inte spara aktuellt tillstånd kö"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Kan inte registrera tillstånd för arbetskatalog"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 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"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr ""
+"Kan inte använda --staged och --include-untracked eller --all samtidigt"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Glömde du använda \"git add\"?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Inga lokala ändringar att spara"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Kan inte initiera \"stash\""
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Kan inte spara aktuell status"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Sparade arbetskatalogen och indexstatus %s"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort ändringar i arbetskatalogen"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "behåll indexet"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "stash:a endast köade ändringar"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "\"stash\" i \"patch\"-läge"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "tyst läge"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "ta med ospårade filer i \"stash\""
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "ta med ignorerade filer"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22661,7 +22552,7 @@ 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:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Förväntade fullt referensnamn, fick %s"
@@ -22684,7 +22575,7 @@ msgstr ""
 "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
 "officiella uppström."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
@@ -22779,7 +22670,7 @@ msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
 msgid "failed to recurse into submodule '%s'"
 msgstr "misslyckades rekursera in i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "hindra statusutskrift för undermodul"
 
@@ -22850,10 +22741,6 @@ msgstr ""
 msgid "could not fetch a revision for HEAD"
 msgstr "kunde inte hämta en version för HEAD"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached och --files är ömsesidigt uteslutande"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -22882,16 +22769,16 @@ msgstr "dölj utdata från synkronisering av undermodul-url"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
-"\" om du verkligen vill ta bort den och all dess historik)"
+"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog. Denna kommer "
+"ersättas med en .git-fil med absorbgitdirs."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22900,46 +22787,46 @@ msgstr ""
 "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
 "dem"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Rensade katalogen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "kunde inte skapa tom undermodulskatalog %s"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
 "ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "avregistrera alla undermoduler"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -22951,67 +22838,67 @@ msgstr ""
 "submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
 "med \"--reference-if-able\" istället för \"--reference\"."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, 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:1746
+#: builtin/submodule--helper.c:1747
 #, 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:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "katalogen inte tom: \"%s\""
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "var den nya undermodulen ska klonas till"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "djup för grunda kloner"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "tvinga kloningsförlopp"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "förhindra kloning till icke-tom katalog"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23021,92 +22908,92 @@ msgstr ""
 "<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
 "path <sökväg>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Undermodulsökvägen \"%s\" har inte initierats"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Kanske menade du att använda \"update --init\"?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar över ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar över undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, 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:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Kan inte checka ut \"%s\" i undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Kan inte ombasera \"%s\" i undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Kan inte slå ihop \"%s\" i undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "Misslyckades köra \"%s %s\" i undermodulsökvägen \"%s\""
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Undermodulsökvägen \"%s\": checkade ut \"%s\"\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Undermodulsökvägen \"%s\": ombaserade in i \"%s\"\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Undermodulsökvägen \"%s\": sammanslagen i \"%s\"\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Undermodulsökvägen \"%s\": \"%s %s\"\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr "Kan inte hämta i undermodulsökväg \"%s\"; försökte hämta %s direkt:"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23115,84 +23002,84 @@ msgstr ""
 "Hämtade i undermodulssökvägen \"%s\", men den innehöll inte %s. Direkt "
 "hämtning av incheckningen misslyckades."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "sökväg inuti arbetskatalogen"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 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:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout eller none"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 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:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "om den första klonen ska följa rekommendation för grund kloning"
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "skriv inte klonförlopp"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 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:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "felaktigt värde för parametern update"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr "dölj utdata för uppdatering via ombasering eller sammanslagning{"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "tvinga utcheckningsuppdateringar"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "hämta inte nya objekt från fjärrplatsen"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr "överstyr uppdateringsläge om arkviet är en färsk klon"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "djup för grund hämtning"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "SHA1 förväntades av överprojekt{"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "SHA1 för undermodulens \"HEAD\""
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<flaggor>] <sökväg>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23201,94 +23088,90 @@ 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<flaggor>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "se om det är säkert att skriva till .gitmodules-filen"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "ta bort konfigurationen från .gitmodules-filen"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <namn> [<värde>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <namn>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "se till att .gitmodules finns i arbetskatalogen"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "dölj utdata från inställning av url för undermodul"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "välj master som förvald spårad gren"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "välj förvald spårad gren"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <sökväg>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch eller --default krävs"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch och --default är ömsesidigt uteslutande"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "Lägger till befintligt arkiv i \"%s\" i indexet\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "\"%s\" finns redan och är inte ett giltigt git-arkiv"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23306,54 +23189,54 @@ msgstr ""
 "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
 "flaggan \"--name\"."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "Aktiverar lokal git-katalog för undermodulen \"%s\" på nytt.\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "Kan inte checka ut undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Misslyckades lägga till undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Misslyckades registrera undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "\"%s\" finns redan i indexet"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "\"%s\" finns redan i indexet och är inte en undermodul"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "gren från arkivet att lägga till som undermodul"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "visa endast felmeddelanden"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "låna objekt från referensarkiv"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
@@ -23361,30 +23244,30 @@ msgstr ""
 "sätter undermodulens namn till den angivna strängen istället för att använda "
 "sökvägen"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<flaggor>] [--] <arkiv> [<sökväg>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "arkiv-URL: \"%s\" måste vara absolut eller börja med ./|../"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "\"%s\" är inte ett giltigt namn på undermodul"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s stöder inte --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -23484,11 +23367,11 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
 "du vill.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "kunde inte signera taggen"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23501,15 +23384,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "felaktig objekttyp."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "inget taggmeddelande?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Taggmeddelandet har lämnats i %s\n"
@@ -23590,45 +23473,22 @@ msgstr "visa endast taggar som ej slagits samman"
 msgid "print only tags of the object"
 msgstr "visa endast taggar för objektet"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column och -n är inkompatibla"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "Flaggan -n är endast tillåten i listläge"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "Flaggan --contains är endast tillåten i listläge"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "Flaggan --no-contains är endast tillåten i listläge"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "Flaggan --points-at är endast tillåten i listläge"
-
-#: builtin/tag.c:554
-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:568
-msgid "only one -F or -m option is allowed."
-msgstr "endast en av flaggorna -F eller -m tillåts."
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "flaggan \"%s\" är endast tillåten i listläge"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -24055,132 +23915,120 @@ msgstr "kunde inte skapa katalogen \"%s\""
 msgid "initializing"
 msgstr "initierar"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 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:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "skapa eller återställ en gren"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "befolka den nya arbetskatalogen"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "låt arbetskatalogen förbli låst"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "orsak till lås"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "ställ in spårningsläge (se git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason kräver --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "lagt till med --lock"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track kan endast användas när ny gran skapas"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "visa utökade annoteringar och grunder, om tillgängliga"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "\"%s\" är inte en arbetskatalog"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" är redan låst, orsak: %s"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" är redan låst"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "\"%s\" är inte en huvudarbetskatalog"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "kunde inte lista ut målnamn från \"%s\""
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24189,7 +24037,7 @@ msgstr ""
 "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
 "använd \"move -f -f\" för att överstyra, eller lås upp först"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24197,38 +24045,38 @@ msgstr ""
 "kan inte flytta en låst arbetskatalog;\n"
 "använd \"move -f -f\" för att överstyra, eller lås upp först"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "misslyckades flytta \"%s\" till \"%s\""
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "misslyckades köra \"git status\" på \"%s\""
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta "
 "bort det"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24237,7 +24085,7 @@ msgstr ""
 "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
 "använd \"remove -f -f\" för att överstyra, eller lås upp först"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24245,17 +24093,17 @@ msgstr ""
 "kan inte ta bort en låst arbetskatalog;\n"
 "använd \"remove -f -f\" för att överstyra, eller lås upp först"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "reparera: %s: %s"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "fel: %s: %s"
@@ -24307,21 +24155,16 @@ msgstr ""
 "<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
 "See \"git help git\" för en översikt över systemet."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "ingen katalog angavs för --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "ingen katalog angavs för flaggan \"%s\"\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "ingen namnrymd angavs för --namespace\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "ingen katalog angavs för --work-tree\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24337,11 +24180,6 @@ msgstr "-c förväntar en konfigurationssträng\n"
 msgid "no config key given for --config-env\n"
 msgstr "ingen konfigurationsnyckel angavs för --config-env\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "ingen katalog angavs för -C\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -24371,29 +24209,29 @@ msgstr "tomt alias för %s"
 msgid "recursive alias: %s"
 msgstr "rekursivt alias: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "skrivfel på standard ut"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "okänt skrivfel på standard ut"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "stäng misslyckades på standard ut"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "kan inte hantera %s som inbyggd"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24402,35 +24240,27 @@ msgstr ""
 "användning: %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "misslyckades köra kommandot \"%s\": %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr ""
 "argumentet till --packfile måste vara ett giltigt hashvärde (fick '%s')"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "inte ett git-arkiv"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile kräver --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args kan endast användas med --packfile"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "flaggor som inte hanterats"
@@ -24709,6 +24539,176 @@ msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: okänt kommando \"%s\" från git"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "behöver en arbetskatalog"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "kunde inte hitta enrolleringsroten"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "kunde inte växla till \"%s\""
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "kunde inte ställa in %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "kunde inte ställa in log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar-enrolleringar kräver en arbetskatalog"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD hos fjärren är inte en gren: \"%.*s\""
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"misslyckades hämta namn på standardgren för fjärr; använder lokalt förval"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "misslyckades hämta namn på standardgren"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "misslyckades avregistrera arkivet"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "misslyckades ta bort enrolleringskatalogen"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "gren att checka ut efter kloning"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "skapa komplett arbetskatalog vid kloning"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "hämta endast metadata för grenen som skall checkas ut"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<flaggor>] [--] <arkiv> [<kat>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "Kan inte härleda arbetsträdsnamn från \"%s\""
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "katalogen \"%s\" finns redan"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "misslyckades hämta standardgren för \"%s\""
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "kunde inte ställa in fjärr i \"%s\""
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "kunde inte ställa in \"%s\""
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "delvis klon misslyckades; försöker med fullständig klon"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "kunde inte ställa in för komplett klon"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "\"scalar list\" tar inte argument"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enrollering>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "konfigurera alla registrerade enrolleringar på nytt"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enrollering>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all eller <enrollering>, men inte bägge"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git-arkiv försvunnet i \"%s\""
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <uppgift> [<enrollering>]\n"
+"Uppgifter:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "okänd uppgift: \"%s\""
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enrollering>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enrollering>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "vägrar ta bort aktuell arbetskatalog"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "ta med Git-version"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "ta med Gits byggflaggor"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <kommando> [<flaggor>]\n"
+"\n"
+"Kommandon:\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "ingen kompilatorinformation tillgänglig\n"
@@ -24733,36 +24733,36 @@ msgstr "giltig-till"
 msgid "no-op (backward compatibility)"
 msgstr "ingen funktion (bakåtkompatibilitet)"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "var mer pratsam"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "var mer tyst"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "använd <n> siffror för att visa objektnamn"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "läs sökvägsangivelse från fil"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "nyckel"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "fältnamn att sortera på"
 
@@ -24832,17 +24832,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "Visa kanoniska namn och e-postadresser för kontakter"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Se till att referensen är välformad"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Kopiera filer från indexet till arbetskatalogen"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Se till att referensen är välformad"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
@@ -25037,412 +25037,412 @@ msgstr ""
 "Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Bläddraren för Git-arkiv"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Visa incheckningsloggar"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "Visa information om filer i indexet och arbetskatalogen"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Lista referenser i ett fjärrarkiv"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Visa innehållet i ett trädobjekt"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Enkelt program för att dela en UNIX mbox"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Utför uppgifter för att optimera Git-arkivdata"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "Slå ihop två eller flera utvecklingshistorier"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Hitta en så bra anfader som möjligt för sammanslagning"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Kör en trevägs-filsammanslagning"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Kör en sammanslagning för filer som behöver det"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Visa trevägssammanslagning utan att röra indexet"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Visa trevägssammanslagning utan att röra indexet"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Skriv och verifiera multi-pack-index"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "skapar ett taggobjekt med extra validering"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Skriv och verifiera multi-pack-index"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
 
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Hitta symboliska namn för givna referenser"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Lägg till eller inspektera objektanteckningar"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importera från eller sänd till Perforce-arkiv"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Skapa ett packat arkiv med objekt"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Hitta redundanta pack-filer"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Beräkna unik ID för en patch"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ta bort alla onåbara objekt från objektdatabasen"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Ta bort extraobjekt som redan finns i pack-filerna"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Läser trädinformation in i indexet"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Ta emot det som sänds till arkivet"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Hantera referenslogg-information"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Hantera uppsättningen spårade arkiv"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "Packa opackade objekt i ett arkiv"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "Skapar en sammanfattning av väntande ändringar"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "Återställ aktuell HEAD till angivet tillstånd"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Återställ filer i arbetskatalogen"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Återställ några befintliga incheckningar"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Plocka ut och massera parametrar"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Återställ några befintliga incheckningar"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Ta bort filer från arbetskatalogen och från indexet"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Sänd en uppsättning patchar som e-post"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Sänd objekt över Git-protokollet till annat arkiv"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Git:s i18n-startkod för skalskript"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Gemensam skriptstartkod för Git"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Summera \"git log\"-utdata"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Visa olika sorters objekt"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Visa grenar och deras incheckningar"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Skapa packat arkivindex"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Visa referenser i ett lokalt arkiv"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Git:s i18n-startkod för skalskript"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Gemensam skriptstartkod för Git"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Initiera och modifiera sparse-checkout"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Lägg filinnehållet till indexet"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Spara undan ändringar i en lortig arbetskatalog"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Lägg filinnehållet till indexet"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Visa status för arbetskatalogen"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Ta bort onödiga blanksteg"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Initiera, uppdatera eller inspektera undermoduler"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Byt gren"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "Läs, modifiera eller ta bort symbolisk referens"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Skapar temporära filer med innehållet från en blob"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Packa upp objekt från ett pakat arkiv"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Sänd arkivet tillbaka till git-archive"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Visa en logisk Git-variabel"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "Kontrollera GPG-signaturer för incheckningar"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Bekräfta packade Git-arkivfiler"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Kontrollera GPG-signaturer i taggar"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Visa loggar med differenser varje incheckning introducerar"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Hantera ytterligare arbetskataloger"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Skapa ett trädobjekt från aktuellt index"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Definierar attribut per sökväg"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Gits kommandoradsgränssnitt och -konventioner"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Grundläggande Git-handledning för utvecklare"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Tillhandahåll användarnamn och lösenord till Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git för CVS-användare"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "Justrea diff-utdata"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Ofta ställda frågor om att använda Git"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "En Git-ordlista"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Krokar som används av Git"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Ange avsiktligen ospårade filer att ignorera"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Bläddraren för Git-arkiv"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Ange egenskaper för undermoduler"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Git-namnrymder"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Hjälpprogram för att interagera med fjärrarkiv"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Gits arkivlayout"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Ange versioner och intervall i Git"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Monterar ett arkiv inuti ett annat"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Introduktion till Git"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Introduktion till Git: del två"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Introduktion till Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -25517,40 +25517,40 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
 msgid "usage: $dashless $USAGE"
 msgstr "använd: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "Kan inte $action: Du har oköade ändringar."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 "Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
 
@@ -25632,7 +25632,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25646,7 +25646,7 @@ msgstr ""
 "a - köa stycket och alla följande i filen\n"
 "d - köa inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25660,7 +25660,7 @@ msgstr ""
 "a - \"stash\":a stycket och alla följande i filen\n"
 "d - \"stash\":a inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25674,7 +25674,7 @@ msgstr ""
 "a - ta bort stycket och alla följande i filen från kön\n"
 "d - ta inte bort stycket eller något av de följande i filen från kön"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25688,7 +25688,7 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25702,7 +25702,7 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25716,7 +25716,7 @@ msgstr ""
 "a - förkasta stycket och alla följande i filen\n"
 "d - förkasta inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25730,7 +25730,7 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25744,7 +25744,7 @@ msgstr ""
 "a - applicera stycket och alla följande i filen\n"
 "d - applicera inte stycket eller något av de följande i filen"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25766,90 +25766,90 @@ msgstr ""
 "e - redigera aktuellt stycke manuellt\n"
 "? - visa hjälp\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Markerade stycken kan inte appliceras på indexet!\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorerar ej sammanslagen: %s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera tillägg på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Inga andra stycken att gå till\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ogiltigt siffervärde: \"%s\"\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Beklagar, det finns bara %d stycke.\n"
 msgstr[1] "Beklagar, det finns bara %d stycken.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Inga andra stycken att söka efter\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Inga stycken motsvarar givet mönster\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Inget föregående stycke\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Inget följande stycke\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Beklagar, kan inte dela stycket\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Dela i %d stycke.\n"
 msgstr[1] "Dela i %d stycken.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Beklagar, kan inte redigera stycket\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -25866,57 +25866,57 @@ msgstr ""
 "diff          - visa diff mellan HEAD och index\n"
 "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "saknad --"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "okänt läge för --patch: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "felaktigt argument %s, förväntar --"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 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:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, 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:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases är inkompatibelt med andra flaggor\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25928,11 +25928,11 @@ msgstr ""
 "Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
 "kontroll.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 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:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -25940,37 +25940,37 @@ msgstr ""
 "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
 "eller konfigurationsflagga)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Okänd inställning i --confirm: \"%s\"\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, 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:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "varning: \":include:\" stöds inte: %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, 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:626
+#: git-send-email.perl:662
 #, 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:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25985,12 +25985,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:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Misslyckades utföra opendir %s: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26000,17 +26000,17 @@ msgstr ""
 "Inga patchfiler angavs!\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ingen ärenderad i %s?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Kunde inte öppna för skrivning %s: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26024,38 +26024,38 @@ msgstr ""
 "\n"
 "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Misslyckades öppna %s: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Misslyckades öppna %s.final: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 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:935
+#: git-send-email.perl:971
 #, 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:990
+#: git-send-email.perl:1026
 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:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26068,21 +26068,21 @@ msgstr ""
 "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
 "vill sända.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Till vem ska breven sändas (om någon)?"
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, 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"
@@ -26090,16 +26090,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:1126
+#: git-send-email.perl:1162
 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:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA-sökvägen \"%s\" finns inte"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26126,114 +26126,114 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Svar krävs på frågan \"Sända brevet?\""
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Nödvändig SMTP-server har inte angivits korrekt."
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servern stöder inte SMARTTLS! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS misslyckades! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 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:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Misslyckades sända %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Test-Sände %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Sände %s\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Test-OK. Loggen säger:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Loggen säger:\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Resultat: OK\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, 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:1762
+#: git-send-email.perl:1798
 #, 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:1819
+#: git-send-email.perl:1855
 #, 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:1854
+#: git-send-email.perl:1890
 #, 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:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Kunde inte köra \"%s\""
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, 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:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) misslyckades stänga röret till \"%s\""
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "kan inte sända brev som sjubitars"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "ogiltig överföringskondning"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26244,12 +26244,12 @@ msgstr ""
 "%s\n"
 "varning: inga patchar har sänts\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26258,7 +26258,7 @@ msgstr ""
 "ödesdigert: %s:%d är längre än 998 tecken\n"
 "varning: inga patchar har sänts\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
@@ -26266,11 +26266,382 @@ msgstr ""
 "säkerhetskopior.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 
+#~ msgid "--index outside a repository"
+#~ msgstr "--index utanför arkiv"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached utanför arkiv"
+
+#~ msgid "unrecognized input"
+#~ msgstr "indata känns inte igen"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "kan inte läsa %s"
+
+#~ msgid "Option --exec can only be used together with --remote"
+#~ msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#, c-format
+#~ 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."
+
+#, 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\"."
+
+#, 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."
+
+#, 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\"."
+
+#, 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."
+
+#, 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 "Cannot force update the current branch."
+#~ msgstr "Kan inte tvinga uppdatering av aktuell gren."
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "Objektnamnet är inte giltigt: \"%s\"."
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr ""
+#~ "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr ""
+#~ "-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex "
+#~ "med -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --"
+#~ "pickaxe-all med -G och -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only och --right-only är ömsesidigt uteslutande"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "okänt %%(objectsize)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "okänt %%(subject)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "okänt %%(contents)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "okänt %%(raw)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "okänt argument \"%s\" i %%(%s)"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "okänt %%(align)-argument: %s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "okänt %%(if)-argument: %s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input är inkompatibelt med --no-walk"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk är inkompatibelt med --unsorted-input"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run är inkompatibelt med --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --edit"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A och -u är ömsesidigt inkompatibla"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr ""
+#~ "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr ""
+#~ "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul kräver --pathspec-from-file"
+
+#, c-format
+#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+#~ msgstr ""
+#~ "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column och --verbose är inkompatibla"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "\"%s\" kan inte användas med %s"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr "sätt uppströmsinformation för ny gren"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p och --overlay är ömsesidigt uteslutande"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --detach"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file är inkompatibelt med --patch"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "flaggorna --bare och --origin %s är inkompatibla."
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file med -a ger ingen mening"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "kan inte kombinera -m med --fixup:%s"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long och -z är inkompatibla"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr ""
+#~ "kan inte kombinera omformuleringsflaggor för --fixup med sökvägen \"%s\""
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "omformuleringsflaggan i --fixup är ömsesidigt uteslutande med --patch/--"
+#~ "interactive/--all/--include/--only"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long är inkompatibel med --abbrev=0"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff är inkompatibelt med --no-index"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "--anonymize-map utan --anonymize ger ingen mening"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
+
+#, 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"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen och --depth är ömsesidigt uteslutande"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth och --unshallow kan inte användas samtidigt"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin kan inte användas med --stdin"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format kan inte användas med --stdin"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n och -k kan inte användas samtidigt"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr ""
+#~ "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor kräver --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "Du kan inte kombinera --squash med --no-ff."
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "Du kan inte kombinera --squash med --commit."
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr ""
+#~ "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete är inkompatibel med --all, --mirror och --tags"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all och --tags är inkompatibla"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror och --tags är inkompatibla"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all och --mirror är inkompatibla"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable och -A kan inte användas samtidigt"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric är inkompatibel med -A, -a"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N kan endast användas med --mixed"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "markerad räkning är inkompatibelt med --objects"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr ""
+#~ "--reflog är inkompatibel med --all, --remotes, --independent eller --"
+#~ "merge-base"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached och --files är ömsesidigt uteslutande"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch och --default är ömsesidigt uteslutande"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column och -n är inkompatibla"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "Flaggan --contains är endast tillåten i listläge"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "Flaggan --no-contains är endast tillåten i listläge"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "Flaggan --points-at är endast tillåten i listläge"
+
+#~ 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"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "endast en av flaggorna -F eller -m tillåts."
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b, -B och --detach är ömsesidigt uteslutande"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason kräver --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "ingen katalog angavs för --git-dir\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "ingen katalog angavs för --work-tree\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile kräver --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args kan endast användas med --packfile"
+
 #~ msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s"
 #~ msgstr "gpg.ssh.defaultKeycommand lyckades men gav inga nycklar: %s %s"
 
@@ -26388,9 +26759,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "edit the todo list"
 #~ msgstr "redigera attgöra-listan"
 
-#~ msgid "show the current patch"
-#~ msgstr "visa nuvarande patch"
-
 #~ msgid "shorten commit ids in the todo list"
 #~ msgstr "förkorta inchecknings-id i todo-listan"
 
@@ -27178,9 +27546,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Cannot store %s"
 #~ msgstr "Kan inte spara %s"
 
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "ställ in filter för gles utcheckning"
-
 #~ msgid "disable sparse-checkout"
 #~ msgstr "inaktivera gles utcheckning"
 
@@ -27454,9 +27819,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "unrecognized verb: %s"
 #~ msgstr "okänt verb: %s"
 
-#~ msgid "option '%s' requires a value"
-#~ msgstr "flaggan \"%s\" behöver ett värde"
-
 #~ msgid "could not transform the todo list"
 #~ msgstr "kunde inte transformera att göra-listan"
 
@@ -27715,9 +28077,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "could not truncate '%s'"
 #~ msgstr "kunde inte trunkera \"%s\""
 
-#~ msgid "could not close %s"
-#~ msgstr "kunde inte stänga %s"
-
 #~ msgid "Copied a misnamed branch '%s' away"
 #~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""
 
diff --git a/po/tr.po b/po/tr.po
index 06870900c4..6afb871846 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
 # Turkish translations for Git
 # Git Türkçe çevirileri
-# Copyright (C) 2020-2021 Emir SARI <emir_sari@msn.com>
+# Copyright (C) 2020-2022 Emir SARI <emir_sari@icloud.com>
 # This file is distributed under the same license as the Git package.
-# Emir SARI <emir_sari@msn.com>, 2020-2021
+# Emir SARI <emir_sari@icloud.com>, 2020-2022
 #
 # ######################################################### #
 #     Git Türkçe kavramlar dizini / Git Turkish Glossary    #
@@ -90,9 +90,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Turkish Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-10 18:00+0300\n"
-"Last-Translator: Emir SARI <emir_sari@msn.com>\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
+"PO-Revision-Date: 2022-01-11 18:00+0300\n"
+"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -105,8 +105,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "Pardon (%s)?"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "indeks okunamadı"
@@ -135,7 +135,7 @@ msgstr "Güncelle"
 msgid "could not stage '%s'"
 msgstr "'%s' hazırlanamadı"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "indeks yazılamadı"
 
@@ -151,8 +151,8 @@ msgstr[1] "%d yol güncellendi\n"
 msgid "note: %s is untracked now.\n"
 msgstr "not: %s artık izlenmiyor.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "'%s' yolu için make_cache_entry başarısız oldu"
@@ -193,21 +193,21 @@ msgstr[1] "%d yol eklendi\n"
 msgid "ignoring unmerged: %s"
 msgstr "birleştirilmeyenler yok sayılıyor: %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "DeÄŸiÅŸiklik yok.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Yama güncellemesi"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "diff'i gözden geçir"
 
@@ -275,11 +275,11 @@ msgstr "numaralandırılmış bir öge seç"
 msgid "(empty) select nothing"
 msgstr "(boş) hiçbir şey seçme"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Komutlar ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Åžimdi ne olacak"
 
@@ -291,13 +291,13 @@ msgstr "hazırlanmış"
 msgid "unstaged"
 msgstr "hazırlanmamış"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "yol"
@@ -306,27 +306,27 @@ msgstr "yol"
 msgid "could not refresh index"
 msgstr "indeks yenilenemedi"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Güle güle.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Ekleme hazırlansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? "
@@ -353,22 +353,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırla\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Ekleme zulalansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? "
@@ -395,22 +395,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları zulala\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini zulalama\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Ekleme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
@@ -437,22 +437,22 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "Ekleme indekse uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? "
@@ -479,26 +479,26 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
@@ -525,23 +525,23 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
@@ -560,23 +560,23 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
@@ -714,7 +714,7 @@ msgstr "'git apply --cached' başarısız oldu"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -725,11 +725,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Seçili parçalar indekse uygulanamıyor!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Çalışma ağacına yine de uygulansın mı? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "Hiçbir şey uygulanmadı.\n"
 
@@ -767,11 +767,11 @@ msgstr "Sonrasında parça yok"
 msgid "No other hunks to goto"
 msgstr "Gidilecek başka bir parça yok"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "hangi parçaya gidilsin? "
 
@@ -791,7 +791,7 @@ msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir."
 msgid "No other hunks to search"
 msgstr "Aranacak başka parça yok"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "düzenli ifade aransın mı? "
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
 
@@ -969,21 +969,33 @@ msgstr "tanımlanamayan boşluk seçeneği '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject ve --3way birlikte kullanılamaz."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way bir depo dışında"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index bir depo dışında"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached bir depo dışında"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "'%s' ve '%s' seçenekleri birlikte kullanılamaz"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' bir depo dışında"
 
 #: apply.c:800
 #, c-format
@@ -998,7 +1010,7 @@ msgstr "düzenli ifade girdi için %d döndürdü: %s"
 #: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
-msgstr "yamanın %d. satırında dosya adı bulunamıyor "
+msgstr "yamanın %d. satırında dosya adı bulunamıyor"
 
 #: apply.c:921
 #, c-format
@@ -1193,8 +1205,8 @@ msgstr "yama başarısız oldu: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "%s çıkışı yapılamıyor"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "%s okunamadı"
@@ -1204,380 +1216,378 @@ msgstr "%s okunamadı"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "%s yolu yeniden adlandırıldı/silindi"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: indekste bulunmuyor"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: indeks ile eÅŸleÅŸmiyor"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "Depo, 3 yönlü birleştirme için gereken ikili nesneye iye değil."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "'%s' ögesinin geçerli içeriği okunamıyor"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "kaldırma yaması dosya içeriğini bırakır"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: yanlış tür"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s, %o türüne iye, %o bekleniyordu"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "geçersiz yol '%s'"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: indekste halihazırda var"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: çalışma dizininde halihazırda var"
 
-#: apply.c:3998
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "ÅŸunun yeni kipi (%o): %s, eski kip (%o) ile eÅŸleÅŸmiyor "
+msgstr "ÅŸunun yeni kipi (%o): %s, eski kip (%o) ile eÅŸleÅŸmiyor"
 
-#: apply.c:4003
+#: apply.c:4005
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "ÅŸunun yeni kipi (%o): %s, ÅŸunun eski kipi (%o): %s, ile eÅŸleÅŸmiyor"
 
-#: apply.c:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: yama uygulanamıyor"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "%s yaması denetleniyor..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız"
 
-#: apply.c:4141
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "geçerli HEAD'de olmayan %s için kip değişimi"
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 bilgisi eksik veya yararsız (%s)."
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "%s geçici indekse eklenemedi"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "geçici indeks şuraya yazılamadı: %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "%s indeksten kaldırılamıyor"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "%s altmodülü için hasarlı yama"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor"
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor"
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "%s için önbellek girdisi eklenemiyor"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "şuraya yazılamadı: '%s'"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "'%s' dosyası kapatılıyor"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "'%s' dosyası yazılamıyor, %o kipi"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "%s yaması sorunsuzca uygulandı."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "iç hata"
 
-#: apply.c:4581
+#: apply.c:4583
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..."
 msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..."
 
-#: apply.c:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Parça #%d sorunsuzca uygulandı."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Parça %d geri çevrildi."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "'%s' yaması atlandı."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "tanımlanamayan girdi"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "Girdide geçerli yama yok (\"--allow-empty\" ile izin ver)"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "indeks dosyası okunamıyor"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "'%s' yaması açılamıyor: %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d boşluk hatası susturuldu"
 msgstr[1] "%d boşluk hatası susturuldu"
 
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d satır boşluk hatası ekliyor."
 msgstr[1] "%d satır boşluk hatası ekliyor."
 
-#: apply.c:4973
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
 msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
 
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "Yeni indeks dosyası yazılamıyor"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "verilen yol ile eÅŸleÅŸen deÄŸiÅŸiklikleri uygulama"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "verilen yol ile eÅŸleÅŸen deÄŸiÅŸiklikleri uygula"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "sayı"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "yamanın yaptığı eklemeleri yok say"
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver"
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "eklenen ve silinen satırların sayısını onluk birimde göster"
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver"
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak"
 
-#: apply.c:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "çalışma ağacına dokunmadan bir yama uygula"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "3 yönlü birleştirme dene, başarısız olursa normal yamaya geri çekil"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "yollar NUL karakteri ile ayrılır"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "en az <n> bağlam satırının eşleştiğinden emin ol"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "eylem"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "baÄŸlam bulurken boÅŸluk deÄŸiÅŸikliklerini yok say"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "yamayı tersten uygula"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "en az bir satır bağlam bekleme"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "üst üste binen parçalara izin ver"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "ayrıntı ver"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "parça üstbilgisindeki satır sayımına güvenme"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "kök"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "tüm dosya adlarının başına <kök> ekle"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "boş yamalar için hata döndürme"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1588,16 +1598,16 @@ msgstr "%s ikili nesnesi akıtılamıyor"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "'%s' süzgeci başlatılamıyor"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "açıklayıcı yeniden yönlendirilemiyor"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' süzgeci hata bildirdi"
@@ -1640,19 +1650,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <depo> [--exec <komut>] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr "%s okunamıyor"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
-msgstr "'%s' okunamadı"
+msgid "cannot read '%s'"
+msgstr "'%s' okunamıyor"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
@@ -1694,7 +1698,7 @@ msgstr "biçim"
 msgid "archive format"
 msgstr "arşiv biçimi"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "önek"
 
@@ -1704,9 +1708,9 @@ msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "dosya"
@@ -1736,7 +1740,7 @@ msgid "list supported archive formats"
 msgstr "desteklenen arşiv biçimlerini listele"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "depo"
 
@@ -1744,7 +1748,7 @@ msgstr "depo"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "arÅŸivi uzak konum deposu <depo>'dan al"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "komut"
@@ -1757,18 +1761,20 @@ msgstr "uzak konum komutu git-upload-archive'e olan yol"
 msgid "Unexpected option --remote"
 msgstr "Beklenmedik seçenek --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "'%s' seçeneği '%s' gerektiriyor"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Beklenmedik seçenek --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1876,7 +1882,7 @@ msgstr "bir %s revizyonu gerekiyor"
 msgid "could not create file '%s'"
 msgstr "'%s' dosyası oluşturulamadı"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "'%s' dosyası okunamadı"
@@ -1930,10 +1936,10 @@ msgstr ""
 "--reverse ve --first-parent birlikte en son iÅŸlemenin belirtilmesini "
 "gerektiriyor"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1956,105 +1962,93 @@ msgstr "şurada %s yolu bulunamadı: %s"
 msgid "cannot read blob %s for path %s"
 msgstr "%s ikili nesnesi %s yolunda okunamıyor"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
-"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"yeniden temellendirme istendiğinde birden çok başvurunun üst kaynak izleme "
+"yapılandırması miras alınamıyor"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "%s dalı kendi üst kaynağı olarak ayarlanamaz."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "'%s' dalı kendi üst kaynağı olarak ayarlanamaz"
 
-#: branch.c:93
+#: branch.c:144
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgid "branch '%s' set up to track '%s' by rebasing."
 msgstr ""
-"'%s' dalı '%s' uzak dalını yeniden temellendirme ile %s konumundan izlemek "
-"üzere ayarlandı."
+"'%s' dalı '%s' ögesini yeniden temellendirme ile izlemek üzere ayarlandı."
 
-#: branch.c:94
+#: branch.c:145
 #, c-format
-msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
-msgstr "'%s' dalı '%s' uzak dalını %s konumundan izlemek üzere ayarlandı."
+msgid "branch '%s' set up to track '%s'."
+msgstr "'%s' dalı '%s' ögesini izlemek üzere ayarlandı."
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr ""
-"'%s' dalı '%s' yerel dalını yeniden temellendirme ile izlemek üzere ayarlandı"
+msgid "branch '%s' set up to track:"
+msgstr "'%s' dalı şunu izlemek üzere ayarlandı:"
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "'%s' dalı '%s' yerel dalını izlemek üzere ayarlandı."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "üstkaynak dal yapılandırması yazılamıyor"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
-"'%s' dalı '%s' uzak başvurusunu yeniden temellendirme ile izlemek üzere "
-"ayarlandı."
+"\n"
+"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n"
+"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:"
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "'%s' dalı '%s' uzak başvurusunu izlemek üzere ayarlandı."
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"'%s' konumundan izleme miras istendi; ancak bir uzak konum ayarlanmamış"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
-"'%s' dalı '%s' yerel başvurusunu yeniden temellendirme ile izlemek üzere "
-"ayarlandı."
+"'%s' konumundan izleme miras istendi; ancak bir birleştirme yapılandırması "
+"ayarlanmamış"
 
-#: branch.c:110
+#: branch.c:252
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "'%s' dalı '%s' yerel başvurusunu izlemek üzere ayarlandı."
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Üstkaynak dal yapılandırması yazılamıyor"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "izlenmiyor: %s başvurusu için belirsiz bilgi"
 
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "İzlenmiyor: %s başvurusu için belirsiz bilgi"
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' geçerli bir dal adı değil"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' geçerli bir dal adı değil."
+msgid "a branch named '%s' already exists"
+msgstr "'%s' adında bir dal halihazırda var"
 
-#: branch.c:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "'%s' adında bir dal halihazırda var."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "'%s' dalı zorla güncellenemiyor, '%s' konumunda çıkış yapılmış"
 
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Geçerli dal zorla güncellenemiyor."
-
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "İzleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil."
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "izleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "istenen üstkaynak dalı '%s' mevcut değil"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2074,27 +2068,28 @@ msgstr ""
 "tasarlıyorsanız itme sırasında üstkaynak yapılandırmasını\n"
 "da ayarlamak için \"git push -u\" kullanmak isteyebilirsiniz."
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Geçerli bir nesne adı değil: '%s'."
+msgid "not a valid object name: '%s'"
+msgstr "geçerli bir nesne adı değil: '%s'"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Belirsiz nesne adı: '%s'."
+msgid "ambiguous object name: '%s'"
+msgstr "belirsiz nesne adı: '%s'"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Geçerli bir dal noktası değil: '%s'."
+msgid "not a valid branch point: '%s'"
+msgstr "geçerli bir dal noktası değil: '%s'"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "%s çalışma ağacının HEAD'i güncellenmemiş"
@@ -2119,7 +2114,7 @@ msgstr "'%s' bir v2 veya v3 demet dosyası gibi görünmüyor"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2178,7 +2173,7 @@ msgstr "desteklenmeyen demet sürümü %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "demet sürümü %d, %s algoritması ile yazılamıyor"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "tanımlanamayan argüman: %s"
@@ -2215,7 +2210,7 @@ msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "geçersiz renk değeri: %.*s"
@@ -2265,190 +2260,190 @@ msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil"
 msgid "unable to find all commit-graph files"
 msgstr "tüm commit-graph dosyaları bulunamıyor"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "geçersiz işleme konumu. commit-graph büyük olasılıkla hasar görmüş."
+msgstr "geçersiz işleme konumu, commit-graph büyük olasılıkla hasar görmüş"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "%s işlemesi bulunamadı"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "%s işlemesi ayrıştırılamıyor"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "%s nesnesinin türü alınamıyor"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "Ä°ÅŸleme grafiÄŸindeki iÅŸleme imleri temizleniyor"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr ""
 "Geçerli işlemelerdeki değiştirilmiş yollar için Bloom süzgeci hesaplanıyor"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "Başvurulmuş işlemeler toplanıyor"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "%d pakette işleme grafiği için işlemeler bulunuyor"
 msgstr[1] "%d pakette işleme grafiği için işlemeler bulunuyor"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "%s paketi eklenirken hata"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "%s için indeks açılırken hata"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Paketlenmiş nesneler arasından işleme grafiği için işlemeler bulunuyor"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "temel grafiği numaralarının doğru sayısı yazılamadı"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "%s öncü dizinleri oluşturulamıyor"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "geçici grafik katmanı oluşturulamıyor"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "İşleme grafiği %d geçişte yazılıyor"
 msgstr[1] "İşleme grafiği %d geçişte yazılıyor"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "commit-graph zincir dosyası açılamıyor"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "Birleştirilen işlemeler taranıyor"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "commit-graph birleÅŸtiriliyor"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "grafik yazımı için çok fazla işleme"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar "
 "görmüş"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "%s işlemesi commit-graph'tan ayrıştırılamadı"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "%s işlemesi commit-graph için olan nesne veritabanından ayrıştırılamadı"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "commit-graph'teki %s işlemesi için olan kök ağaç nesne tanımlayıcısı %s != %s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "%s işlemesi için olan commit-graph üst öge listesi çok uzun"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s için olan commit-graph üst ögesi %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "%s işlemesi için olan commit-graph üst öge listesi erkenden sonlanıyor"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2456,7 +2451,7 @@ msgstr ""
 "%s işlemesi için commit-graph kuşak sayısı sıfır; ancak başka yerlerde "
 "sıfırdan farklı"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2464,19 +2459,19 @@ msgstr ""
 "%s işlemesi için commit-graph kuşak sayısı sıfırdan farklı; ancak başka "
 "yerlerde sıfır"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "%s işlemesi için commit-graph içindeki işleme tarihi %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "%s ayrıştırılamadı"
@@ -2506,28 +2501,28 @@ msgstr ""
 "\"git config advice.graftFileDeprecated false\"\n"
 "kullanarak bu iletiyi kapatabilirsiniz."
 
-#: commit.c:1239
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr ""
 "%s işlemesinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "%s işlemesinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "%s işlemesinin bir GPG imzası yok."
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "%s işlemesinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2595,7 +2590,7 @@ msgstr "anahtar, bir bölüm içermiyor: %s"
 msgid "key does not contain variable name: %s"
 msgstr "anahtar, bir değişken adı içermiyor: %s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "geçersiz anahtar: %s"
@@ -2754,144 +2749,144 @@ msgstr "core.commentChar yalnızca bir karakter olmalı"
 msgid "invalid mode for object creation: %s"
 msgstr "nesne oluşturma için geçersiz kip: %s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s için hatalı oluşturulmuş değer"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s için hatalı oluşturulmuş değer: %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "hatalı paket sıkıştırma düzeyi %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "'%s' baÅŸvurusu ikili bir nesneye iÅŸaret etmiyor"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "%s ayrıştırılamadı"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "komut satırı yapılandırması ayrıştırılamıyor"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Geçersiz %s: '%s'"
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor"
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda"
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "geçersiz bölüm adı '%s'"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s birden çok değere iye"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "yeni yapılandırma dosyası %s yazılamadı"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "%s yapılandırma dosyası kilitlenemedi"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "%s açılıyor"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "geçersiz dizgi: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "geçersiz yapılandırma dosyası %s"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "%s üzerinde fstat başarısız oldu"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "'%s'%s mmap yapılamıyor"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "%s üzerinde chmod başarısız oldu"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "%s yapılandırma dosyası yazılamadı"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "'%s', '%s' olarak ayarlanamadı"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "'%s' ayarı kapatılamadı"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "geçersiz bölüm adı: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "'%s' için değer eksik"
@@ -2983,7 +2978,7 @@ msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
 #: connect.c:761 connect.c:824
 #, c-format
 msgid "Looking up %s ... "
-msgstr "%s adresi aranıyor..."
+msgstr "%s adresi aranıyor ... "
 
 #: connect.c:765
 #, c-format
@@ -2998,7 +2993,7 @@ msgid ""
 "Connecting to %s (port %s) ... "
 msgstr ""
 "bitti.\n"
-"%s adresine bağlanılıyor (kapı %s)..."
+"%s adresine bağlanılıyor (kapı %s) ... "
 
 #: connect.c:791 connect.c:868
 #, c-format
@@ -3068,7 +3063,7 @@ msgstr "garip yol adı '%s' engellendi"
 msgid "unable to fork"
 msgstr "çatallanamıyor"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "Bağlantı denetleniyor"
 
@@ -3370,17 +3365,17 @@ msgstr ""
 "Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak "
 "için --no-index kullanın."
 
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  dirstat kesim yüzdesi '%s' ayrıştırılamadı\n"
 
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Bilinmeyen dirstat parametresi '%s'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3388,7 +3383,7 @@ msgstr ""
 "\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
 "'plain' seçeneklerinden biri olmalıdır"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3397,7 +3392,7 @@ msgstr ""
 "bilinmeyen color-moved-ws kipi '%s', olabilecek deÄŸerler: 'ignore-space-"
 "change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3405,12 +3400,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change diÄŸer boÅŸluk kipleri ile birlikte "
 "kullanılamaz"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3419,50 +3414,52 @@ msgstr ""
 "'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "dış diff sonlandı, %s konumunda durdu"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G, -S ve --find-object birlikte kullanılmaz"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "'%s', '%s' ve '%s' seçenekleri birlikte kullanılamaz"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
 msgstr ""
-"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile "
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ile "
 "kullanın"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
-"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve -"
-"S ile kullanın"
+"'%s' ve '%s' seçenekleri birlikte kullanılamaz, '%s' seçeneğini '%s' ve '%s' "
+"ile kullanın"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "geçersiz --stat değeri: %s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s bir sayısal değer bekliyor"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3471,42 +3468,42 @@ msgstr ""
 "--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ÅŸundan sonra bilinmeyen deÄŸer: ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "'%s' çözülemiyor"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s <n>/<m> biçimi bekliyor"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s bir karakter bekliyor, '%s' aldı"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "hatalı --color-moved argümanı: %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws içinde geçersiz kip '%s'"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3514,162 +3511,162 @@ msgstr ""
 "diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
 "\"patience\" ve \"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s için geçersiz argüman"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "hatalı --word-diff argümanı: %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Diff çıktısı biçimlendirme seçenekleri"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "yama oluÅŸtur"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "diff çıktısını gizle"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "diff'leri <n> satır bağlamlı oluştur"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "diff'i ham biçimde oluştur"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "'-p --raw eşanlamlısı"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "'-p --stat eşanlamlısı"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "makinede okunabilen --stat"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "--stat'ın yalnızca son satırını çıktı ver"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "--dirstat=cumulative eşanlamlısı"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "--dirstat=files,param1,param2... eşanlamlısı"
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "yalnızca değiştirilen dosyaların adlarını göster"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "diffstat oluÅŸtur"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<geniÅŸlik>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<sayım>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "diffstat'ı kısıtlı satırlarla oluştur"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "diffstat içinde ufak özet oluştur"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "uygulanabilir bir ikili diff çıktısı ver"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "renkli diff göster"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<çeşit>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 "diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3677,88 +3674,88 @@ msgstr ""
 "--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
 "sonlandırıcıları olarak NUL'ları kullan"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<önek>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "çıktının her satırının başına ek bir önek ekle"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "hiçbir kaynak ve hedef önekini gösterme"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<karakter>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Diff yeniden adlandırma seçenekleri"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "yeniden adlandırmaları algıla"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "silmeler için öngörüntüyü atla"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "kopyaları algıla"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "yeniden adlandırma algılamasını devre dışı bırak"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3766,234 +3763,234 @@ msgstr ""
 "eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
 "yeniden adlandırma/kopyalama algılamasını önle"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Diff algoritma seçenekleri"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "olabilecek en küçük diff'i üret"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "satırları karşılaştırırken boşlukları yok say"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "boşluk sayısındaki değişiklikleri yok say"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "satır sonundaki boşluk değişikliklerini yok say"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "satır sonundaki satırbaşı karakterini yok say"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "satırlarının tümü boş olan değişiklikleri yok say"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<ifade>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<algoritma>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "bir diff algoritması seç"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<metin>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<kip>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak "
 "göster"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "ÅŸuna eÅŸdeÄŸer: --word-diff=color --word-diff-regex=<ifade>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "taşınan kod satırları farklı renklendirilir"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Diğer diff seçenekleri"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve "
 "göreceli yolları göster"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "tüm dosyaları metin olarak varsay"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "iki girdiyi değiştir, diff'i tersine döndür"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "tüm program çıktısını devre dışı bırak"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<ne-zaman>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<biçim>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "indeksten 'git add -N' girdilerini gizle"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<dizi>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<yol>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "öncelikle belirtilen yoldaki değişikliği göster"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "belirtilen yola olan çıktıyı atla"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<nesne-no>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "dosyaları diff türüne göre seç"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<dosya>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "belirli bir dosyaya çıktı ver"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr ""
 "Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından "
 "dolayı atlandı."
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar "
 "bulundu."
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -4035,29 +4032,29 @@ msgstr "tanımlanamayan negatif dizgi: '%s'"
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "'%s' dizini açılamadı"
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "çekirdek adı ve bilgisi alınamadı"
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4065,36 +4062,36 @@ msgstr ""
 "Bir dizin adı tahmin edilemedi.\n"
 "Lütfen komut satırında bir dizin belirtin."
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "%s deposundaki indeks dosyası hasarlı"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "%s için dizinler oluşturulamadı"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "İçerik süzülüyor"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "'%s' dosyasının bilgileri alınamadı"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "hatalı git ad alanı yolu \"%s\""
@@ -4104,272 +4101,268 @@ msgstr "hatalı git ad alanı yolu \"%s\""
 msgid "too many args to run %s"
 msgstr "%s çalıştırmak için çok fazla argüman"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: sığ bir liste bekleniyordu"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "uzak konuma yazılamıyor"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "geçersiz sığ satır: %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "geçersiz sığ olmayan satır: %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "nesne bulunamadı: %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "nesne içinde hata: %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "sığ bulunamadı: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s alındı"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "geçersiz işleme %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "vazgeçiliyor"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "bitti"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s alındı"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "%s tamam olarak imleniyor"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s halihazırda var (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "protokol hatası: hatalı paket üstbilgisi"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: %s ayrı çatallanamıyor"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: geçersiz index-pack çıktısı"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s başarısız oldu"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "yanbant çoğullama çözücüsünde hata"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Sunucu sürümü %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Sunucu %s destekliyor"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Sunucu sığ istemcileri desteklemiyor"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Sunucu --shallow-since desteklemiyor"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Sunucu --shallow-exclude desteklemiyor"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Sunucu --deepen desteklemiyor"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "ortak iÅŸleme yok"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
-msgstr "kaynak depo sığ, klonlama için reddet"
+msgstr "kaynak depo sığ, klonlama için reddet."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: getirme başarısız"
+msgstr "git fetch-pack: Getirme başarısız."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
-msgstr "eÅŸleÅŸmeyen algoritmalar: istemci %s; sunucu %s"
+msgstr "eÅŸleÅŸmeyen algoritmalar: Ä°stemci %s; sunucu %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "sunucu '%s' algoritmasını desteklemiyor"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Sunucu sığ istekleri desteklemiyor"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Sunucu süzgeç destekliyor"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "uzak konuma istek yazılamıyor"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "bölüm üstbilgisi '%s' okunurken hata"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' bekleniyordu, '%s' alındı"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "beklenmedik alındı satırı: '%s'"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "alındılar işlenirken hata: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "'ready' \"yok\" iken başka hiçbir bölümün gönderilmemesi gerekiyordu"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "sığ bilgi işlenirken hata: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref bekleniyordu, '%s' alındı"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "beklenmedik wanted-ref: '%s'"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "aranan baÅŸvurular iÅŸlenirken hata: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "eÅŸleÅŸen uzak dal ucu yok"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "uzak konum gereken tüm nesneleri göndermedi"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "uzak konumdan beklenmedik 'ready'"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "böyle bir uzak başvuru yok: %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "geçici dosya oluşturulamadı"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "şuna ayrık imza yazılamadı: '%s'"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4377,7 +4370,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile'ın ssh imza doğrulaması için yapılandırılması ve "
 "var olması gerekiyor"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4385,59 +4378,59 @@ msgstr ""
 "ssh-keygen -Y find-principals/verify, ssh imza doğrulaması için gerekli "
 "(openssh 8.21p1+ sürümünde mevcut)"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "ssh imza geri alım dosyası yapılandırıldı; ancak bulunamadı: %s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "hatalı/uyumsuz imza '%s'"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "'%s' anahtarı için ssh parmak izi alınamadı"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 "ya user.signingkey ya da gpg.ssh.defaultKeyCommand'in yapılandırılması "
 "gerekiyor"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
 "gpg.ssh.defaultKeyCommand başarılı oldu; ancak herhangi bir anahtar "
 "döndürmedi: %s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand başarısız oldu: %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg veriyi imzalayamadı"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "user.signingkey'in ssh imzalaması için ayarlanması gerekiyor"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "ssh imzalama anahtarı '%s' konumuna yazılamadı"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "ssh imzalama anahtarı arabelleği '%s' konumuna yazılamadı"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4445,7 +4438,7 @@ msgstr ""
 "ssh-keygen -Y imzası, ssh imzalaması için gerekli (openssh 8.21p1+ sürümünde "
 "mevcut)"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
@@ -4455,7 +4448,7 @@ msgstr "ssh imzalama verisi arabelleği '%s' konumundan okunamadı"
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4463,18 +4456,18 @@ msgstr ""
 "verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
 "PCRE v2 altında -P ile desteklenir"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': %s okunamıyor"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "'%s' dosyasının bilgileri alınamadı"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': kısa okuma"
@@ -4597,8 +4590,8 @@ msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor."
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Bunun yerine '%s' çalıştır? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Bunun yerine '%s' çalıştırılsın mı? (y/N)? "
 
 #: help.c:654
 #, c-format
@@ -4823,7 +4816,7 @@ msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
 msgid "quoted CRLF detected"
 msgstr "alıntılanmış CRLF algılandı"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "hatalı eylem '%s', '%s' için"
@@ -5059,7 +5052,7 @@ msgstr "altmodül"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -5068,7 +5061,7 @@ msgstr ""
 "ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s "
 "sürümü (şunun: %s) ağaçta bırakıldı."
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5080,7 +5073,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s"
@@ -5095,7 +5088,7 @@ msgstr ""
 "yazılacak:\n"
 "\t%s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "Tümü güncel."
 
@@ -5381,7 +5374,7 @@ msgstr "birleştirme herhangi bir işleme döndürmedi"
 msgid "Could not parse object '%s'"
 msgstr "'%s' nesnesi ayrıştırılamadı"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "İndeks yazılamıyor."
@@ -5390,8 +5383,8 @@ msgstr "İndeks yazılamıyor."
 msgid "failed to read the cache"
 msgstr "önbellek okunamadı"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "yeni indeks dosyası yazılamıyor"
@@ -5400,211 +5393,211 @@ msgstr "yeni indeks dosyası yazılamıyor"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-index dosyası %s pek küçük"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index sürümü %d tanımlanamıyor"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "multi-pack-index sağlama sürümü %u, %u sürümü ile eşleşmiyor"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "hatalı pack-int-id: %u (%u toplam paket)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "paket dosyası '%s' eklenemedi"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "pack-index '%s' açılamadı"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "%d nesnesi paket dosyasında bulunamadı"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "ters indeks dosyası depolanamıyor"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "satır ayrıştırılamadı: %s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "hatalı oluşturulmuş satır: %s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "paket yüklenemedi"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "%s için indeks açılamadı"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "bilinmeyen tercih edilen paket: '%s'"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "yeğlenen paket %s nesnesiz seçilemiyor"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "bırakılacak pack-file %s görülmedi"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "tercih edilen '%s' paketinin süresi geçmiş"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "indekslenecek paket dosyası yok."
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "çoklu paket biteşlem yazılamadı"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "multi-pack-index yazılamadı"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "%s kaldırılamadı"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "multi-pack-index %s konumunda temizlenemedi"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "yanlış sağlama toplamı"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "Başvurulmuş paket dosyaları aranıyor"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx bir oid içermiyor"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "Nesneler paket dosyasına göre sıralanıyor"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "Nesne ofsetleri doğrulanıyor"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "paket dosyası %s için pack-index yüklenemedi"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "Başvurulmuş nesneler sayılıyor"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "pack-objects başlatılamadı"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "pack-objects bitirilemedi"
 
@@ -5663,258 +5656,258 @@ msgstr "%s içindeki notları yeniden yazma reddediliyor (refs/notes/ dışında
 msgid "Bad %s value: '%s'"
 msgstr "Hatalı %s değeri: '%s'"
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "nesne dizini olağanlaştırılamıyor: %s"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "alternatifler dosyası okunamıyor"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "yeni alternatifler dosyası yerine taşınamıyor"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "'%s' diye bir yol yok"
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor."
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "BaÅŸvuru deposu '%s' yerel bir depo deÄŸil."
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "başvuru deposu '%s' sığ"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "başvuru deposu '%s' aşılı"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap başarısız%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "nesne dosyası %s boş"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "hasar görmüş gevşek nesne '%s'"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "gevşek nesne '%s' sonunda anlamsız veri"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "%s üstbilgisi ayrıştırılamıyor"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "geçersiz nesne türü"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "%s üstbilgisi açılamıyor"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "%s nesnesi okunamadı"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "%s yedeği %s için bulunamadı"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "%s dosyası yazılamıyor"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "'%s' ögesine izin ayarlanamıyor"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "dosya yazım hatası"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "gevşek nesne dosyası kapatılırken hata"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "geçici dosya oluşturulamıyor"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "gevşek nesne dosyası yazılamıyor"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "yeni nesne %s söndürülemiyor (%d)"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "%s üzerinde utime() başarısız"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "%s için nesne okunamıyor"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "hasar görmüş işleme"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "hasar görmüş etiket"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "%s indekslenirken okuma hatası"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "%s indekslenirken kısa read"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: veritabanına ekleme başarısız"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: desteklenmeyen dosya türü"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s geçerli bir nesne değil"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s geçerli bir '%s' nesnesi değil"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "%s açılamıyor"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "%s mmap yapılamadı"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "%s üstbilgisi açılamıyor"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "%s üstbilgisi ayrıştırılamıyor"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "%s içeriği açılamıyor"
@@ -6042,25 +6035,25 @@ msgstr "nesne ayrıştırılamıyor: %s"
 msgid "hash mismatch %s"
 msgstr "sağlama uyuşmazlığı %s"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "çoklu paket biteşlemi gereken ters indeksi içermiyor"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index: paket açılamadı"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "%s boyutu alınamıyor"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "%s, %s paketi %<PRIuMAX> ofsetinde bulunamadı"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "%s ögesinin disk kullanımı alınamıyor"
@@ -6109,45 +6102,50 @@ msgstr "%s, yazılabilir yapılamadı"
 msgid "could not write '%s' promisor file"
 msgstr "vaat dosyası '%s' yazılamadı"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "paket dosyası %s eşlemlenemiyor%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)"
 
-#: packfile.c:1927
+#: packfile.c:1928
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)"
 
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "'%s' seçeneği sayısal bir değer bekliyor"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor"
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "hatalı oluşturulmuş nesne adı '%s'"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "'%s' seçeneği \"%s\" veya \"%s\" bekliyor"
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6183,36 +6181,36 @@ msgstr "%s negatif olmayan bir tamsayı bekliyor, isteğe bağlı k/m/g eki ile"
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "ÅŸunu mu demek istediniz: '--%s' (iki tire ile)?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "şunun arması: --%s"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "bilinmeyen seçenek '%s'"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "bilinmeyen anahtar '%c'"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "kullanım: %s"
@@ -6220,7 +6218,7 @@ msgstr "kullanım: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "    veya: %s"
@@ -6244,17 +6242,17 @@ msgstr "    veya: %s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-SAYI"
 
@@ -6382,17 +6380,17 @@ msgstr "okuma hatası"
 msgid "the remote end hung up unexpectedly"
 msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "protokol hatası: hatalı satır uzunluğu %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "uzak konum hatası: %s"
@@ -6443,7 +6441,7 @@ msgstr "'log' başlatılamadı"
 msgid "could not read `log` output"
 msgstr "'log' çıktısı okunamadı"
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "'%s' işlemesi ayrıştırılamadı"
@@ -6465,60 +6463,56 @@ msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
 msgid "failed to generate diff"
 msgstr "diff oluşturulamadı"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only ve --right-only birlikte kullanılmaz"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "'%s' günlüğü ayrıştırılamadı"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "'%s' dosyası indekslenemiyor"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "'%s' indekse eklenemiyor"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "'%s' dosyasının bilgileri alınamıyor"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Ä°ndeks yenileniyor"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6527,7 +6521,7 @@ msgstr ""
 "index.version ayarlanmış; ancak değer geçersiz.\n"
 "%i sürümü kullanılıyor"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6536,143 +6530,143 @@ msgstr ""
 "GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
 "%i sürümü kullanılıyor"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "hatalı imza 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "hatalı indeks sürümü %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "hatalı indeks dosyası sha1 imzası"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor"
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "%.4s uzantısı yok sayılıyor"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "indekste sırasız hazırlama alanı girdileri"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' için sırasız hazırlama alanı girdileri"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "indeks dosyası hasar görmüş"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: indeks dosyası açılamadı"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: açık indeksin bilgileri alınamıyor"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: indeks dosyası beklenenden daha küçük"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s: indeks dosyası eşlemlenemiyor%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "paylaşılan indeks '%s' tazelenemedi"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "'%s' kapatılamadı"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "bir sparse-index'e dönüştürülemedi"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "'%s' bilgileri alınamadı"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "git dizini açılamıyor: %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "bağlantı kesilemiyor: %s"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
@@ -6791,8 +6785,8 @@ msgstr ""
 "Ancak tümünü kaldırırsanız yeniden temellendirme iptal edilecektir.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6834,7 +6828,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s: 'preserve'in yerini 'merges' aldı"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "gitti"
 
@@ -6873,7 +6867,8 @@ msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "tanımlanamayan %%(%s) argümanı: %s"
@@ -6883,11 +6878,6 @@ msgstr "tanımlanamayan %%(%s) argümanı: %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) argüman almıyor"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6898,11 +6888,6 @@ msgstr "%%(deltabase) argüman almıyor"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) argüman almıyor"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tanımlanamayan %%(subject) argümanı: %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6918,26 +6903,11 @@ msgstr "bilinmeyen %%(trailers) argümanı: %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "pozitif deÄŸer ÅŸunu bekliyordu: contents:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "tanımlanamayan %%(contents) argümanı: %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "tanımlanamayan %%(raw) argüman: %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "pozitif deÄŸer ÅŸurada '%s' bekliyordu: %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6958,21 +6928,11 @@ msgstr "tanımlanamayan konum:%s"
 msgid "unrecognized width:%s"
 msgstr "tanımlanamayan genişlik:%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "tanımlanamayan %%(align) argümanı: %s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "tanımlanamayan %%(if) argümanı: %s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6995,15 +6955,10 @@ msgid ""
 msgstr ""
 "bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor"
 
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "biçim: %%(%s) ögeciği bir %%(%s) ögeciği olmadan kullanıldı"
 
 #: ref-filter.c:912
 #, c-format
@@ -7015,16 +6970,6 @@ msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7099,22 +7044,22 @@ msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
 msgid "ignoring ref with broken name %s"
 msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "bozuk başvuru %s yok sayılıyor"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "biçim: %%(end) ögeciği eksik"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "hatalı oluşturulmuş nesne adı %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "'%s' bir iÅŸlemeye iÅŸaret etmeli"
@@ -7159,72 +7104,72 @@ msgstr "'%s' alınamadı"
 msgid "invalid branch name: %s = %s"
 msgstr "geçersiz dal adı: %s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "sarkan sembolik başvuru %s yok sayılıyor"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "%s başvurusu için olan günlükte %s sonrasında boşluk var"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 "%s başvurusu için olan günlük %s konumunda beklenmedik bir biçimde sonlandı"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s için olan günlük boş"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' mevcut; '%s' oluşturulamıyor"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "'%s' ve '%s' aynı anda işlenemiyor"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "%s başvurusu kaldırılamadı"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "%s baÅŸvurusu silinemedi: %s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "baÅŸvurular silinemedi: %s"
@@ -7234,50 +7179,50 @@ msgstr "baÅŸvurular silinemedi: %s"
 msgid "invalid refspec '%s'"
 msgstr "geçersiz başvuru belirteci '%s'"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
 
-#: remote.c:590
+#: remote.c:699
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Hem %s hem %s ÅŸuraya getirilemiyor: %s"
 
-#: remote.c:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s genelde %s ögesini izler, %s değil"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s hem %s hem %s ögelerini izler"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "dizginin '%s' anahtarında '*' yoktu"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "dizginin '%s' deÄŸerinde '*' yok"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
@@ -7286,7 +7231,7 @@ msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7310,7 +7255,7 @@ msgstr ""
 "Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
 "nitelendirmelisiniz."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7321,7 +7266,7 @@ msgstr ""
 "'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
 "oluÅŸturmak istediniz?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7332,7 +7277,7 @@ msgstr ""
 "'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
 "oluÅŸturmak istediniz?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7343,7 +7288,7 @@ msgstr ""
 "'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
 "etiketlemek istediniz?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7354,114 +7299,114 @@ msgstr ""
 "'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
 "etiketlemek istediniz?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s dala çözülemiyor"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "'%s' silinemiyor: uzak baÅŸvuru yok"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "hedef başvurusu %s birden çok kaynaktan alıyor"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD bir dala iÅŸaret etmiyor"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "böyle bir dal yok: '%s'"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "üstkaynak dalı '%s' bir uzak izleme dalı olarak depolanmıyor"
 
-#: remote.c:1757
+#: remote.c:1867
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalı yok"
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "'%s' dalının itme için uzak konumu yok"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "'%s' için olan başvuru belirteçleri '%s' içermiyor"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "itilecek bir hedef yok (push.default: 'nothing')"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "tek bir konuma 'simple' itme çözülemiyor"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "%s uzak başvurusu bulunamadı"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Dalınız '%s' temelli; ancak üstkaynak kaybolmuş.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Dalınız '%s' ile güncel.\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Sizin dalınız ve '%s' başka işlemelere başvuruyor.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (ayrıntılar için \"%s\" kullanın)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, 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] "Dalınız '%s' dalından %d işleme ileride.\n"
 msgstr[1] "Dalınız '%s' dalından %d işleme ileride.\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7469,11 +7414,11 @@ msgid_plural ""
 msgstr[0] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
 msgstr[1] "Dalınız '%s' dalından %d işleme geride ve ileri sarılabilir.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (yerel dalınızı güncellemek için \"git pull\" kullanın)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7488,11 +7433,11 @@ msgstr[1] ""
 "Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
 "her birinde %d ve %d iÅŸleme var.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
@@ -7525,7 +7470,7 @@ msgstr "rerere kaydı yazılamıyor"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "'%s' yazılırken hatalar vardı (%s)"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "'%s' floş yapılamadı"
@@ -7548,7 +7493,7 @@ msgstr "'%s' yazılamadı"
 #: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
-msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı"
+msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı."
 
 #: rerere.c:737
 #, c-format
@@ -7570,8 +7515,8 @@ msgstr "'%s' başıboşunun bağlantısı kesilemiyor"
 msgid "Recorded preimage for '%s'"
 msgstr "'%s' için öngörüntü kaydedildi"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "'%s' dizini oluşturulamadı"
@@ -7609,37 +7554,29 @@ msgstr "rr-cache dizini açılamıyor"
 msgid "could not determine HEAD revision"
 msgstr "HEAD revizyonu saptanamadı"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "%s ögesinin ağacı bulunamadı"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input, --no-walk ile uyumsuz"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk, --unsorted-input ile uyumsuz"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "geçerli dalınız bozuk gibi görünüyor"
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok"
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "async iş parçacığı oluşturulamadı: %s"
@@ -7704,8 +7641,8 @@ msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
 msgid "could not delete '%s'"
 msgstr "'%s' silinemedi"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "'%s' kaldırılamadı"
@@ -7767,13 +7704,13 @@ msgstr ""
 "atlayabilirsiniz. İptal edip \"git revert\" öncesine\n"
 "geri dönmek için \"git revert --abort\" çalıştırın."
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "'%s' kilitlenemedi"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "şuraya yazılamadı: '%s'"
@@ -7783,12 +7720,18 @@ msgstr "şuraya yazılamadı: '%s'"
 msgid "could not write eol to '%s'"
 msgstr "satır sonu şuraya yazılamadı: '%s'"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "'%s' tamamlanamadı"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "'%s' okunamadı"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7803,7 +7746,7 @@ msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
 msgid "%s: fast-forward"
 msgstr "%s: ileri sar"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Geçersiz temizlik kipi %s"
@@ -7834,8 +7777,8 @@ msgstr "'%.*s' içinde bir anahtar yok"
 msgid "unable to dequote value of '%s'"
 msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "'%s' okuma için açılamadı"
@@ -7899,11 +7842,11 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' başarısız oldu"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7929,7 +7872,7 @@ msgstr ""
 "\n"
 "\tgit commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7953,348 +7896,349 @@ msgstr ""
 "\n"
 "\tgit commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "yeni yapılan işleme aranamadı"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "yeni yapılan işleme ayrıştırılamadı"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "ayrık HEAD"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (kök işleme)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "HEAD ayrıştırılamadı"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s bir iÅŸleme deÄŸil"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "HEAD işlemesi ayrıştırılamadı"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "işleme yazarı ayrıştırılamıyor"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree bir ağaca yazamadı"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "'%s' konumundan işleme iletisi okunamıyor"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "geçersiz yazar kimliği '%s'"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "hasar görmüş yazar: tarih bilgisi eksik"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "işleme nesnesi yazılamadı"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "%s güncellenemedi"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "%s işlemesi ayrıştırılamadı"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "üst işleme %s ayrıştırılamadı"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "bilinmeyen komut: %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "Birinci iÅŸleme iletisi bu:"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Ä°ÅŸleme iletisi #%d bu:"
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Birinci iÅŸlemenin iletisi atlanacak:"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Ä°ÅŸleme iletisi #%d atlanacak:"
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Bu %d iÅŸlemenin bir birleÅŸimi."
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "'%s' yazılamıyor"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "düzeltmek için bir HEAD gerekiyor"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "HEAD okunamadı"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "HEAD'in işleme iletisi okunamadı"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "%s işleme iletisi okunamadı"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "indeks dosyanız birleştirilmemiş"
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "kök işleme düzeltilemiyor"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "%s işlemesi bir birleştirme; ancak bir -m seçeneği verilmedi."
 
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "%s işlemesinin %d diye bir üst ögesi yok"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "%s işlemesinin iletisi alınamıyor"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: üst işleme %s ayrıştırılamıyor"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "%s geri alınamadı... %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "%s uygulanamadı... %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "%s %s bırakılıyor -- yama içeriği halihazırda üstkaynakta\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: indeks okunamadı"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: indeks yenilenemedi"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s argüman kabul etmiyor: '%s'"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "%s için eksik argüman"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "'%s' ayrıştırılamadı"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "geçersiz satır %d: %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "'%s' okunamadı."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "sürmekte olan bir seç-al iptal ediliyor"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "sürmekte olan bir geri al iptal ediliyor"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "Hiçbir işleme ayrıştırılmadı."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "bir geri al sırasında seç-al yapılamıyor"
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "bir seç-al sırasında geri al yapılamıyor"
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s için geçersiz değer: %s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "kullanılabilir olmayan squash-onto"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "boş işleme seti aktarıldı"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "geri al halihazırda sürüyor"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "seç-al halihazırda sürüyor"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "HEAD kilitlenemedi"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "süren bir seç-al veya geri al yok"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "HEAD çözülemiyor"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr "daha doğmamış bir daldan iptal edilemiyor"
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "'%s' açılamıyor"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "'%s' okunamıyor: %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "beklenmedik dosya sonu"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş"
 
-#: sequencer.c:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "HEAD'i taşımış görünüyorsunuz. Geri sarılmıyor, HEAD'inizi denetleyin!"
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "süren bir geri al yok"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "süren bir seç-al yok"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "işleme atlanamadı"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "atlanacak bir ÅŸey yok"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8303,16 +8247,16 @@ msgstr ""
 "İşlemeyi yaptınız mı?\n"
 "\"git %s --continue\" deneyin.\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "HEAD okunamıyor"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "'%s', '%s' konumuna kopyalanamıyor"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8331,27 +8275,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "%s uygulanamıyor... %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "%.*s birleÅŸtirilemedi"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "'%s', '%s' konumuna kopyalanamadı"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "Çalıştırılıyor: %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8366,11 +8310,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yapıldı\n"
 
-#: sequencer.c:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8387,90 +8331,90 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "izin verilmeyen etiket adı: '%.*s'"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "sahte kök işlemesi yazılıyor"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "squash-onto yazılıyor"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "'%s' çözülemedi"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "güncel bir revizyon olmadan birleştirilemiyor"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "'%.*s' ayrıştırılamıyor"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "birleÅŸtirilecek bir ÅŸey yok: '%.*s'"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "'%s' işlemesinin işleme iletisi alınamadı"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "merge: Yeni indeks dosyası yazılamıyor"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Kendiliğinden zulalanamıyor"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Beklenmedik zula yanıtı: '%s'"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "'%s' için dizin oluşturulamadı"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "Zula kendiliÄŸinden oluÅŸturuldu: %s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "'reset --hard' yapılamadı"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Kendiliğinden zulalama uygulandı.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "%s depolanamıyor"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8481,29 +8425,29 @@ msgstr ""
 "Değişiklikleriniz zulada güvende.\n"
 "Ä°stediÄŸiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "KendiliÄŸinden zulalama mevcut; yeni bir zula girdisi oluÅŸturuluyor."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "HEAD ayrılamadı"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "HEAD'de duruldu\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "%s konumunda duruldu\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8524,58 +8468,58 @@ msgstr ""
 "\tgit rebase --edit-todo\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "%s konumunda durdu... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "bilinmeyen komut %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "orig-head okunamadı"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "'onto' okunamadı"
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "HEAD şu konuma güncellenemedi: %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "var olmayan iÅŸleme deÄŸiÅŸtirilemiyor"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "geçersiz dosya: '%s'"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "geçersiz içerik: '%s'"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8585,68 +8529,68 @@ msgstr ""
 "Çalışma ağacınızda işlenmemiş değişiklikleriniz var. Lütfen önce\n"
 "onları işleyin ve ardından 'git rebase --continue' yapın."
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "dosya yazılamadı: '%s'"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "CHERRY_PICK_HEAD kaldırılamadı"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "Hazırlanmış değişiklikler işlenemedi."
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: Bir %s seçip alınamıyor"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s hatalı revizyon"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "ilk işleme geri alınamaz"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "daha önce uygulanan %s işlemesi atlandı"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr "atlanan işlemeleri içermek için --reapply-cherry-picks kullanın"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: ele alınmayan seçenekler"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: revizyonlar hazırlanırken hata"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "yapılacak bir şey yok"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "gerekli olmayan seçim komutları atlanamadı"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "betik halihazırda yeniden düzenlenmişti"
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "'%s', '%s' konumunda depo dışında"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8655,7 +8599,7 @@ msgstr ""
 "%s: Çalışma ağacında böyle bir yol yok.\n"
 "Yerelde var olmayan yolları belirtmek için 'git <komut> -- <yol>... kullanın."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8667,12 +8611,12 @@ msgstr ""
 "Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
 "'git <komut> [<revizyon>...] -- [<dosya>...]'"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "'%s' seçeneği seçenek olmayan argümanlardan önce gelmeli"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8683,100 +8627,100 @@ msgstr ""
 "Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
 "'git <komut> [<revizyon>...] -- [<dosya>...]'"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Beklenen git repo sürümü <= %d, %d bulundu"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "bilinmeyen depo geniÅŸletmesi bulundu:"
 msgstr[1] "bilinmeyen depo geniÅŸletmeleri bulundu:"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:"
 msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "'%s' açılırken hata"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "bir .git dosyası olabilmek için çok büyük: '%s'"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "%s okunurken hata"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "geçersiz gitfile biçimi: %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "gitfile içinde yol yok: %s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "bir git deposu deÄŸil: %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' çok büyük"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "bir git deposu deÄŸil: '%s'"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "'%s' konumuna chdir yapılamıyor"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "cwd'ye geri dönülemiyor"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "'%*s%s%s' bilgileri alınamadı"
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "Şu anki çalışma dizini okunamıyor"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "ÅŸuraya deÄŸiÅŸtirilemiyor: '%s'"
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s"
 
-#: setup.c:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8786,7 +8730,7 @@ msgstr ""
 "Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "ayarlanmamış)."
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8795,15 +8739,15 @@ msgstr ""
 "core.sharedRepository dosya kipi deÄŸeri ile sorun (0%.3o).\n"
 "Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "çatallama başarısız"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid başarısız"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
@@ -8860,13 +8804,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u bayt/sn"
 msgstr[1] "%u bayt/sn"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "'%s' yazma için açılamadı"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "'%s' düzenlenemedi"
@@ -8959,7 +8903,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "'%s' altmodülü için işlem başarısız oldu"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
 
@@ -9205,7 +9149,7 @@ msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor"
 msgid "invalid remote service path"
 msgstr "geçersiz uzak konum servis yolu"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "işlem protokol tarafından desteklenmiyor"
 
@@ -9424,9 +9368,9 @@ msgstr ""
 
 #: transport.c:1197
 msgid "Aborting."
-msgstr "Ä°ptal ediliyor"
+msgstr "Ä°ptal ediliyor."
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "gereken tüm altmodüller itilemedi"
 
@@ -9446,7 +9390,7 @@ msgstr "ağaç girdisinde boş dosya adı"
 msgid "too-short tree file"
 msgstr "ağaç dosyası çok kısa"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9455,7 +9399,7 @@ msgstr ""
 "Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
 "%%sLütfen dal değiştirmeden önce değişikliklerinizi işleyin veya zulalayın."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9464,7 +9408,7 @@ msgstr ""
 "Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9474,7 +9418,7 @@ msgstr ""
 "yazılacak:\n"
 "%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9484,7 +9428,7 @@ msgstr ""
 "yazılacak:\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9493,7 +9437,7 @@ msgstr ""
 "%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
 "%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın."
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9502,7 +9446,7 @@ msgstr ""
 "%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9511,7 +9455,16 @@ msgstr ""
 "Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Geçerli çalışma dizinini kaldırma reddediliyor:\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9520,7 +9473,7 @@ msgstr ""
 "Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
 "%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9529,7 +9482,7 @@ msgstr ""
 "Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9538,7 +9491,7 @@ msgstr ""
 "Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
 "%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9547,7 +9500,7 @@ msgstr ""
 "Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9556,7 +9509,7 @@ msgstr ""
 "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
 "%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9565,7 +9518,7 @@ msgstr ""
 "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9576,7 +9529,7 @@ msgstr ""
 "yazılacak:\n"
 "%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9587,7 +9540,7 @@ msgstr ""
 "yazılacak:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9597,7 +9550,7 @@ msgstr ""
 "yazılacak:\n"
 "%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9607,7 +9560,7 @@ msgstr ""
 "yazılacak:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9616,7 +9569,7 @@ msgstr ""
 "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
 "%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9625,12 +9578,12 @@ msgstr ""
 "%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor."
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9639,7 +9592,7 @@ msgstr ""
 "Altmodül güncellenemiyor:\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9649,7 +9602,7 @@ msgstr ""
 "Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9658,7 +9611,7 @@ msgstr ""
 "Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9669,12 +9622,12 @@ msgstr ""
 "güncellenmedi:\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "Ä°ptal ediliyor\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9683,11 +9636,11 @@ msgstr ""
 "Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak "
 "isteyebilirsiniz.\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "Dosyalar güncelleniyor"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9697,16 +9650,16 @@ msgstr ""
 "olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n"
 "gruptan yalnızca bir tanesi çalışma ağacında:\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "İndeks bayrakları güncelleniyor"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "çalışma ağacı ve izlenmeyen işlemenin yinelenmiş girdileri var: %s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "getir argümanlarından sonra floş bekleniyordu"
 
@@ -9743,99 +9696,99 @@ msgstr "geçersiz '..' yol kesimi"
 msgid "Fetching objects"
 msgstr "Nesneler getiriliyor"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "'%s' okunamadı"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' mevcut deÄŸil"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' bir .git dosyası değil, hata kodu %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ÅŸuna geri iÅŸaret etmiyor: '%s'"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "bir dizin deÄŸil"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git bir dosya deÄŸil"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git dosyası bozuk"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git dosyası doğru değil"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "geçerli bir yol değil"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "depo konumu bulunamıyor: .git bir dosya değil"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "okunamayan gitdir"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "doÄŸru olmayan gitdir"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "geçerli bir dizin değil"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir dosyası mevcut değil"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "gitdir dosyası (%s) okunamıyor"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "geçersiz gitdir dosyası"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
 
@@ -9897,11 +9850,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Ä°ÅŸlenecek deÄŸiÅŸiklikler:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "İşleme için hazırlanmamış değişiklikler:"
 
@@ -9983,7 +9936,7 @@ msgstr "türü değiştirildi:"
 
 #: wt-status.c:300
 msgid "unknown:"
-msgstr "bilinmiyor"
+msgstr "bilinmiyor:"
 
 #: wt-status.c:302
 msgid "unmerged:"
@@ -10001,22 +9954,22 @@ msgstr "değiştirilen içerik, "
 msgid "untracked content, "
 msgstr "izlenmeyen içerik, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Zulanızda şu anda %d girdi var"
 msgstr[1] "Zulanızda şu anda %d girdi var"
 
-#: wt-status.c:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "İşlenecek altmodül değişiklikleri:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10024,7 +9977,7 @@ msgstr ""
 "Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
 "Altındaki her şey yok sayılacaktır."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10035,107 +9988,114 @@ msgstr ""
 "Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n"
 "Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Birleştirilmemiş yollarınız var."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (çakışmaları onar ve \"git commit\" çalıştır)"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz."
 
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "Bir 'am' oturumunun tam ortasındasınız."
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Mevcut yama boÅŸ."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (çakışmaları onar ve ardından \"git am --continue\" çalıştır)"
 
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (bu yamayı atlamak için \"git am --skip\" kullanın"
 
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (yamayı boş işleme kaydı olarak yazmak için \"git am --allow-empty\" "
+"kullanın)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo eksik"
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Yerine getirilen bir komut yok."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Son yerine getirilen komut (toplamda %d komut):"
 msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ek bilgi için %s dosyasına bakın)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Kalan komut yok."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Sıradaki yerine getirilecek komut (%d kalan komut):"
 msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Şu anda yeniden temellendirme yapmaktasınız."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10143,158 +10103,158 @@ msgstr ""
 "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
 "parçalara bölüyorsunuz."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
 "düzenliyorsunuz."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Seç-al şu anda sürmekte."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Geriye al şu anda sürmekte."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Şu anda %s işlemesini geri alıyorsunuz."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (çakışmaları onar ve \"git revert --continue\" çalıştır)"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (sürdürmek için \"git revert --continue\" çalıştır)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (bu yamayı atlamak için \"git revert --skip\" kullanın)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (geri al işlemini iptal için \"git revert --abort\" kullanın)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
-msgstr "Şu anda ikili arama yapıyorsunuz"
+msgstr "Şu anda ikili arama yapıyorsunuz."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (ilk dala dönmek için \"git bisect reset\" kullanın)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Bir aralıklı çıkış içindesiniz."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Ãœzerinde bulunulan dal: "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "şunun üzerine yeniden temellendirme sürmekte: "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD şurada ayrıldı: "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD şundan ayrıldı: "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Şu anda bir dal üzerinde değil."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Ä°lk iÅŸleme"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Henüz bir işleme yok"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Ä°zlenmeyen dosyalar"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Yok sayılan dosyalar"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10305,117 +10265,117 @@ msgstr ""
 "bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n"
 "konusunda dikkatli olmalısınız (ek bilgi için 'git help status')."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ä°zlenmeyen dosyalar listelenmiyor%s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "DeÄŸiÅŸiklik yok"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok (\"git add\" ve/veya \"git commit -a\" "
 "kullanın)\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
-"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için\n"
+"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için "
 "\"git add\" kullanın)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "iÅŸlemeye bir ÅŸey eklenmedi; ancak izlenmeyen dosyalar var\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
 "add\" kullanın)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "Ä°ÅŸlenecek bir ÅŸey yok\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Şurada henüz bir işleme yok: "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (dal yok)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "deÄŸiÅŸik"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "şunun arkasında: "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "şunun önünde: "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "IPC komutu gönderilemedi"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "IPC yanıtı okunamadı"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "accept_thread '%s' başlatılamadı"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "'%s' için worker[0] başlatılamadı"
@@ -10452,111 +10412,117 @@ msgstr "kaldır: '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "İndeks okunamadı"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Yama yazılamadı"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "yamayı düzenleme başarısız"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "'%s' dosya bilgileri alınamadı"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "BoÅŸ yama. Ä°ptal edildi."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "'%s' uygulanamadı"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok "
 "sayılıyor:\n"
 
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "sınama turu"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "ayrıntı ver"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "etkileşimli seçim"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "parçaları etkileşimli olarak seç"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "geçerli diff'i düzenle ve uygula"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "izlenen dosyaları güncelle"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz"
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)"
 
-#: builtin/add.c:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "ekleme, yalnızca indeksi yenile"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
 
-#: builtin/add.c:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını "
 "denetle"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "aralıklı çıkış konisi dışındaki girdileri güncellemeye izin ver"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "gömülü bir depo eklenirken uyar"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "'git stash -p' için arka uç"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10587,12 +10553,12 @@ msgstr ""
 "\n"
 "Ek bilgi için: \"git help submodule\"."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "gömülü git deposu ekleniyor: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10602,53 +10568,27 @@ msgstr ""
 "Bu iletiyi 'git config advice.addIgnoredFile false'\n"
 "kullanarak kapatabilirsiniz."
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "dosya ekleme başarısız"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file, --edit ile uyumsuz"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A ve -u karşılıklı olarak uyumlu"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr ""
-"--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte "
-"kullanılabilir"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "--chmod param '%s' ya -x ya da +x olmalıdır"
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' ve yol belirteci argümanları birlikte kullanılamaz"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10658,111 +10598,119 @@ msgstr ""
 "Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
 "yaparak kapatabilirsiniz."
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "--empty için geçersiz değer: %s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "yazar betiği ayrıştırılamadı"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' applypatch-msg kancası tarafından silindi"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek başarısız oldu"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "'%s' yaması ayrıştırılamadı"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir"
 
-#: builtin/am.c:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "geçersiz zaman damgası"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "geçersiz tarih satırı"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "geçersiz zaman dilimi ofseti"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Yama biçimi algılaması başarısız."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "'%s' dizini oluşturulamadı"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Yamalar parçalanıp bölünemedi."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın."
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın."
 
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"Boş yamayı boş işleme kaydı olarak yazmak için \"%s --allow-empty\" "
+"çalıştırın."
+
+#: builtin/am.c:1161
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" "
 "çalıştır."
 
-#: builtin/am.c:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş "
 "olabilir."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Yama boÅŸ."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "%s işlemesinde yazar satırı eksik"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "geçersiz tanımlama satırı: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye "
 "deÄŸil."
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..."
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10770,24 +10718,24 @@ msgstr ""
 "Yamanızı elle mi düzenlediniz?\n"
 "Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..."
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "DeÄŸiÅŸiklikler birleÅŸtirilemedi."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "boş bir geçmişe uygulanıyor"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
-msgstr "sürdürülemiyor: %s yok"
+msgstr "sürdürülemiyor: %s yok."
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "İşleme gövdesi:"
 
@@ -10795,41 +10743,59 @@ msgstr "İşleme gövdesi:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: "
 
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "indeks dosyası yazılamıyor"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "Applying: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "BoÅŸ bir iÅŸleme oluÅŸturuluyor: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Yama boÅŸ."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Uygulanıyor: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Yama şurada başarısız oldu: %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 "Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Değişiklik yok -- boş bir işleme olarak kayıt yazıldı."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10839,7 +10805,7 @@ msgstr ""
 "Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n"
 "aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz."
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10852,17 +10818,17 @@ msgstr ""
 "Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
 "yapabilirsiniz."
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "'%s' nesnesi ayrıştırılamadı."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "indeks temizlenemedi"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10870,160 +10836,168 @@ msgstr ""
 "Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n"
 "ORIG_HEAD'e geri sarılmıyor."
 
-#: builtin/am.c:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Geçersiz --patch-format değeri: %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "--show-current-patch için geçersiz değer: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "'%s=%s' ve '%s=%s' seçenekleri birlikte kullanılamaz"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "etkileşimli olarak çalıştır"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "tarihi seçenek -- no-op"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "sessiz ol"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "işleme iletisine bir Signed-off-by satırı ekle"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "utf8 olarak yeniden kodla (öntanımlı)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -k bayrağını geçir"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -b bayrağını geçir"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "'git-mailinfo'ya -m bayrağını geçir"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "git-mailinfo içerisinden geçir"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "git-apply aracılığıyla geçir"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "biçim"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "yama biçimi"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "--continue eşanlamlıları"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "geçerli yamayı atla"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "yamalama işlemini iptal et; ancak HEAD'i olduğu yerde bırak"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "uygulanmakta olan yamayı göster"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "boş yamayı bir boş işleme olarak kayıt yaz"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "işleyici tarihi hakkında yalan söyle"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "yazar tarihi için geçerli zaman damgasını kullan"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "GPG imzalı işlemeler"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "boş yamaların nasıl değerlendirileceği"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(git-rebase için iç kullanım)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -11031,17 +11005,17 @@ msgstr ""
 "-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n"
 "yakında kaldırılacak. Lütfen artık kullanmayın."
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "indeks okunamadı"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi."
 
-#: builtin/am.c:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11050,11 +11024,11 @@ msgstr ""
 "Başıboş %s dizini bulundu.\n"
 "Kaldırmak için \"git am --abort\" kullanın."
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
 
@@ -11511,11 +11485,11 @@ msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı)
 msgid "show work cost statistics"
 msgstr "iş maliyet istatistiklerini göster"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "durum belirtmeyi zorla"
@@ -11564,7 +11538,7 @@ msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)"
 msgid "ignore whitespace differences"
 msgstr "boşluk ayrımlarını yok say"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "revizyon"
 
@@ -11617,7 +11591,7 @@ msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 "Yalnızca <başlangıç>,<bitiş> satır erimini veya :<işlevadı> işlevini işle"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
 
@@ -11629,18 +11603,18 @@ msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 yıl 11 ay önce"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "%s dosyasında yalnızca %lu satır var"
 msgstr[1] "%s dosyasında yalnızca %lu satır var"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Genel bakış satırları"
 
@@ -11672,16 +11646,16 @@ msgstr "git branch [<seçenekler>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<seçenekler>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr ""
 "'%s' dalı siliniyor: Bu dal '%s'\n"
-"         dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş"
+"         dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş."
 
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11690,12 +11664,12 @@ msgstr ""
 "'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n"
 "         '%s' dalına birleştirilmemiş."
 
-#: builtin/branch.c:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "'%s' için işleme nesnesi aranamadı"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11704,7 +11678,7 @@ msgstr ""
 "'%s' dalı tümüyle birleştirilmemiş.\n"
 "Eğer silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın."
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "config-file güncellemesi başarısız"
 
@@ -11714,101 +11688,101 @@ msgstr "-a, -d ile kullanılamıyor"
 
 #: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
-msgstr "HEAD için işleme nesnesi aranamadı"
+msgstr "HEAD için işleme nesnesi aranamadı."
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'"
+msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'."
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
-msgstr "uzak izleme dalı '%s' bulunamadı"
+msgstr "Uzak izleme dalı '%s' bulunamadı."
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
-msgstr "'%s' dalı bulunamadı"
+msgstr "'%s' dalı bulunamadı."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "%s dalı silindi (%s idi).\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "biçim dizisi ayrıştırılamıyor"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "HEAD çözülemedi"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "%s dalı %s konumunda ikili aranıyor"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
-msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz"
+msgstr "Bir dalın üzerinde değilken geçerli dal kopyalanamaz."
 
-#: builtin/branch.c:516
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
-msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz"
+msgstr "Bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz."
 
-#: builtin/branch.c:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Geçersiz dal adı: '%s'"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Dal yeniden adlandırması başarısız"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Dal kopyalaması başarısız"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Yanlış adlandırılan '%s' dalının bir kopyası oluşturuldu"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Dal %s olarak yeniden adlandırıldı; ancak HEAD güncellenmedi!"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Dal yeniden adlandırıldı; ancak config-file güncellemesi başarısız"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Dal kopyalandı; ancak config-file güncellemesi başarısız"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11819,180 +11793,176 @@ msgstr ""
 "\t%s\n"
 "'%c' ile başlayan satırlar çıkarılacaktır.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Genel seçenekler"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "sağlamayı ve konuyu göster, üstkaynak dalı için iki kez ver"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "bilgi iletilerini gizle"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "dal izleme yapılandırmasını ayarla"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "kullanma"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "üstkaynak"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "üstkaynak bilgisini değiştir"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "üstkaynak bilgisini kaldır"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "renklendirilmiş çıktı kullan"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "uzak izleme dallarında iş yap"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "yalnızca işlemeyi içeren dalları yazdır"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Özel git-branch eylemleri:"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "hem uzak izleme hem de yerel dalları listele"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "tümüyle birleştirilen dalı sil"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "dalı sil (birleştirilmemiş olsa bile)"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "bir dalı ve onun başvuru günlüğünü taşı/yeniden adlandır"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "bir dalı kopyala, hedef var olsa bile"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "dal adlarını listele"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "geçerli dal adını göster"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "dalın başvuru günlüğünü oluştur"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "dalın açıklamasını düzenle"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "yalnızca birleştirilen dalları yazdır"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "yalnızca birleştirilmeyen dalları yazdır"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "dalları sütunlarla listele"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "nesne"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "yalnızca nesnenin dallarını yazdır"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "çıktı için kullanılacak biçim"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD, refs/heads altında bulunamadı!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column ve --verbose birbiriyle uyumsuz"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "dal adı gerekli"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "birden çok dalın açıklaması düzenlenemiyor"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "'%s' dalında henüz bir işleme yok."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "'%s' adında bir dal yok."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "bir kopyalama işlemi için çok fazla dal"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "bir yeniden adlandırma işlemi için çok fazla argüman"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -12000,31 +11970,31 @@ msgstr ""
 "HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
 "etmiyor."
 
-#: builtin/branch.c:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "'%s' diye bir dal yok"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "'%s' diye bir dal mevcut deÄŸil"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "üst kaynağı kaldırmak için çok fazla argüman"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "HEAD'in üst kaynağı kaldırılamadı; çünkü herhangi bir dala işaret etmiyor."
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "'%s' dalının üstkaynak bilgisi yok"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -12032,7 +12002,7 @@ msgstr ""
 "'git branch'in -a ve -r seçenekleri bir dal adı almaz.\n"
 "Åžunu mu demek istediniz: -a|-r --list <dizgi>?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12182,7 +12152,7 @@ msgstr "%s tamam\n"
 
 #: builtin/bundle.c:182
 msgid "Need a repository to unbundle."
-msgstr "Demeti çözmek için bir depo gerekli"
+msgstr "Demeti çözmek için bir depo gerekiyoriyor."
 
 #: builtin/bundle.c:185
 msgid "Unbundling objects"
@@ -12302,8 +12272,8 @@ msgstr "dosya adlarını stdin'den oku"
 msgid "terminate input and output records by a NUL character"
 msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "ilerleme bildirimini gizle"
 
@@ -12361,10 +12331,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<seçenekler>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "dizi"
 
@@ -12428,98 +12398,93 @@ msgstr "git switch [<seçenekler>] [<dal>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "'%s' yolu bizdeki sürüme iye değil"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "'%s' yolu onlardaki sürüme iye değil"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "'%s' yolu gereken tüm sürümlere iye değil"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "'%s' yolu gereken sürümlere iye değil"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "'%s' yolu: BirleÅŸtirilemiyor"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "'%s' için birleştirme sonuçları eklenemiyor"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu"
 msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "%d yol şuradan güncellendi: %s"
 msgstr[1] "%d yol şuradan güncellendi: %s"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "%d yol indeksten güncellendi"
 msgstr[1] "%d yol indeksten güncellendi"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' güncellenmekte olan yollarla kullanılamaz"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s', %s ile birlikte kullanılamaz"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ne '%s' ne de '%s' belirtilmiÅŸ"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "'%s' yolu birleÅŸtirilmemiÅŸ"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "önce geçerli indeksinizi çözmelisiniz"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12528,50 +12493,50 @@ msgstr ""
 "aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD konumu:"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "HEAD güncellenemiyor"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "'%s' dalı sıfırlandı.\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Halihazırda '%s' üzerinde\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Yeni '%s' dalına geçildi.\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "'%s' dalına geçildi.\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
-msgstr "... ve %d daha.\n"
+msgstr " ... ve %d daha.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12594,7 +12559,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12621,19 +12586,19 @@ msgstr[1] ""
 "\tgit branch <yeni-dal-adı> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "revizyonlarda gezinirken iç hata"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Önceki HEAD konumu şuydu:"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "Henüz doğmamış bir dal üzerindesiniz"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12642,7 +12607,7 @@ msgstr ""
 "'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n"
 "Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin."
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12662,51 +12627,51 @@ msgstr ""
 "isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultRemote=origin\n"
 "ayarını yapmayı düşünün."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "yalnızca bir başvuru bekleniyordu"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
-msgstr "yalnızca bir başvuru bekleniyordu, %d verildi"
+msgstr "Yalnızca bir başvuru bekleniyordu, %d verildi."
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "geçersiz başvuru: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "baÅŸvuru bir aÄŸaca deÄŸil: %s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "bir dal bekleniyordu, '%s' alındı"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12714,7 +12679,7 @@ msgstr ""
 "BirleÅŸtirme yaparken dal deÄŸiÅŸtirilemiyor.\n"
 "\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12722,7 +12687,7 @@ msgstr ""
 "Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n"
 "\"git am --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12730,7 +12695,7 @@ msgstr ""
 "Yeniden temellendirme yaparken dal deÄŸiÅŸtirilemiyor.\n"
 "\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12738,7 +12703,7 @@ msgstr ""
 "Seç-al yaparken dal değiştirilemiyor.\n"
 "\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12746,210 +12711,198 @@ msgstr ""
 "Geriye al yaparken dal deÄŸiÅŸtirilemiyor.\n"
 "\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "ikili arama yaparken dal deÄŸiÅŸtiriyorsunuz"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "dal değiştirilirken yollar kullanılamaz"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "dal değiştirilirken '%s' kullanılamaz"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s', '%s' ile birlikte kullanılamaz"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s', <başlama-noktası> alamaz"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "dal veya işleme argümanı eksik"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "çakışma stili (birleştirme veya diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "çakışma stili (birleştirme, diff3 veya zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "adı verilen işlemede HEAD'i ayır"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "yeni dal için üstkaynak bilgisi ayarla"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "yeni dal"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "yeni üst ögesi olmayan dal"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c ve --orphan birlikte kullanılmaz"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p ve --overlay birlikte kullanılmaz"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "'-%c', '-%c' ve '%s' seçenekleri birlikte kullanılamaz"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track için bir dal adı gerekli"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "eksik dal adı; -%c deneyin"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "%s çözülemedi"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "geçersiz yol belirtimi"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach bir '%s' yol argümanı almıyor"
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file, --detach ile uyumsuz"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file, --patch ile uyumsuz"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
-"birlikte kullanılamaz"
+"birlikte kullanılamaz."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "dal"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "yeni bir dal oluştur ve çıkış yap"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "bir dal oluştur/sıfırla ve çıkış yap"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "yeni dal için başvuru günlüğü oluştur"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "yerpaylaşım kipini kullan (öntanımlı)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "yeni bir dal oluştur ve ona geç"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "bir dal oluştur/sıfırla ve ona geç"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "yerel değişiklikleri çöpe at"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "çıkış yapılacak ağacımsı"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "indeksi eski durumuna getir"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "çalışma ağacını eski durumuna getir"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "birleÅŸtirilmemiÅŸ girdileri yok say"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "yerpaylaşım kipini kullan"
 
@@ -12984,7 +12937,15 @@ msgstr "%s dizini atlanacak\n"
 msgid "could not lstat %s\n"
 msgstr "%s 'lstat' yapılamadı\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Geçerli çalışma dizinini kaldırma reddediliyor\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Geçerli çalışma dizinini kaldırmayı reddederdim\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12997,7 +12958,7 @@ msgstr ""
 "foo        - benzersiz öneke dayanarak bir öge seç\n"
 "           - (boş) hiçbir şey seçme\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13009,7 +12970,8 @@ msgid ""
 "*          - choose all items\n"
 "           - (empty) finish selecting\n"
 msgstr ""
-"İstem yardımı:1          - tek bir öge seç\n"
+"İstem yardımı:\n"
+"1          - tek bir öge seç\n"
 "3-5        - bir öge aralığı seç\n"
 "2-3,6-9    - birden çok erim seç\n"
 "foo        - benzersiz öneke dayanarak bir öge seç\n"
@@ -13017,33 +12979,33 @@ msgstr ""
 "*          - tüm ögeleri seç\n"
 "           - (boş) seçimi bitir\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Pardon (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Girdi için yok sayma dizgileri>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "Silinecek ögeleri seçin"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "%s kaldırılsın mı [y/N]? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13061,52 +13023,52 @@ msgstr ""
 "help                - bu ekranı görüntüle\n"
 "?                   - istem seçimi için yardım"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Aşağıdaki öge kaldırılacak:"
 msgstr[1] "Aşağıdaki ögeler kaldırılacak:"
 
-#: builtin/clean.c:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "Temizlenecek başka dosya yok, çıkılıyor."
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "kaldırılan dosyaların adlarını yazdırma"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "zorla"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "etkileÅŸimli temizlik"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "dizinleri tümüyle kaldır"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "dizgi"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "yok sayma kurallarına <dizgi> ekle"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "yok sayılan dosyalar da kaldırıldı"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "yalnızca yok sayılan dosyaları kaldır"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13114,7 +13076,7 @@ msgstr ""
 "clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
 "verilmiÅŸ; temizleme reddediliyor"
 
-#: builtin/clean.c:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13122,7 +13084,7 @@ msgstr ""
 "clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; "
 "temizleme reddediliyor"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x ve -X birlikte kullanılamaz"
 
@@ -13178,19 +13140,20 @@ msgstr "ÅŸablon dizini"
 msgid "directory from which templates will be used"
 msgstr "şablonların kullanılacağı dizin"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "baÅŸvuru deposu"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "--reference'ı yalnızca klonlarken kullan"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "ad"
@@ -13207,7 +13170,7 @@ msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap"
 msgid "path to git-upload-pack on the remote"
 msgstr "uzak konumdaki git-upload-pack'e olan yol"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "derinlik"
@@ -13216,7 +13179,7 @@ msgstr "derinlik"
 msgid "create a shallow clone of that depth"
 msgstr "verilen derinlikte sığ bir depo oluştur"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "zaman"
@@ -13225,17 +13188,17 @@ msgstr "zaman"
 msgid "create a shallow clone since a specific time"
 msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "revizyon"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "yalnızca bir dal klonla, HEAD veya --branch"
 
@@ -13263,22 +13226,22 @@ msgstr "anahtar=deÄŸer"
 msgid "set config inside the new repository"
 msgstr "yapılandırmayı yeni deponun içinde ayarla"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "sunucuya özel"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "iletme seçeneği"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "yalnızca IPv4 adresleri kullan"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "yalnızca IPv6 adresleri kullan"
@@ -13373,29 +13336,25 @@ msgstr "temizlik için yeniden paketlenemiyor"
 msgid "cannot unlink temporary alternates file"
 msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Çok fazla argüman."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "Klonlamak için bir depo belirtmelisiniz."
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz."
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "'%s' ve '%s %s' seçenekleri birlikte kullanılamaz"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "'%s' deposu mevcut deÄŸil"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "%s derinliği pozitif bir sayı değil"
@@ -13415,8 +13374,8 @@ msgstr "Depo yolu '%s' halihazırda mevcut ve boş bir dizin değil."
 msgid "working tree '%s' already exists."
 msgstr "Çalışma ağacı '%s' halihazırda mevcut."
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
@@ -13534,7 +13493,7 @@ msgstr ""
 "split[=<strateji>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <bölme-seçenekleri>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "dizin"
 
@@ -13618,7 +13577,7 @@ msgstr ""
 msgid "Collecting commits from input"
 msgstr "Girdiden işlemeler toplanıyor"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "tanımlanamayan altkomut: %s"
@@ -13636,7 +13595,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "yinelenmiş üst öge %s yok sayıldı"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "%s geçerli bir nesne adı değil"
@@ -13659,13 +13618,13 @@ msgstr "üst öge"
 msgid "id of a parent commit object"
 msgstr "bir üst işleme ögesinin no'su"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "ileti"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "iÅŸleme iletisi"
 
@@ -13673,7 +13632,7 @@ msgstr "iÅŸleme iletisi"
 msgid "read commit log message from file"
 msgstr "işleme günlük iletisini dosyadan oku"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "iÅŸlemeyi GPG ile imzala"
@@ -13752,10 +13711,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "HEAD ağaç nesnesi açılamadı"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
@@ -13843,8 +13798,8 @@ msgstr "günlük dosyası '%s' okunamadı"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "--fixup:%s ile -m birlikte kullanılamaz"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "'%s' ve '%s:%s' seçenekleri birlikte kullanılamaz"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -13951,7 +13906,7 @@ msgstr "--trailers'a artbilgiler geçirilemiyor"
 msgid "Error building trees"
 msgstr "Ağaçlar yapılırken hata"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n"
@@ -13968,15 +13923,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Geçersiz yok sayılanları göster kipi '%s'"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long ve -z birbiriyle uyumsuz"
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "Bir birleştirmenin tam ortasındasınız -- ileti değiştirilemiyor."
@@ -13987,118 +13938,115 @@ msgstr "Bir seç-al'ın tam ortasındasınız -- ileti değiştirilemiyor."
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
+msgid "reword option of '%s' and path '%s' cannot be used together"
 msgstr ""
-"--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor"
+"'%s' ögesinin yeniden yazım seçeneği ve '%s' yolu birlikte kullanılamaz"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup'ın ileti değiştirme seçeneği --patch/--interactive/--all/--include/--"
-"only ile birlikte kullanılamaz"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "'%s' ögesinin yeniden yazım seçeneği ve '%s' birlikte kullanılamaz"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor"
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "DeÄŸiÅŸtirecek bir ÅŸeyiniz yok."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor."
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr ""
 "Bir yeniden temellendirmenin tam ortasındasınız -- değiştirme yapılamıyor."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "-c/-C/-F/--fixup arasından yalnızca bir tanesi kullanılabilir."
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "-m seçeneği -c/-C/-F ile birlikte kullanılamaz."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 "--reset-author yalnızca -C, -c veya --amend ile birlikte kullanılabilir."
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "--include/--only/--all/--interactive/--patch arasından yalnızca bir tanesi "
 "kullanılabilir."
 
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "bilinmeyen seçenek: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "durumu kısaca göster"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "dal bilgisini göster"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "zula bilgisini göster"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "tam önünde/arkasında değerlerini hesapla"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "sürüm"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "makine tarafından okunabilir çıktı"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "durumu uzun biçimde göster (öntanımlı)"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "girdileri NUL ile sonlandır"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "kip"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: "
 "all)"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14106,11 +14054,11 @@ msgstr ""
 "yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) "
 "matching (eşleşen), no (hayır) (Öntanımlı: traditional)."
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "ne zaman"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14118,198 +14066,198 @@ msgstr ""
 "altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all "
 "(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)."
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "izlenmeyen dosyaları sütunlarla göster"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "yeniden adlandırmaları algılama"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte "
 "kullanımı"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "başarılı işlemenin ardından özeti gizle"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "diff'i işleme iletisi şablonunda göster"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "İşleme iletisi seçenekleri"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "iletiyi dosyadan oku"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "yazar"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "işleme yazarını geçersiz kıl"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "tarih"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "işleme tarihini geçersiz kıl"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "iÅŸleme"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "belirtilen iÅŸlemenin iletisini yeniden kullan"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]iÅŸleme"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "belirtilen işlemeyi değiştirmek/iletiyi yeniden yazmak için kendiliğinden "
 "tıkıştırma tarafından biçimlendirilen iletiyi kullan"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "belirtilen işlemeyi tıkıştırmak için kendiliğinden tıkıştırma tarafından "
 "biçimlendirilen iletiyi kullan"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "işlemenin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "artbilgi"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "özel artbilgiler ekle"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "bir Signed-off-by artbilgisi ekle"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "belirtilen şablon dosyasını kullan"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "işlemeyi zorla düzenle"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "işleme iletisi şablonunda durumu içer"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "İşleme içeriği seçenekleri"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "değiştirilen tüm dosyaları gönder"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "belirtilen dosyaları işleme için indekse ekle"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "dosyaları etkileşimli olarak ekle"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "deÄŸiÅŸiklikleri etkileÅŸimli olarak ekle"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "yalnızca belirtilen dosyaları gönder"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "pre-commit ve commit-msg kancalarını atla"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "neyin işleneceğini göster"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "önceki işlemeyi değiştir"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "post-rewrite kancasını atla"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "boş bir değişikliğin kaydı yazılabilir"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "boş iletili bir değişikliğin kaydı yazılabilir"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "MERGE_MODE okunamadı"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "işleme iletisi okunamadı: %s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "İşleme iletisinin boş bırakılmasından ötürü iptal ediliyor.\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "İşleme iletisi gövdesinin boş bırakılmasından ötürü iptal ediliyor.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14817,7 +14765,7 @@ msgstr "yalnızca <dizgi> ile eşleşen etiketleri dikkate al"
 msgid "do not consider tags matching <pattern>"
 msgstr "<dizgi> ile eÅŸleÅŸen etiketleri dikkate alma"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "kısaltılmış işleme nesnesini geri çekilinecek nesne olarak göster"
 
@@ -14833,25 +14781,14 @@ msgstr "<im>'i kirli çalışma ağacına iliştir (öntanımlı: \"-dirty\")"
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "<im>'i bozuk çalışma ağacına iliştir (öntanımlı: \"-broken\")"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long, --abbrev=0 ile uyumsuz"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor."
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty, iÅŸlememsilerle uyumsuz"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken, iÅŸlememsilerle uyumsuz"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin ve --merge-base birlikte kullanılamaz"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "'%s' seçeneği ve işlememsiler birlikte kullanılamaz"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14872,26 +14809,26 @@ msgstr "geçersiz seçenek: %s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: birleÅŸtirme temeli yok"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Bir git deposu deÄŸil"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "geçersiz nesne '%s' verildi"
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "ikiden çok ikili nesne verildi: '%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ele alınmayan nesne '%s' verildi"
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor"
@@ -14900,22 +14837,22 @@ msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "%s sembolik bağı okunamadı"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "%s sembolik bağ dosyası okunamadı"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "%s nesnesi %s sembolik bağı için okunamadı"
 
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14923,59 +14860,59 @@ msgstr ""
 "Birleştirilmiş diff biçimleri ('-c' ve '--cc') dizin diff kipinde\n"
 "('-d' ve '--dir-diff') desteklenmiyor."
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "Her iki dosya da deÄŸiÅŸtirildi: '%s' ve '%s'."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "Çalışma ağacı dosyası bırakıldı."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "'%s' konumunda geçici dosyalar var."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "başarısız: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "'diff.tool' yerine 'diff.guitool' kullan"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "bir tam dizin diff'i gerçekleştir"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "bir diff aracı çalıştırmadan önce sorma"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "dir-diff kipinde sembolik baÄŸlar kullan"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "araç"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "belirtilen diff aracını kullan"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
@@ -14983,31 +14920,23 @@ msgstr ""
 "çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-"
 "difftool'un çıkış yapmasını sağla"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "diff'leri görüntülemek için özel bir komut belirle"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "'diff'e aktarıldı"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff, --no-index ile uyumsuz"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "--tool=<araç> için bir <araç> verilmedi"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "--extcmd=<komut> için bir <komut> verilmedi"
 
@@ -15047,126 +14976,118 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Hata: İç içe geçmiş etiketler --mark-tags belirtilmediği sürece dışa "
 "aktarılamaz."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map jetonu boÅŸ olamaz"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "<n> nesneden sonra ilerlemeyi göster"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "nesnelerce süzülen etiketlerin nasıl ele alınacağını seçin"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "başka bir kodlamaya iye işleme iletilerinin nasıl ele alınacağını seçin"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "imleri bu dosyaya boÅŸalt"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "imleri bu dosyadan içe aktar"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "eğer varsa bu dosyadan imleri içe aktar"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "her işleme için tüm ağacın çıktısını ver"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "ikili nesne verisi çıktısını atla"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "baÅŸvuru belirteci"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "çıktı kimliğini gizle"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "kimden:kime"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "<kimden> ve <kime>'yi anonimleştirilmiş çıktıda dönüştür"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "'fast-export' akışında olmayan üst ögelere nesne numarası ile başvur"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "etiketleri im numaralarıyla adlandır"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarılamadı"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "'mark' komutu bekleniyordu, %s alındı"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "'to' komutu bekleniyordu, %s alındı"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Altmodül yeniden yazım seçeneği için name:filename biçimi bekleniyordu"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
@@ -15176,120 +15097,120 @@ msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
 msgid "Lockfile created but not reported: %s"
 msgstr "Kilit dosyası oluşturuldu; ancak raporlanmadı: %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<seçenekler>] <grup>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<seçenekler>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel negatif olamaz"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "tüm uzak konumlardan getir"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "git pull/fetch için üstkaynak ayarla"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "başvuruları güncellemek için atomsal işlem kullan"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "uzak uçtaki yükleme paketine olan yol"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "yerel başvurunun üzerine zorla yaz"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "birden çok uzak konumdan getir"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "tüm etiketleri getirme (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "paralelde getirilen altmodüllerin sayısı"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde "
 "deÄŸiÅŸtir"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "artık uzak konumda olmayan uzak izleme dallarını buda"
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri "
 "güncelle"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "istek üzerine"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "altmodüllerin özyineli getirilmesini denetle"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "indirilen paketi tut"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "HEAD başvurusunun güncellenmesine izin ver"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "sığ klonun geçmişini derinleştir"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "zamana bağlı olarak sığ deponun geçmişini derinleştir"
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "tam bir depoya dönüştür"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "bunu altmodül yol çıktısının başına ekle"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15297,141 +15218,146 @@ msgstr ""
 "altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma "
 "dosyalarından daha az önceliğe iye)"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr ".git/shallow'u güncelleyen başvuruları kabul et"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "ilgili baÅŸvuru"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "getirme ile ilgili başvuruları belirt"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını "
 "yazdır"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "tüm güncellenmiş dalları zorlanmış güncellemeler için denetle"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "getirdikten sonra iÅŸleme grafiÄŸini yaz"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "başvuru belirteçlerini stdin'den oku"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "Uzak HEAD başvurusu bulunamadı"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "uzak HEAD başvurusu bulunamadı"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s"
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "%s nesnesi bulunamadı"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[güncel]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[reddedildi]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "geçerli dalda getirme yapılamıyor"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "başka bir çalışma ağacında çıkış yapıldı"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[etiket güncellemesi]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "yerel başvuru güncellenemiyor"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "var olan etiketi deÄŸiÅŸtirecektir"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[yeni etiket]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[yeni dal]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[yeni baÅŸvuru]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "zorlanmış güncelleme"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "ileri sarım değil"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir,\n"
-"ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n"
+"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir;\n"
+"ancak bu denetleme kapatılmış. Yeniden açmak için '--show-forced-updates'\n"
 "bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın."
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"Zorla güncellemeleri denetleme %.2f saniye sürdü. --no-show-forced-updates\n"
+"Zorla güncellemeleri denetleme %.2f saniye sürdü. '--no-show-forced-"
+"updates'\n"
 "kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
 "bu denetlemeden kaçınabilirsiniz.\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s tüm gerekli nesneleri göndermedi\n"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Åžu konumdan: %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15440,143 +15366,144 @@ msgstr ""
 "bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
 "kullanarak eski ve çakışan dalları kaldırmayı deneyin"
 
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sarkacak)"
 
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s sarkmaya başladı)"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[silindi]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "Çıplak olmayan deponun geçerli %s dalına getirme reddediliyor"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "'%s' dalına getirme reddediliyor, '%s' konumunda çıkış yapıldı"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil"
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
 msgstr "\"%s\" seçeneği %s için yok sayılıyor\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "%s diye bir nesne yok"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"HEAD'in üst kaynağı '%s' olarak '%s' konumundan ayarlanamadı; çünkü herhangi "
+"bir dala iÅŸaret etmiyor."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "bilinmeyen dal türü"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 "Kaynak dal bulunamadı.\n"
 "--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "%s getiriliyor\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
 msgstr "%s getirilemedi"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 msgstr ""
 "Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
-"alınacağı bir URL veya uzak konum adı belirtin."
+"getirileceği bir URL veya uzak konum adı belirtin."
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "Bir etiket adı belirtmeniz gerekiyor."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "bir etiket adı belirtmeniz gerekiyor"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr ""
 "--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
-msgstr "--deepen için negatif derinlik desteklenmiyor"
-
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen ve --depth birlikte kullanılamaz"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth ve --unshallow birlikte kullanılamaz"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
+msgstr "--deepen içinde negatif derinlik desteklenmiyor"
 
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all bir depo argümanı almıyor"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s"
+msgid "no such remote or remote group: %s"
+msgstr "böyle bir uzak konum veya uzak konum grubu yok: %s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
 msgstr ""
-"Bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
+"bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "protokol, --negotiate-only desteklemediğinden çıkılıyor"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15584,11 +15511,11 @@ msgstr ""
 "--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
 "ile kullanılabilir."
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr ""
 "--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
@@ -15599,23 +15526,27 @@ msgid ""
 msgstr ""
 "git fmt-merge-msg [-m <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "günlüğü kısa günlükten en az <n> girdi ile doldur"
 
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "--log için arma (kullanılmamalı)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "metin"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "iletinin başlangıcı olarak <metin> kullan"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "gerçek hedef dal yerine <ad> kullan"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "okunacak dosya"
 
@@ -15635,47 +15566,47 @@ msgstr "git for-each-ref [--merged [<iÅŸleme>]] [--no-merged [<iÅŸleme>]]"
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<iÅŸleme>]] [--no-contains [<iÅŸleme>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "yer tutucuları perl'in anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "yer tutucuları python'un anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "yer tutucuları Tcl'nin anlayabileceği biçimde tırnak içine al"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "yalnızca <n> eşleşen başvuruyu göster"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "biçim renklerine uy"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "yalnızca verilen nesneye işaret eden başvuruları yazdır"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "yalnızca birleştirilen başvuruları yazdır"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "yalnızca birleştirilmemiş başvuruları yazdır"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "yalnızca işlemeyi içeren başvuruları yazdır"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
 
@@ -15826,124 +15757,124 @@ msgstr "%s: nesne hasar görmüş veya kayıp: %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: nesne bilinmeyen bir türde: '%s': %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: nesne ayrıştırılamadı: %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "hatalı sha1 dosyası: %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "Nesne dizini denetleniyor"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "Nesne dizinleri denetleniyor"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "%s baÄŸ denetleniyor"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "geçersiz %s"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s garip bir ÅŸeye iÅŸaret ediyor (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "Önbellek ağacı denetleniyor"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree içinde ağaç olmayan öge"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<seçenekler>] [<nesne>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "ulaşılamayan nesneleri göster"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "sarkan nesneleri göster"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "etiketleri bildir"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "kök düğümleri bildir"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "indeks nesnelerini dal ucu düğümü yap"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "yalnızca bağlanabilirliği denetle"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "daha kesin denetlemeyi etkinleÅŸtir"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "sarkan nesneleri .git/lost-found'a yaz"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "ilerlemeyi göster"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Nesneler denetleniyor"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: nesne kayıp"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
@@ -15962,17 +15893,12 @@ msgstr "%s fstat yapılamadı: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "'%s' değeri '%s' ayrıştırılamadı"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "'%s' bilgileri alınamıyor"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "'%s' okunamıyor"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -15987,52 +15913,52 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "baÅŸvurulmayan nesneleri buda"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "auto-gc kipini etkinleÅŸtir"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır"
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "gc.logexpiry değeri %s ayrıştırılamadı"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "'prune expiry' değeri %s ayrıştırılamadı"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "En iyi başarım için depo arka planda kendiliğinden paketleniyor.\n"
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "En iyi başarım için depo kendiliğinden paketleniyor.\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "El ile ortalık temizliği için \"git help gc\"ye bakın.\n"
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16040,209 +15966,209 @@ msgstr ""
 "gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
 "force kullanın)"
 
-#: builtin/gc.c:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Çok fazla ulaşılabilir boşta nesne var; kaldırmak için 'git prune' kullanın."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<görev>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule kullanımına izin yok"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "tanımlanamayan --schedule argümanı, %s"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "commit-graph yazılamadı"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "uzak konumlar önden getirilemedi"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "'git pack-objects' işlemi başlatılamadı"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "'git pack-objects' iÅŸlemi bitirilemedi"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "multi-pack-index yazılamadı"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' başarısız oldu"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' başarısız oldu"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr ""
 "incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "'%s' görevi başarısız oldu"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' geçerli bir görev değil"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "'%s' görevi birden çok kez seçilemez"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "görevleri deponun durumuna göre çalıştır"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "sıklık"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "görevleri sıklığa göre çalıştır"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "görev"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "belirli bir görevi çalıştır"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "'git config' çalıştırılamadı"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "'%s' yolu oluşturulamadı"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "launchctl başlatılamadı"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "'%s' için dizinler oluşturulamadı"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "%s servisi özyüklenemedi"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "geçici xml dosyası oluşturulamadı"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "schtasks başlatılamadı"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "'crontab' stdin'i açılamadı"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' beklenmedik bir biçimde sonlandı"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "systemctl başlatılamadı"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "systemctl çalıştırılamadı"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "'%s' silinemedi"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "tanımlanamayan --scheduler argümanı, '%s'"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "ne systemd zamanlayıcıları ne de crontab mevcut değil"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s planlayıcısı mevcut değil"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "başka bir işlem arka plan bakımı zamanını planlıyor"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<görev-planlayıcı>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "görev planlayıcı"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "git bakımını tetikleyecek görev planlayıcı"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "depo, global yapılandırmaya eklenemedi"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <altkomut> [<seçenekler>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "geçersiz altkomut: %s"
@@ -16613,25 +16539,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "tanımlanamayan yardım biçimi '%s'"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "emacsclient başlatılamadı."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "emacsclient sürümü ayrıştırılamadı."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient sürümü '%d' pek eski (<22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "'%s' çalıştırılamadı"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16640,7 +16566,7 @@ msgstr ""
 "'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
 "Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16649,39 +16575,39 @@ msgstr ""
 "'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
 "Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': Bilinmeyen man görüntüleyicisi."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "isteğe hiçbir man görüntüleyicisi ele almadı"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s', '%s' olarak armalanmış"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "hatalı alias.%s dizisi: %s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "bu seçenek başka bir argüman daha almıyor"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "kullanım: %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "ek bilgi için: 'git help config'"
 
@@ -16948,18 +16874,10 @@ msgstr "hatalı %s"
 msgid "unknown hash algorithm '%s'"
 msgstr "bilinmeyen sağlama algoritması '%s'"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin bir git dizini gerektirir"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format, --stdin olmadan kullanılamaz"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify ile bir paket dosyası adı verilmedi"
@@ -17085,10 +17003,6 @@ msgstr "saÄŸlama"
 msgid "specify the hash algorithm to use"
 msgstr "kullanılacak sağlama algoritmasını belirle"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir ve --bare birlikte kullanılamaz"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17222,85 +17136,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Son çıktı: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: hatalı dosya"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "%s nesnesi okunamadı"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "bilinmeyen tür: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: açıklama kipinden geçersiz kapak sayfası"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers deÄŸere iye deÄŸil"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "%s yama dosyası okunamıyor"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "bir tam erim gerekiyor"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "bir erim deÄŸil"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "ön yazı için e-posta biçimi gerekli"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "cover-letter dosyası oluşturulamadı"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "akıl almaz in-reply-to: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "iki çıktı dizini?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "bilinmeyen iÅŸleme %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "kesin birleştirme temeli bulunamadı"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -17311,407 +17225,395 @@ msgstr ""
 "izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
 "kullanarak el ile belirtebilirsiniz."
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "kesin birleştirme temeli bulunamadı"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "taban işlemesi revizyon listesinin atası olmalı"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "taban işlemesi revizyon listesinde olmamalı"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "yama numarası alınamıyor"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "birden çok yama bile olsa [PATCH] kullan"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "yamaları standart çıktıya yazdır"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "bir ön yazı oluştur"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "çıktı dosya adları için yalın sayı dizisi oluştur"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sonek"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "'.patch' yerine <sonek> kullan"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "diziyi n. deneme olarak imle"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "[PATCH] yerine [RFC PATCH] kullan"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "açıklama kipinden kapak sayfası kipi"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "[PATCH] yerine [<önek>] kullan"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "ortaya çıkan dosyaları <dizin>'de depola"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH]'i soyma/ekleme"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "ikili diff'leri çıktı verme"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "öntanımlı yerine yama biçimini göster (patch + stat)"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "Ä°letileÅŸme"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "üstbilgi"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "e-posta üstbilgisi ekle"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "e-posta"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "To: üstbilgisi ekle"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "Cc: üstbilgisi ekle"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "tanımlayıcı"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "ileti no"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "ilk postayı <ileti no>'ya bir yanıt yap"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "sınır"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "yamayı ekle"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "yamayı iletiye koy"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "imza"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "imza ekle"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "taban iÅŸleme"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "yama dizisine önkoşul ağaç bilgisini ekle"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "dosyadan bir imza ekle"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "yama dosya adlarını yazdırma"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "yamalar oluşturulurken ilerlemeyi göster"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "oluşumun tartıldığı yüzde"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "geçersiz tanımlayıcı satırı: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only bir anlam ifade etmiyor"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status bir anlam ifade etmiyor"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check bir anlam ifade etmiyor"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout, --output ve --output-directory  birlikte kullanılamaz"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff v%d karşısında:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor, --range-diff gerektiriyor"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff v%d karşısında:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "'%s' imza dosyası okunamıyor"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "Yamalar oluÅŸturuluyor"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "çıktı dosyaları oluşturulamadı"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<seçenekler>] [<dosya>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "yolları NUL karakteri ile ayır"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "dosya durumunu etiketlerle tanımla"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "silinen dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "değiştirilen dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "diğer dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "yok sayılan dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "hazırlanan içeriğin nesne adını çıktıda göster"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "'diğer' dizinlerin yalnızca adını göster"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "dosyaların satır sonlarını göster"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "boş dizinleri gösterme"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "birleştirilmemiş dosyaları çıktıda göster"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' bilgisini göster"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "dizgi ile eşleşen dosyaları atla"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "hariç bırakma dizgilerini <dosya>'dan oku"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "standart git hariç tutmalarını ekle"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "çıktıyı en üst proje dizinine göreceli olarak yap"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "altmodüller içinden özyinele"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "eğer bir <dosya> indekste değilse bunu bir hata olarak gör"
 
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "ağacımsı"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "hata ayıklama verisini göster"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "yinelenen girdileri sustur"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "bir aralıklı indeks bulunurluğunda aralıklı dizinleri göster"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -17905,26 +17807,30 @@ msgid "use a diff3 based merge"
 msgstr "diff3 tabanlı birleştirme kullan"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "gayretli bir diff3 tabanlı birleştirme kullan"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "çakışmalarda bizim sürümü kullan"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "çakışmalarda onların sürümünü kullan"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "çakışmalarda birlik olmuş bir sürüm kullan"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "çakışmalarda bu imleyici boyutunu kullan"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "çakışmalar hakkında uyarma"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "file1/orig-file/file2 için etiketler yapıştır"
 
@@ -17963,179 +17869,183 @@ msgstr "%s, %s ile birleÅŸtiriliyor\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<seçenekler>] [<işleme>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "'m' anahtarı bir değer gerektiriyor"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "'%s' seçeneği bir değer gerektiriyor"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Kullanılabilir stratejiler:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Kullanılabilir özel stratejiler:"
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "birleştirmenin sonunda bir diffstat gösterme"
 
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "birleştirmenin sonunda bir diffstat göster"
 
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(--stat eşanlamlısı)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "kısa günlükten birleştirme işlemesi iletisine girdiler (en çok <n>) ekle"
 
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "birleÅŸtirme yerine tek bir iÅŸleme oluÅŸtur"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "birleştirme başarılı olursa bir işleme gerçekleştir (öntanımlı)"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "göndermeden önce iletiyi düzenle"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "ileri sarıma izin ver (öntanımlı)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "ileri sarım olanaklı değilse iptal et"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "adı verilen işlemenin geçerli bir GPG imzası olduğunu doğrula"
 
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "strateji"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "kullanılacak birleştirme stratejisi"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "seçenek=değer"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "seçili birleştirme stratejisi için seçenekler"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "birleştirme işlemesi iletisi (ileri sarım olmayan bir birleştirme için)"
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "gerçek hedef yerine <ad> kullan"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
 
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort; ancak indeksi ve çalışma ağacını değiştirmeden bırakın"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "pre-merge-commit ve commit-msg kancalarını atla"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "zula yapılamadı"
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "zulalama başarısız oldu"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "geçerli bir nesne değil: %s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree başarısız oldu"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "Tümü güncel (tıkıştırılacak bir şey yok)."
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' bir iÅŸlemeye iÅŸaret etmiyor"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "İki uç işlemenin birleştirilmesi dışında bir şey yapılmıyor."
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "bilinmeyen strateji seçeneği: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "%s yazılamıyor"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Şu konumdan okunamadı: '%s'"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "Birleştirme işlenmiyor, tamamlamak için 'git commit' kullanın.\n"
 
-#: builtin/merge.c:829
+#: builtin/merge.c:831
 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"
@@ -18145,11 +18055,11 @@ msgstr ""
 "girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "BoÅŸ bir ileti iÅŸlemeyi iptal eder.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18158,72 +18068,72 @@ msgstr ""
 "'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n"
 "iptal eder.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "BoÅŸ iÅŸleme iletisi."
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Harika.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu işleyin.\n"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Geçerli dal yok."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Geçerli dal için uzak konum yok."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "%s için %s konumundan uzak izleme dalı yok"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Hatalı değer '%s', '%s' ortamında"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "birleÅŸtirebileceÄŸimiz bir ÅŸey deÄŸil"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort bir argüman beklemez"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ä°ptal edilecek bir birleÅŸtirme yok (MERGE_HEAD eksik)."
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit bir argüman beklemez"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue bir argüman beklemez"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ä°lerlemekte olan bir birleÅŸtirme yok (MERGE_HEAD eksik)."
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18231,7 +18141,7 @@ msgstr ""
 "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n"
 "Lütfen birleştirmeden önce değişikliklerinizi işleyin."
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18239,85 +18149,77 @@ msgstr ""
 "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n"
 "Lütfen birleştirmeden önce değişikliklerinizi işleyin."
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)."
 
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "--squash ile --no-ff birlikte kullanılamaz."
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "--squash ile --commit birlikte kullanılamaz."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "İleri sarım olmayan işlemeyi boş dal ucuna yapmak bir anlam ifade etmiyor"
 
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - birleÅŸtirebileceÄŸimiz bir ÅŸey deÄŸil"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Boş dal ucuna tam olarak yalnızca bir işleme birleştirilebilir"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Güncelleniyor: %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Yok.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "%s birleÅŸtirme stratejisi deneniyor...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "El ile çözümü hazırlamak için %s stratejisi kullanılıyor.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18360,7 +18262,7 @@ msgstr "stdin üzerindeki etiket bizim sıkı fsck denetimimizi geçemedi"
 msgid "tag on stdin did not refer to a valid object"
 msgstr "stdin üzerindeki etiket geçerli bir nesneye başvurmuyor"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "etiket dosyası yazılamıyor"
 
@@ -18424,7 +18326,7 @@ msgstr "yalnızca verilen indeksleri içeren çoklu paket indekslerini yaz"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "biteşlem işlemeleri seçmek için başvuruların anlık görüntüsünü al"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18525,52 +18427,52 @@ msgstr "%s, kaynak=%s, hedef:%s"
 msgid "Renaming %s to %s\n"
 msgstr "%s, %s olarak yeniden adlandırılıyor\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "'%s' yeniden adlandırılamadı"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<seçenekler>] <işleme>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<seçenekler>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<seçenekler>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "yalnızca başvuru tabanlı adları yazdır (nesne adı yok)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "işlemeleri adlandırmak için yalnızca etiketleri kullan"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "yalnızca <dizgi> ile eşleşen başvuruları kullan"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "<dizgi> ile eşleşen başvuruları yok say"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr "tüm başvurulardan ulaşılabilir olan tüm işlemeleri listele"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "stdin'den oku"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "'tanımlanmayan' adların yazdırılmasına izin ver (öntanımlı)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)"
 
@@ -18688,25 +18590,25 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Aşağıdaki nesneler için not yaz/düzenle:"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "'%s' nesnesi için 'show' başlatılamıyor"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "'show' çıktısı okunamadı"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "'%s' nesnesi için 'show' bitirilemedi"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "not içeriğini lütfen -m veya -F seçeneğini kullanarak sağlayın"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "not nesnesi yazılamıyor"
 
@@ -18715,7 +18617,7 @@ msgstr "not nesnesi yazılamıyor"
 msgid "the note contents have been left in %s"
 msgstr "not içeriği %s içinde bırakıldı"
 
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "'%s' açılamadı veya okunamadı"
@@ -18757,8 +18659,8 @@ msgstr "notları %s yapma (%s içinde) reddediliyor (refs/notes/ dışında)"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "çok fazla argüman"
 
@@ -18805,7 +18707,7 @@ msgstr ""
 msgid "Overwriting existing notes for object %s\n"
 msgstr "%s nesnesi için var olan notların üzerine yazılıyor\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "%s nesnesi için olan not kaldırılıyor\n"
@@ -18927,17 +18829,17 @@ msgstr "birleştirmek için bir not başvurusu belirtilmeli"
 msgid "unknown -s/--strategy: %s"
 msgstr "bilinmeyen -s/--strategy: %s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "%s konumuna bir not birleştirmesi halihazırda %s konumunda sürüyor"
 
-#: builtin/notes.c:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "geçerli not başvurusuna bağlantı depolanamadı (%s)"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18948,41 +18850,41 @@ msgstr ""
 "çözün ve sonucu 'git notes merge --commit' ile işleyin. Birleştirmeyi iptal "
 "etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "%s nesnesinin notu yok\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "var olmayan notu kaldırma denemesi bir hata değil"
 
-#: builtin/notes.c:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "nesne adlarını standart girdi'den oku"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "kaldırma, yalnızca göster"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "budanmış notları kaldır"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "not baÅŸvurusu"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "notları <not-bşvr>'ndan kullan"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "bilinmeyen altkomut: %s"
@@ -19382,10 +19284,6 @@ msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "--filter, --stdout olmadan kullanılamaz"
@@ -19402,7 +19300,7 @@ msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
 msgid "Enumerating objects"
 msgstr "Nesneler ortaya dökülüyor"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19447,19 +19345,19 @@ msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 "git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "budanmış nesneleri bildir"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "promisor paket dosyalarının dışındaki nesnelere taramayı kısıtla"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "bir precious-objects deposu içinde budama yapılamıyor"
 
@@ -19492,7 +19390,7 @@ msgstr "ileri sarıma izin ver"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "pre-merge-commit ve commit-msg kancalarının kullanımını denetle"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
 
@@ -19567,6 +19465,7 @@ msgid "<remote>"
 msgstr "<uzak-konum>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<dal>"
 
@@ -19598,13 +19497,13 @@ msgstr "%s iÅŸlemesine eriÅŸilemedi"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19618,28 +19517,28 @@ msgstr ""
 "belirtmeniz gerekiyor. Bunu bir sonraki çekimden önce\n"
 "aşağıdaki komutlardan birini çalıştırarak yapabilirsiniz:\n"
 "\n"
-"\tgit config pull.rebase false  # birleştir (öntanımlı strateji)\n"
+"\tgit config pull.rebase false  # birleÅŸtir\n"
 "\tgit config pull.rebase true   # yeniden temellendir\n"
-"\tgit config pull.ff only       # yalnızca ileri sarım\n"
+"\tgit config pull.ff only       # yalnızca ileri sar\n"
 "\n"
 "Tüm depolar için global bir tercih ayarlamak için \"git config\"i\n"
 "\"git config --global\" ile değiştirebilirsiniz. Öntanımlı\n"
 "yapılandırmayı yürütme sırasında --rebase, --no-rebase veya\n"
 "--ff-only ile bir kerelik geçersiz kılabilirsiniz.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor."
 
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "yeniden temellendirme ile çekim"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "Lütfen onları işleyin veya zulalayın."
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19650,7 +19549,7 @@ msgstr ""
 "Çalışma ağacınız %s işlemesinden\n"
 "ileri sarılıyor."
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19667,23 +19566,23 @@ msgstr ""
 "$ git reset --hard\n"
 "komutunu çalıştırın."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Boş dal ucuna birden çok dal birleştirilemez."
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "Birden çok dala yeniden temellendirme yapılamaz."
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Birden çok dala ileri sarım yapılamaz."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Iraksak dalların nasıl uzlaştırılacağının belirtilmesi gerekiyor."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
@@ -19844,9 +19743,10 @@ msgid ""
 "to integrate those changes locally (e.g., 'git pull ...')\n"
 "before forcing an update.\n"
 msgstr ""
-"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son çıkıştan bu\n"
-"yana güncellenmiş. Bir güncellemeyi zorlamadan önce bu değişiklikleri yerel\n"
-"olarak entegre etmek isteyebilirsiniz (örn. 'git pull ...'\n"
+"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son\n"
+"çıkıştan bu yana güncellenmiş. Bir güncellemeyi zorlamadan\n"
+"önce bu değişiklikleri yerel olarak entegre etmek isteye-\n"
+"bilirsiniz (örn. 'git pull ...'\n"
 
 #: builtin/push.c:355
 #, c-format
@@ -19858,7 +19758,7 @@ msgstr "Ä°tme konumu: %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "bazı başvurular '%s' konumuna itilemedi"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "depo"
 
@@ -19931,10 +19831,6 @@ msgstr "itmeyi GPG ile imzala"
 msgid "request atomic transaction on remote side"
 msgstr "uzak tarafta atomsal iÅŸlem iste"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete bir baÅŸvuru olmadan anlam ifade etmiyor"
@@ -19966,26 +19862,14 @@ msgstr ""
 "\n"
 "\tgit push <ad>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all ve --tags birbiriyle uyumsuz"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all başvuru belirteçleriyle birleştirilemez"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror ve --tags birbiriyle uyumsuz"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all ve --mirror birbiriyle uyumsuz"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
@@ -20411,18 +20295,6 @@ msgstr "Görünüşe göre 'git am' sürmekte. Yeniden temellendirilemiyor."
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges, --rebase-merges olarak deÄŸiÅŸtirildi"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "--keep-base ile --onto birlikte kullanılamaz"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "--keep-base ile --root birlikte kullanılamaz"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "--root ile --fork-point birlikte kullanılamaz"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Sürmekte olan bir yeniden temellendirme yok"
@@ -20489,8 +20361,8 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy, --merge veya --interactive gerektiriyor"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor"
+msgid "apply options and merge options cannot be used together"
+msgstr "uygulama seçenekleri ve birleştirme seçenekleri birlikte kullanılamaz"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20531,7 +20403,7 @@ msgid "no such branch/commit '%s'"
 msgstr "böyle bir dal/işleme yok: '%s'"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Böyle bir başvuru yok: %s"
@@ -20601,7 +20473,7 @@ msgstr "%s, %s konumuna ileri sarıldı.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dizini>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -20617,20 +20489,19 @@ msgid ""
 "To squelch this message and still keep the default behaviour, set\n"
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
-"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı güncelleme\n"
-"reddedilir; çünkü bu indeksi ve çalışma ağacını ittiğinizle tutarsız\n"
-"duruma getirir ve çalışma ağacını HEAD ile eşleştirmek için\n"
-"'git reset --hard' gerektirir.\n"
-"Geçerli dalına itmeye izin vermek için uzak depodaki 'receive."
-"denyCurrentBranch'\n"
-"yapılandırma değişkenini 'ignore' veya 'warn' olarak ayarlayabilirsiniz,\n"
-"ancak bu onun çalışma ağacını ittiğinizle eşleştirecek bir yol bulmadığınız\n"
-"sürece önerilmez.\n"
-"Bu iletiyi susturup öntanımlı davranışı tutmak için 'receive."
-"denyCurrentBranch'\n"
-"yapılandırma değişkenini 'refuse' olarak ayarlayın."
-
-#: builtin/receive-pack.c:1300
+"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı\n"
+"güncelleme reddedilir; çünkü bu indeksi ve çalışma ağacını\n"
+"ittiğinizle tutarsız duruma getirir ve çalışma ağacını HEAD\n"
+"ile eşleştirmek için 'git reset --hard' gerektirir.\n"
+"Geçerli dalına itmeye izin vermek için uzak depodaki\n"
+"'receive.denyCurrentBranch' yapılandırma değişkenini 'ignore'\n"
+"veya 'warn' olarak ayarlayabilirsiniz; ancak bu onun çalışma\n"
+"ağacını ittiğinizle eşleştirecek bir yol bulmadığınız sürece\n"
+"önerilmez. Bu iletiyi susturup öntanımlı davranışı tutmak için\n"
+"'receive.denyCurrentBranch' yapılandırma değişkenini 'refuse'\n"
+"olarak ayarlayın."
+
+#: builtin/receive-pack.c:1295
 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"
@@ -20641,22 +20512,24 @@ msgid ""
 "\n"
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
-"Öntanımlı olarak, geçerli dalı silme reddedilir; çünkü bir sonraki 'git "
-"clone'\n"
-"hiçbir dosyanın çıkış yapılamamasına neden olup karmaşa doğurur.\n"
+"Öntanımlı olarak, geçerli dalı silme reddedilir; çünkü bir\n"
+"sonraki 'git clone' hiçbir dosyanın çıkış yapılamamasına\n"
+"neden olup karmaÅŸa doÄŸurur.\n"
+"\n"
+"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan\n"
+"silinebilmesine izin vermek için uzak depodaki\n"
+"'receive.denyDeleteCurrent' yapılandırma değişkenini 'warn'\n"
+"veya 'ignore' olarak ayarlayabilirsiniz.\n"
 "\n"
-"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan silinebilmesine izin\n"
-"vermek için uzak depodaki 'receive.denyDeleteCurrent' yapılandırma\n"
-"deÄŸiÅŸkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n"
 "Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın."
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "sessiz"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Bir dizin belirtmelisiniz."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "bir dizin belirtmelisiniz"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20680,41 +20553,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <baÅŸvuru>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' geçerli bir zaman damgası değil"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Ulaşılabilir nesneler imleniyor..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s hiçbir yere işaret etmiyor!"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "silmek için bir başvuru günlüğü belirtilmedi"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "bir başvuru günlüğü değil: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "'%s' için başvuru günlüğü yok"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "geçersiz başvuru biçimi: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -20805,6 +20678,11 @@ msgstr "git remote update [<seçenekler>] [<grup> | <uzak-konum>]..."
 msgid "Updating %s"
 msgstr "%s güncelleniyor"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "%s getirilemedi"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21251,156 +21129,148 @@ msgid ""
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr ""
 "Artan yeniden paketlemeler biteÅŸlem indeksleri ile uyumsuzdur.\n"
-"--no-write-bitmap-index kullanın veya pack.writebitmaps yapılandırmasını\n"
-"devre dışı bırakın."
+"--no-write-bitmap-index kullanın veya pack.writebitmaps\n"
+"yapılandırmasını devre dışı bırakın."
 
 #: builtin/repack.c:201
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "%s için indeks açılamıyor"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "%s paketi, geometrik ilerlemede kullanmayı düşünmek için pek büyük"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "%s paketi, sarmak için pek büyük"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "geçici dosya '%s', yazma için açılamadı"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "başvurular anlık görüntü geçici dosyası kapatılamadı"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "her şeyi tek bir pakete sığdır"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "'git-pack-objects'e --no-reuse-delta geçir"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "'git-pack-objects'e --no-reuse-object geçir"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "'git-update-server-info' çalıştırma"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "--local'ı 'git-pack-objects'e geçir"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "biteÅŸlem indeksi yaz"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "yaklaşık tarih"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "-A ile, bundan daha eski nesneleri bırakma"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "delta sıkıştırması için kullanılan pencerenin boyutu"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "baytlar"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "yukarıdakiyle aynı; ancak girdi sayısı yerine bellek boyutunu kısıtla"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "olabilecek en büyük delta derinliğini kısıtlar"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "iş parçacıklarının olabilecek en büyük sayısını kısıtlar"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "her paket dosyasının olabilecek en büyük boyutu"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "nesneleri .keep ile imlenmiÅŸ paketlerde yeniden paketle"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "bu paketi yeniden paketleme"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "<N> faktörlü bir geometrik ilerleme bul"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "ortaya çıkan paketlerin bir çoklu paket indeksini yaz"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "bir precious-objects deposundaki paketler silinemiyor"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric, -A ve -a ile uyumsuz"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Paketlenecek yeni bir ÅŸey yok."
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "gereken dosya eksik: %s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "bağlantı kaldırılamadı: %s"
@@ -21483,67 +21353,61 @@ msgstr "cat-file hata bildirdi"
 msgid "unable to open %s for reading"
 msgstr "%s okuma için açılamıyor"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "mktree ortaya çıkarılamıyor"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "mktree'den okunamıyor"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree hata bildirdi"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree bir nesne adı döndürmedi"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "%s 'fstat' yapılamıyor"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "nesne veritabanına yazılamıyor"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "geçerli bir nesne adı değil: '%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "%s için nesne türü alınamadı"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "nesne dosyasını düzenleme başarısız"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "yeni nesne eskisiyle aynı: '%s'"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "%s, bir işleme olarak ayrıştırılamadı"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "'%s' işlemesinde hatalı birleştirme etiketi"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "'%s' işlemesinde hatalı oluşturulmuş birleştirme etiketi"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21552,31 +21416,31 @@ msgstr ""
 "'%s' orijinal işlemesi atılmış olan '%s' birleştirme etiketini içeriyor; --"
 "graft yerine --edit kullanın"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "'%s' orijinal işlemesinin bir gpg imzası var"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "imza, yerine geçecek işlemede kaldırılacak"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "şunun yerine geçecek işleme yazılamadı: '%s'"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "'%s' için aşı gereksiz"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "yeni işleme eskisiyle aynı: '%s'"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21585,71 +21449,71 @@ msgstr ""
 "aşağıdaki aşı(lar) dönüştürülemedi:\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "değiştirme başvurularını listele"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "değiştirme başvurularını sil"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "geçerli nesneyi düzenle"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "bir işlemenin üst ögelerini değiştir"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "mevcut aşı dosyasını dönüştür"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "baÅŸvuru mevcutsa onu deÄŸiÅŸtir"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "--edit içeriğini hoş biçimde gösterme"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "bu biçimi kullan"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format, listelemiyorken kullanılamaz"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f yalnızca yerine geçecek bir nesne yazılırken anlam ifade eder"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw yalnızca --edit ile anlam ifade eder"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d için en azından bir argüman gerekli"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "hatalı argüman sayısı"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e için tam olarak bir argüman gerekli"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g için en azından bir argüman gerekli"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file argüman almaz"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "-l ile yalnızca bir dizgi verilebilir"
 
@@ -21670,134 +21534,126 @@ msgstr "yol olmadan 'git rerere forget' kullanım dışı"
 msgid "unable to generate diff for '%s'"
 msgstr "'%s' için diff oluşturulamıyor"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<iÅŸleme>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<ağacımsı>] [--] <yol-blrtç>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ağacımsı>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<ağacımsı>] [--] [<yol-blrtç>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "karışık"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "yumuÅŸak"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "sert"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "birleÅŸtir"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "tut"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Geçerli bir HEAD'iniz yok."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "HEAD ağacı bulunamadı."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "%s ağacı bulunamadı."
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ÅŸimdi ÅŸurada: %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Bir birleştirmenin ortasında %s sıfırlaması yapılamıyor."
 
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "sessiz ol, yalnızca hataları bildir"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "HEAD'i ve indeksi sıfırla"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "yalnızca HEAD'i sıfırla"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "yalnızca kaldırılan yolların daha sonra ekleneceği gerçeğinin kaydını yaz"
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "'%s' geçerli bir revizyon olarak çözülemedi."
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "'%s' geçerli bir ağaç olarak çözülemedi."
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "belirtilmiş yol ile --mixed artık eski; yerine 'git reset -- <yollar>' "
 "kullanın."
 
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor."
 
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s sıfırlamasına çıplak bir depoda izin verilmiyor"
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N yalnızca --mixed ile birlikte kullanılabilir"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21810,19 +21666,15 @@ msgstr ""
 "sürdü. Bundan kaçınmak için --quiet kullanabilir, öntanımlı yapmak içinse\n"
 "reset.quiet yapılandırma değişkenini 'true' olarak değiştirebilirsiniz.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı."
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "Yeni indeks dosyası yazılamadı."
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "nesne süzme --objects gerektiriyor"
@@ -21832,8 +21684,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list not görüntülemesini desteklemiyor"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "imlenmiş sayım, --objects ile uyumsuz"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "imli sayım ve '%s' birlikte kullanılamaz"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22274,12 +22127,6 @@ msgstr "<n>[,<temel>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "tabanda başlayarak en yeni <n> başvuru günlüğü girdilerini göster"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog; --all, --remotes, --independent veya --merge-base ile uyumsuz"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "dal verilmedi ve HEAD geçersiz"
@@ -22300,19 +22147,19 @@ msgstr[1] "aynı anda yalnızca %d girdi gösterilebilir"
 msgid "no such ref %s"
 msgstr "böyle bir başvuru yok: %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "%d revizyondan başkası ele alınamıyor."
 msgstr[1] "%d revizyondan başkası ele alınamıyor."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' geçerli bir başvuru değil."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "%s işlemesi bulunamıyor (%s)"
@@ -22377,12 +22224,16 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <seçenekler>"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "bu çalışma ağacı aralıklı değil"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22391,75 +22242,99 @@ msgstr ""
 "'%s' dizini izlenmeyen dosyalar içeriyor; ancak aralıklı çıkış konisinde "
 "deÄŸil"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "'%s' dizini kaldırılamadı"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "depo biçimi worktreeConfig etkinleştirmesi için yükseltilemiyor"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "sparse-index yapılandırması değiştirilemedi"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "aralıklı çıkışı koni kipinde ilklendir"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
-msgstr "bir aralıklı indeksin kullanımını aç/kapa"
-
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "sparse-index yapılandırması değiştirilemedi"
+msgstr "bir aralıklı indeksin kullanımını aç/kapat"
 
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "'%s' açılamadı"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "'%s' yolu olağanlaştırılamadı"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "mevcut aralıklı çıkış dizgileri koni kipini kullanmıyor"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <dizgiler>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "dizgileri stdin'den oku"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "kendisine eklenecek bir aralıklı çıkış yok"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<dizgiler>)"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr ""
+"aralıklılık dizgilerinin yeniden uygulanması için bir aralıklı çıkış içinde "
+"olmalı"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "çalışma dizini yenilenirken hata"
 
@@ -22485,22 +22360,26 @@ msgstr "git stash branch <dal-adı> [<zula>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
 "          [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
 "          [--] [<yol-blrtç>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ileti>]"
 
 #: builtin/stash.c:55
@@ -22594,140 +22473,156 @@ msgstr "%s, %s ile birleÅŸtiriliyor"
 msgid "Index was not unstashed."
 msgstr "İndeks zuladan çıkartılmamıştı."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "indeks yeniden oluşturulmaya çalışılıyor"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s bırakıldı (%s)"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Zula girdisi bırakılamadı"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' bir zula baÅŸvurusu deÄŸil"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Dal adı belirtilmedi"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "ağaç ayrıştırılamadı"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "ağaçların paketi açılamadı"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "zulada izlenmeyen dosyaları içer"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "zulada yalnızca izlenmeyen dosyaları göster"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "%s, %s ile güncellenemiyor"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "zula iletisi"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Hazırlanan değişiklik yok"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "Değişiklik seçilmedi"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "Henüz ilk işleme yapılmamış"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "Geçerli indeks durumu kaydedilemiyor"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Ä°zlenmeyen dosyalar kaydedilemiyor"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Geçerli hazırlananlar durumu kaydedilemiyor"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "--staged, --include-untracked veya --all hepsi bir anda kullanılamıyor"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "'git add' yapmayı mı unuttunuz?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Kaydedilecek yerel deÄŸiÅŸiklik yok"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Zula ilklendirilemiyor"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Geçerli durum kaydedilemiyor"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "indeksi tut"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "yalnızca hazırlanan değişiklikleri zulala"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "yama kipinde zula"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "sessiz kip"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "zulada izlenmeyen dosyaları içer"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "yok sayma dosyalarını içer"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22751,7 +22646,7 @@ msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır"
 msgid "prepend comment character and space to each line"
 msgstr "her satırın başına yorum karakteri ve boşluk koy"
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
@@ -22774,7 +22669,7 @@ msgstr ""
 "'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
 "varsayılıyor."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "göreceli yollar için alternatif tutturucu"
 
@@ -22810,7 +22705,7 @@ msgid ""
 "."
 msgstr ""
 "run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
-"sıfır olmayan durum döndürdü"
+"sıfır olmayan durum döndürdü."
 
 #: builtin/submodule--helper.c:561
 msgid "suppress output of entering each submodule command"
@@ -22868,7 +22763,7 @@ msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi"
 msgid "failed to recurse into submodule '%s'"
 msgstr "'%s' altmodülüne özyinelenemedi"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "altmodül durum çıktısını gizle"
 
@@ -22937,10 +22832,6 @@ msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]"
 msgid "could not fetch a revision for HEAD"
 msgstr "HEAD için bir revizyon getirilemedi"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached ve --files birlikte kullanılamaz"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -22969,16 +22860,16 @@ msgstr "altmodül url'si eşitleme çıktısını gizle"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil "
-"olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)"
+"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor. Bu, absorbgitdirs "
+"kullanılarak bir .git dosyası ile değiştirilecek."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -22987,47 +22878,47 @@ msgstr ""
 "Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için "
 "'-f' kullanın"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "'%s' dizini temizlendi\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "boş altmodül dizini %s oluşturulamadı"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "tüm altmodüllerin kaydını kaldır"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' "
 "kullanın"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -23039,68 +22930,68 @@ msgstr ""
 "submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
 "--reference yerine --reference-if-able kullanarak klonlayın."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "'%s' altmodülü alternatif ekleyemiyor: %s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı"
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı"
 
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr ""
 "başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "dizin boÅŸ deÄŸil: '%s'"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "'%s' için altmodül dizini alınamadı"
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "yeni altmodülün nereye klonlanacağı"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "yeni altmodülün adı"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "altmodülün klonlanacağı url konumu"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "sığ klonların derinliği"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "zorla klonla"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "boÅŸ olmayan dizine klonlamaya izin verme"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23109,93 +23000,93 @@ msgstr ""
 "git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
 "[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Altmodül yolu '%s' ilklendirilmedi"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "'update --init' mi kullanmak istersiniz?"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Birleştirilmemiş altmodül %s atlanıyor"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "'%s' altmodülü atlanıyor"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor"
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Şu altmodül yolunda '%s' çıkışı yapılamadı: '%s'"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Şu altmodül yolunda '%s' yeniden temellendirilemedi: '%s'"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Şu altmodül yolunda '%s' birleştirilemedi: '%s'"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "Şu altmodül yolunda '%s %s' çalıştırılamadı: '%s'"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "Altmodül yolu '%s': '%s' çıkışı yapıldı\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "Altmodül yolu '%s': '%s' üzerine yeniden temellendirildi\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "Altmodül yolu '%s': '%s' içinde birleştirildi\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "Altmodül yolu '%s': '%s %s'\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 "'%s' altmodül yolunda getirme yapılamadı; %s doğrudan getirilmeye "
 "çalışılıyor:"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23204,85 +23095,85 @@ msgstr ""
 "'%s' altmodül yolunda getirme yapıldı; ancak %s içermiyor. Bu işlemenin "
 "doğrudan getirilmesi başarısız oldu."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "çalışma ağacına giden yol"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol"
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout veya none"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "belirli bir revizyon sayısına kısaltılmış sığ klon oluştur"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "paralel iÅŸler"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği"
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "klonlama işlemini yazdırma"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "güncelleme parametresi için hatalı değer"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr "güncelleme çıktısını yeniden temellendirme veya birleştirme ile sustur"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "güncellemeleri zorla çıkış yap"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "yeni nesneleri uzak konumdan getirme"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr ""
 "deponun taze bir klon olması durumunda güncelleme kipini geçersiz kılar"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "sığ getirme derinliği"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "superproject tarafından SHA1 bekleniyordu"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "altmodülün HEAD'inin SHA1'i"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<seçenekler>] [<yol>]"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23291,94 +23182,90 @@ msgstr ""
 "Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak "
 "süperproje herhangi bir dalda değil"
 
-#: builtin/submodule--helper.c:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "'%s' altmodülü için depo tutacağı alınamadı"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "altmodüllere özyinele"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <ad> [<deÄŸer>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <ad>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "bir altmodül url ayarlanması çıktısını gizle"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "öntanımlı izleme dalını master olarak ayarla"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "öntanımlı izleme dalını ayarla"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <yol>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <dal> <yol>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "--branch veya --default gerekli"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch ve --default birlikte kullanılamaz"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' halihazırda mevcut ve geçerli bir git deposu değil"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23395,85 +23282,85 @@ msgstr ""
 "depo deÄŸilse veya bunun ne anlama geldiÄŸinden emin deÄŸilseniz\n"
 "'--name' seçeneği ile başka bir ad seçin."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "'%s' altmodülü için yerel git dizini yeniden etkinleştiriliyor\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "'%s' altmodülü çıkış yapılamıyor"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "'%s' altmodülü eklenemedi"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "'%s' altmodülü kaydı yapılamadı"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' indekste halihazırda var"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' indekste halihazırda var ve bir altmodül değil"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "altmodül olarak eklenecek depo dalı"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "başka bir durumda yok sayılan altmodül yolunun eklenmesine izin ver"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "yalnızca hata iletilerini yazdır"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "nesneleri başvuru depolarından ödünç al"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr ""
 "altmodülün adını kendi yoluna öntanımlamak yerine verilen dizi olarak ayarlar"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<seçenekler>] [--] <depo> [<yol>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "depo URL'si: '%s' mutlak olmalı veya ./|../ ile başlamalıdır"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' geçerli bir altmodül adı değil"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s, --super-prefix desteklemiyor"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
@@ -23571,11 +23458,11 @@ msgstr ""
 "'%c' ile başlayan satırlar tutulacaktır; isterseniz onları "
 "kaldırabilirsiniz.\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "etiket imzalanamıyor"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23588,15 +23475,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
-msgstr "hatalı nesne türü"
+msgstr "hatalı nesne türü."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "etiket iletisi yok mu?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Etiket iletisi %s içinde bırakıldı\n"
@@ -23677,46 +23564,22 @@ msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
 msgid "print only tags of the object"
 msgstr "yalnızca nesnenin etiketlerini yazdır"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column ve -n birbiriyle uyumsuz"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr ""
-"--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "yalnızca bir -F veya -m seçeneğine izin verilir"
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "'%s' seçeneğine yalnızca liste kipinde izin verilir"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' geçerli bir etiket adı değil."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "'%s' etiketi halihazırda var"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "'%s' etiketi güncellendi (%s idi)\n"
@@ -24143,130 +24006,118 @@ msgstr "'%s' dizini oluşturulamadı"
 msgid "initializing"
 msgstr "ilklendiriliyor"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumundaydı)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
 
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "yeni bir dal oluÅŸtur"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "yeni bir dal oluştur veya sıfırla"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "yeni çalışma ağacını doldur"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "yeni çalışma ağacını kilitli tut"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "kilitleme nedeni"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "izleme kipini ayarla (bkz: git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B ve --detach birlikte kullanılamaz"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason, --lock gerektiriyor"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "--lock ile eklendi"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose ve --porcelain birlikte kullanılamaz"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' bir çalışma ağacı değil"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz"
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' halihazırda kilitli, nedeni: %s"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' halihazırda kilitli"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' kilitli deÄŸil"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' bir ana çalışma ağacı"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "hedef adı şuradan anlaşılamadı: '%s'"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24275,7 +24126,7 @@ msgstr ""
 "kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n"
 "geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24283,38 +24134,38 @@ msgstr ""
 "kilitli bir çalışma ağacı taşınamıyor;\n"
 "geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "'%s' -> '%s' taşıması başarısız"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "'%s' üzerinde 'git status' çalıştırılamadı"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force "
 "kullanın"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24323,7 +24174,7 @@ msgstr ""
 "kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n"
 "geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24331,17 +24182,17 @@ msgstr ""
 "kilitli bir çalışma ağacı kaldırılamıyor;\n"
 "geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "ÅŸunu onar %s: %s"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "hata: %s: %s"
@@ -24392,21 +24243,16 @@ msgstr ""
 "için 'git help <komut>' veya 'git help <konsept>' yazın. Genel bir görünüm\n"
 "için 'git help git' kullanabilirsiniz."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "--git-dir için dizin verilmedi\n"
+msgid "no directory given for '%s' option\n"
+msgstr "'%s' seçeneği için bir dizin verilmedi\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "--namespace için ad alanı verilmedi\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "--work-tree için dizin verilmedi\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24422,11 +24268,6 @@ msgstr "-c bir yapılandırma dizisi bekliyor\n"
 msgid "no config key given for --config-env\n"
 msgstr "--config-env için bir yapılandırma anahtarı verilmedi\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "-C için dizin verilmedi\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -24456,29 +24297,29 @@ msgstr "%s için boş arma"
 msgid "recursive alias: %s"
 msgstr "özyineli arma: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "standart çıktı'da yazma hatası"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "standart çıktı'da bilinmeyen yazma hatası"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "standart çıktı'da kapatma başarısız"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "arma döngüsü algılandı: '%s' genişletilmesi sonlanmıyor:%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "%s bir yerleşik olarak ele alınamıyor"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24487,34 +24328,26 @@ msgstr ""
 "kullanım: %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "'%s' armasının genişletilmesi başarısız oldu; '%s' bir git komutu değil\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "'%s' komutu çalıştırılamadı: %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "bir git deposu deÄŸil"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile, --index-pack-args gerektiriyor"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args yalnızca --packfile ile kullanılabilir"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "beklenmeyen seçenekler"
@@ -24795,6 +24628,176 @@ msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "bir çalışma dizini gerekiyor"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "gönüllü yazılma kaydı bulunamıyor"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "şuraya geçilemedi: '%s'"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "%s=%s yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "log.excludeDecoration yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar gönüllü kayıtları bir çalışma ağacı gerektiriyor"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "uzak konum HEAD'i bir dal deÄŸil: '%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr ""
+"uzak konumdan öntanımlı dal adı alınamadı; yerel öntanımlı kullanılıyor"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "öntanımlı dal adı alınamadı"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "depo kaydı silinemedi"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "gönüllü kayıt dizini silinemedi"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "klonlama sonrası çıkış yapılacak dal"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "klonlama sırasında tam çalışma dizini oluştur"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "yalnızca çıkış yapılacak dalın üstverisini indir"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<seçenekler>] [--] <depo> [<dizin>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "'%s' ögesinden çalışma ağacı adı ortaya çıkarılamıyor"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "'%s' dizini halihazırda var"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "'%s' için öntanımlı dal alınamadı"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "'%s' içindeki uzak konum yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "'%s' yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "kısımsal klonlama başarısız; tam klonlama deneniyor"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "tam klonlama için yapılandırılamadı"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "'scalar list' argüman almıyor"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<gönüllükayıt>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "tüm kaydı yapılmış gönüllü kayıtları yeniden yapılandır"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <gönüllükayıt>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all veya <gönüllükayıt>; ancak ikisi değil"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git deposu '%s' içinde gitti"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <görev> [<gönüllükayıt>]\n"
+"Görevler:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "böyle bir görev yok: '%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <gönüllükayıt>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "geçerli çalışma dizinini silme reddediliyor"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "Git sürümünü içer"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "Git'in yapı seçeneklerini içer"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <komut> [<seçenekler>]\n"
+"\n"
+"Komutlar:\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "derleyici bilgisi mevcut deÄŸil\n"
@@ -24819,37 +24822,37 @@ msgstr "son kullanım tarihi"
 msgid "no-op (backward compatibility)"
 msgstr "işlem yok (geriye dönük uyumluluk için)"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "daha ayrıntılı anlat"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "daha sessiz ol"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "iletiden boşlukları ve #yorumları çıkart"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "yol belirtecini dosyadan oku"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 "--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "anahtar"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "üzerine sıralanacak alan adı"
 
@@ -24919,17 +24922,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "Kişilerin adlarını ve e-posta adreslerini göster"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Dal değiştir veya çalışma ağacını eski haline geri getir"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Dosyaları indeksten çalışma ağacına kopyala"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Henüz üstkaynağa uygulanmayan işlemeleri bul"
@@ -25124,413 +25127,413 @@ msgid "Add or parse structured information in commit messages"
 msgstr "İşleme iletilerine düzenli bilgi ekle veya ayrıştır"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git depo tarayıcısı"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "İşleme günlüklerini göster"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "İndeks ve çalışma ağacındaki dosya bilgilerini göster"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Uzak bir depodaki başvuruları listele"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Bir ağaç nesnesinin içeriğini listele"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Yalın UNIX mbox bölücü yazılımı"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Git depo verisini eniyilemek için görevler çalıştır"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "İki veya daha fazla geliştirme geçmişini birleştir"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Birleştirme için olabildiğince en iyi ortak ataları bul"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Bir 3 yönlü dosya birleştirmesi çalıştır"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Birleştirilmesi gereken dosyaları birleştir"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Bu yardımcı program git-merge-index kullanımı içindir"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "multi-pack-index doÄŸrula ve yaz"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "Ek doğrulamalı bir etiket nesnesi oluştur"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "ls-tree biçimli metinden bir ağaç nesnesi yap"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "multi-pack-index doÄŸrula ve yaz"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Dosya, dizin veya sembolik bağları taşı/yeniden adlandır"
 
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Verilen revizyonlar için sembolik adları bul"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Nesne notları ekle veya incele"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Perforce depolarından içe aktar ve onlara gönder"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "PaketlenmiÅŸ bir nesne arÅŸivi oluÅŸtur"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Gereksiz paket dosyalarını bul"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Etkili depo erişimi için dal uçları ve etiketler paketle"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Bir yama için eşi olmayan numara hesapla"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ulaşılamayan tüm nesneleri nesne veritabanından buda"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Halihazırda paket dosyalarında olan ek nesneleri kaldır"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "BaÅŸka bir depo veya yerel daldan getir ve entegre et"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "İlişkin nesnelerle birlikte uzak başvuruları da güncelle"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Geçerli dala bir \"Quilt\" yama seti uygula"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "İki işleme erimini karşılaştır (bir dalın iki sürümü)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "Ağaç bilgisini indekse okur"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "İşlemeleri başka bir temel ucu üzerine uygula"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Depoya ne itildiyse al"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Başvuru günlüğü bilgisini yönet"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "İzlenen depolar setini yönet"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "Bir depodaki paketlenmemiÅŸ nesneleri paketle"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Nesne değiştirmek için başvurular oluştur, sil, listele"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "Bekleyen değişikliklerin bir özetini çıkart"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Çakışan birleştirmelerin kayıtlı çözümlerini yen. kullan"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "Geçerli HEAD'i belirtilen duruma sıfırla"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Çalışma ağacı dosyalarını eski durumuna getir"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Bazı var olan işlemeleri geri al"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "İşleme nesnelerini ters kronolojik sırada listele"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Parametreleri al ve üzerinde çalış"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Bazı var olan işlemeleri geri al"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Dosyaları çalışma ağacından ve indeksten kaldır"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Bir yama derlemesini e-posta olarak gönder"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "Nesneleri Git protokolü üzerinden başka bir depoya it"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Kabuk betikleri için Git'in i18n kurulum kodu"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Ortak Git kabuk betiÄŸi kurulum kodu"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Yalnızca Git SSH erişimi için kısıtlandırılmış oturum açma kabuğu"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "'git log' çıktısını özetle"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Çeşitli türlerden nesneleri göster"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Dalları ve onların işlemelerini göster"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Paketlenmiş arşiv indeksini göster"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Yerel bir depodaki başvuruları listele"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Kabuk betikleri için Git'in i18n kurulum kodu"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Ortak Git kabuk betiÄŸi kurulum kodu"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Aralıklı çıkışı ilklendir ve güncelle"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Dosya içeriğini hazırlama alanına ekle"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Kirli bir çalışma dizinindeki değişiklikleri zulala"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Dosya içeriğini hazırlama alanına ekle"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Çalışma ağacı durumunu göster"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Gereksiz boşlukları kaldır"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Altmodülleri ilklendir, güncelle veya incele"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Bir Subversion ve Git deposu arasında iki yönlü işlemler"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Dal deÄŸiÅŸtir"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "Sembolik başvuruları oku, düzenle ve sil"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "GPG imzalı bir etiket oluştur, sil, listele veya doğrula"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Bir ikili nesnenin içeriği ile geçici bir dosya oluştur"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Paketlenmiş bir arşivden nesneleri çıkar"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "Çalışma ağacındaki dosya içeriğini indekse kaydet"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "Güvenlice bir başvuruda depolanan nesne adını güncelle"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Programlanamayan sunuculara destek için yardımcı veri dosyasını güncelle"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Arşivi git-archive'e geri gönder"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Nesneleri git-fetch-pack'e paketlenmiş olarak geri gönder"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Bir mantıksal Git değişkeni göster"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "İşlemelerin GPG imzasını denetle"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Paketlenmiş Git arşiv dosyalarını doğrula"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Etiketlerin GPG imzasını doğrula"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web arabirimi (Git depoları için web ön ucu)"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Günlükleri her işlemenin sunduğu değişikliklerle göster"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Birden çok çalışma ağacını yönet"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Geçerli indeksten bir ağaç nesnesi oluştur"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "Öznitelikleri yola göre tanımla"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Git komut satırı arabirimi ve kuralları"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Git'e kullanıcı adları ve parolalar belirt"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "CVS kullanıcıları için Git"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "diff çıktısı için ince ayarlar"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Günlük Git kullanımı için yararlı komutlar"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Git kullanımı hakkında sıkça sorulan sorular"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Git Kavram Dizini"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Git tarafından kullanılan kancalar"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Özellikle yok sayılması istenen dosyaları belirt"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Git depo tarayıcısı"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "Yazar/İşleyici adlarını ve/veya e-posta adreslerini eşlemle"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Altmodül özelliklerini tanımlama"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Git ad alanları"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Uzak depolar ile etkileşim için yardımcı programlar"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Git Depo YerleÅŸimi"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Git için revizyonları ve erimleri belirtme"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Bir depoyu bir başkasının içine bağlama"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Git'e GiriÅŸ"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Git'e Giriş: Bölüm 2"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Git'e GiriÅŸ"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web arabirimi (Git depoları için web ön ucu)"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -25574,7 +25577,7 @@ msgstr "$pretty_name ile yalın birleştirme deneniyor"
 
 #: git-merge-octopus.sh:102
 msgid "Simple merge did not work, trying automatic merge."
-msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor"
+msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor."
 
 #: git-submodule.sh:401
 #, sh-format
@@ -25605,39 +25608,39 @@ msgstr "'$displaypath' altmodül yoluna özyinelenemedi"
 msgid "usage: $dashless $USAGE"
 msgstr "kullanım: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "$cdup konumuna chdir yapılamıyor, çalışma ağacının en üst düzeyi"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
-msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz"
+msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "Dallar yeniden yazılamıyor: Hazırlanmamış değişiklikleriniz var."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "$action yapılamıyor: Hazırlanmamış değişiklikleriniz var."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "$action yapılamıyor: İndeksinizde işlenmemiş değişiklikleriniz var."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "Ek olarak, indeksinizde iÅŸlenmemiÅŸ deÄŸiÅŸiklikleriniz var."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "Bu komutu çalışma ağacının en üst düzeyinden çalıştırmanız gerekiyor."
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Git dizininin kesin yolu algılanamıyor"
 
@@ -25719,7 +25722,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "parça düzenleme dosyası okuma için açılamadı: %s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25733,7 +25736,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırla\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25747,7 +25750,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları zulala\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini zulalama"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25761,7 +25764,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25775,7 +25778,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25789,7 +25792,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25803,7 +25806,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları at\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini atma"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25817,7 +25820,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25831,7 +25834,7 @@ msgstr ""
 "a - bu parçayı ve sonraki tüm parçaları uygula\n"
 "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25853,90 +25856,90 @@ msgstr ""
 "e - geçerli parçayı el ile düzenle\n"
 "? - yardımı yazdır\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Seçili parçalar indekse uygulanamıyor!\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "birleştirilmeyenler yok sayılıyor: %s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "Ekleme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Gidilecek başka parça yok\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Geçersiz sayı: '%s'\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
 msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Aranacak başka parça yok\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Hatalı oluşturulmuş arama düzenli ifadesi %s: %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Verilen dizgi ile hiçbir parça eşleşmiyor\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Öncesinde parça yok\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Sonrasında parça yok\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Üzgünüm, bu parça bölünemiyor\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "%d parçaya bölündü.\n"
 msgstr[1] "%d parçaya bölündü.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Üzgünüm, bu parça düzenlenemiyor\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -25954,56 +25957,56 @@ msgstr ""
 "add untracked - izlenmeyen dosyaların içeriğini hazırlanan değişiklik setine "
 "ekle\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "-- eksik"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "bilinmeyen --patch kipi: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "geçersiz argüman %s, -- bekleniyor"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n"
 
-#: git-send-email.perl:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' yazılan e-postayı içeriyor.\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26011,14 +26014,14 @@ msgid ""
 msgstr ""
 "onulmaz: 'sendmail' için yapılandırma seçenekleri bulundu\n"
 "git-send-email, sendemail.* seçenekleri ile yapılandırılmıştır.\n"
-"'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini 'false'\n"
-"yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
+"'e'ye dikkat edin. sendemail.forbidSendmailVariables seçeneğini\n"
+"'false' yaparak bu denetimi devre dışı bırakabilirsiniz.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n"
 
-#: git-send-email.perl:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26026,37 +26029,37 @@ msgstr ""
 "'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
 "yapılandırma seçeneklerinden)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Bilinmeyen --confirm ayarı: '%s'\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "uyarı: ':include:' desteklenmiyor: %s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n"
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26071,12 +26074,12 @@ msgstr ""
 "\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n"
 "\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "%s opendir yapılamadı: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26086,17 +26089,17 @@ msgstr ""
 "Hiçbir yama dosyası belirtilmedi!\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "%s içinde konu satırı yok mu?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "%s yazma için açılamadı: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26110,38 +26113,38 @@ msgstr ""
 "\n"
 "Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "%s açılamadı: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "%s.final açılamadı: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "Özet e-postası boş, atlanıyor\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "<%s> kullanmak istediÄŸinizden emin misiniz [y/N]? "
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 "Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n"
 
-#: git-send-email.perl:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26154,22 +26157,22 @@ msgstr ""
 "içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek "
 "istiyorsanız --force kullanın.\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?"
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "onulmaz: '%s' arması kendisine genişliyor\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer "
-"gerekliyse)?"
+"gerekliyse)? "
 
-#: git-send-email.perl:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
@@ -26177,16 +26180,16 @@ msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): "
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA yolu \"%s\" mevcut deÄŸil"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26212,115 +26215,115 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış."
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Sunucu STARTTLS desteklemiyor! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS başarısız oldu! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug "
 "yapın."
 
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "%s gönderilemedi\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "%s gönderilir gibi yapıldı\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gönderildi\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Sınama tamam. Günlük çıktısı:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "Tamam. Günlük çıktısı:\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Sonuç: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Sonuç: Tamam\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "%s dosyası açılamıyor"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n"
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) '%s' çalıştırılamadı"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "ileti 7 bit olarak gönderilemiyor"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "geçersiz aktarım kodlaması"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26331,12 +26334,12 @@ msgstr ""
 "%s\n"
 "uyarı: hiçbir yama gönderilmedi\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26345,13 +26348,13 @@ msgstr ""
 "onulmaz: %s:%d, 998 karakterden uzun\n"
 "uyarı: hiçbir yama gönderilmedi\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "%s, yedek sonek '%s' ile atlanıyor.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: "
diff --git a/po/vi.po b/po/vi.po
index be197ab594..0d5b14438a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,15 +2,15 @@
 # Bản dịch tiếng Việt dành cho GIT-CORE.
 # This file is distributed under the same license as the git-core package.
 # Nguyễn Thái Ng�c Duy <pclouds@gmail.com>, 2012.
-# Trần Ng�c Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012-2022.
 # �oàn Trần Công Danh <congdanhqx@gmail.com>, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.34.0 round 3\n"
+"Project-Id-Version: git v2.35.0 round 2\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-11 13:18+0700\n"
+"POT-Creation-Date: 2022-01-17 08:31+0800\n"
+"PO-Revision-Date: 2022-01-17 14:14+0700\n"
 "Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: add-interactive.c:380
 #, c-format
 msgid "Huh (%s)?"
 msgstr "Hả (%s)?"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "không thể đ�c bảng mục lục"
@@ -56,7 +56,7 @@ msgstr "Cập nhật"
 msgid "could not stage '%s'"
 msgstr "không thể đưa “%s� lên bệ phóng"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "không thể ghi bảng mục lục"
 
@@ -71,8 +71,8 @@ msgstr[0] "đã cập nhật %d đư�ng dẫn\n"
 msgid "note: %s is untracked now.\n"
 msgstr "chú ý: %s gi� đã b� theo dõi.\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, 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�"
@@ -111,21 +111,21 @@ msgstr[0] "đã thêm %d đư�ng dẫn\n"
 msgid "ignoring unmerged: %s"
 msgstr "b� qua những thứ chưa hòa trộn: %s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "Không có thay đổi nào.\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "Cập nhật miếng vá"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "Xem xét lại diff"
 
@@ -199,11 +199,11 @@ msgstr "tùy ch�n mục bằng số"
 msgid "(empty) select nothing"
 msgstr "(để trống) không ch�n gì"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** Lệnh ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "Gi� thì sao"
 
@@ -215,13 +215,13 @@ msgstr "đã đưa lên bệ phóng"
 msgid "unstaged"
 msgstr "chưa đưa lên bệ phóng"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "đư�ng-dẫn"
@@ -230,27 +230,27 @@ msgstr "đư�ng-dẫn"
 msgid "could not refresh index"
 msgstr "không thể đ�c lại bảng mục lục"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "Tạm biệt.\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "Xóa kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "Thêm vào bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "�ưa lên bệ phóng khúc này [y,n,q,a,d%s,?]? "
@@ -278,22 +278,22 @@ msgstr ""
 "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
 "tin\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "Thêm vào tạm cất [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? "
@@ -320,22 +320,22 @@ msgstr ""
 "a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "Thay đổi chế độ b� ra kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "Xóa b� việc b� ra kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "Thêm vào việc b� ra kh�i bệ phóng [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "B� ra kh�i bệ phóng khúc này [y,n,q,a,d%s,?]? "
@@ -364,22 +364,22 @@ msgstr ""
 "d - đừng đưa ra kh�i bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
 "tập tin\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "�p dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "�p dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "�p dụng các thêm vào mục lục [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "�o dụng khúc này vào mục lục [y,n,q,a,d%s,?]? "
@@ -406,26 +406,26 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại b� các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại b� việc xóa kh�i cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "Thêm các loại b� kh�i cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại b� khúc này kh�i cây làm việc [y,n,q,a,d%s,?]? "
@@ -452,22 +452,22 @@ msgstr ""
 "a - loại b� khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại b� khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại b� thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại b� việc xóa kh�i mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Thêm các loại b� từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "Loại b� khúc này kh�i mục lục và cây làm việc [y,n,q,a,d%s,?]? "
@@ -486,22 +486,22 @@ msgstr ""
 "a - loại b� khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại b� khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng thêm vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
@@ -639,7 +639,7 @@ msgstr "“git apply --cached� gặp lỗi"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr ""
@@ -650,11 +650,11 @@ msgstr ""
 msgid "The selected hunks do not apply to the index!"
 msgstr "Các khúc đã ch�n không được áp dụng vào bảng mục lục!"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "Vẫn áp dụng chúng cho cây làm việc? "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "�ã không áp dụng gì cả.\n"
 
@@ -692,11 +692,11 @@ msgstr "Không có khúc kế tiếp"
 msgid "No other hunks to goto"
 msgstr "Không còn khúc nào để mà nhảy đến"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "nhảy đến khúc nào? "
 
@@ -715,7 +715,7 @@ msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc."
 msgid "No other hunks to search"
 msgstr "Không còn khúc nào để mà tìm kiếm"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "tìm kiếm cho biểu thức chính quy? "
 
@@ -806,7 +806,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:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 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)."
 
@@ -904,21 +904,33 @@ 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:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject và --3way không thể dùng cùng nhau."
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way ở ngoài một kho chứa"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index ở ngoài một kho chứa"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached ở ngoài một kho chứa"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "tùy ch�n '%s' và '%s' không thể dùng cùng nhau"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' ở ngoài một kho chứa"
 
 #: apply.c:800
 #, c-format
@@ -1131,8 +1143,8 @@ msgstr "gặp lỗi khi vá: %s:%ld"
 msgid "cannot checkout %s"
 msgstr "không thể lấy ra %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "gặp lỗi khi đ�c %s"
@@ -1142,383 +1154,382 @@ msgstr "gặp lỗi khi đ�c %s"
 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:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "đư�ng dẫn %s đã bị xóa hoặc đổi tên"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, 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:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: không khớp trong mục lục"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "kho thiếu đối tượng blob cần thiết để thực hiện hòa trộn “3-way�."
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "�ang thực hiện hòa trộn “3-đư�ng�…\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, 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:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "Gặp lỗi khi thực hiện hòa trộn kiểu “three-way�…\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, 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:3647
+#: apply.c:3649
 #, 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:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "�ang trở lại ứng dụng chi phối…\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "loại b� miếng vá để lại nội dung tập tin"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiểu"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s có kiểu %o, cần %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "đư�ng dẫn không hợp lệ “%s�"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: đã có từ trước trong bảng mục lục"
 
-#: apply.c:3978
+#: apply.c:3980
 #, 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:3998
+#: apply.c:4000
 #, 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:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, 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:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miếng vá không được áp dụng"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "�ang kiểm tra miếng vá %s…"
 
-#: apply.c:4134
+#: apply.c:4136
 #, 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:4141
+#: apply.c:4143
 #, 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:4144
+#: apply.c:4146
 #, 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:4153
+#: apply.c:4155
 #, 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:4163
+#: apply.c:4165
 #, 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:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "không thể gỡ b� %s từ mục lục"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "miếng vá sai h�ng cho mô-đun-con %s"
 
-#: apply.c:4341
+#: apply.c:4343
 #, 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:4349
+#: apply.c:4351
 #, 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:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "không thể thêm mục nhớ đệm cho %s"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gặp lỗi khi ghi vào “%s�"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "đang đóng tập tin “%s�"
 
-#: apply.c:4472
+#: apply.c:4474
 #, 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:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�ã áp dụng miếng vá %s một cách sạch sẽ."
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "lá»—i ná»™i bá»™"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, 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:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được “%s�"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Khối nhớ #%d được áp dụng g�n gàng."
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "�oạn dữ liệu #%d bị từ chối."
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "B� qua đư�ng dẫn “%s�."
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "không thừa nhận đầu vào"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr ""
+"Không có miếng vá hợp lệ nào trong đầu vào (cho phép với \"--allow-empty\")"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "không thể đ�c tập tin lưu bảng mục lục"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "không thể mở miếng vá “%s�: %s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, 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:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, 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:4973
+#: apply.c:4977
 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 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:5017
+#: apply.c:5021
 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:5020
+#: apply.c:5024
 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:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "số"
 
-#: apply.c:5023
+#: apply.c:5027
 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:5026
+#: apply.c:5030
 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:5028
+#: apply.c:5032
 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:5032
+#: apply.c:5036
 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:5034
+#: apply.c:5038
 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:5036
+#: apply.c:5040
 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:5038
+#: apply.c:5042
 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:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "đánh dấu các tập tin mới với “git add --intent-to-add�"
 
-#: apply.c:5042
+#: apply.c:5046
 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:5044
+#: apply.c:5048
 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:5047
+#: apply.c:5051
 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:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr ""
 "thử hòa trộn kiểu three-way, quay lại dán bình thư�ng nếu không thể thực "
 "hiện được"
 
-#: apply.c:5051
+#: apply.c:5055
 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:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 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:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "hành động"
 
-#: apply.c:5058
+#: apply.c:5062
 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:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chi�u ngược"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "đừng hy v�ng có ít nhất một dòng ngữ cảnh"
 
-#: apply.c:5071
+#: apply.c:5075
 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:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "chi tiết"
-
-#: apply.c:5076
+#: apply.c:5080
 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:5079
+#: apply.c:5083
 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:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "gốc"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "treo thêm <root> vào tất cả các tên tập tin"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "đừng trả v� lỗi khi các miếng vá trống rỗng"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1529,16 +1540,16 @@ msgstr "không thể stream blob “%s�"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "chế độ tập tin không được hỗ trợ: 0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "không thể bắt đầu bộ l�c “%s�"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "không thể chuyển hướng mô tả"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "bộ l�c “%s� đã báo cáo lỗi"
@@ -1582,19 +1593,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
 
-#: archive.c:188
-#, c-format
-msgid "cannot read %s"
-msgstr "không thể đ�c %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "không thể đ�c “%s�"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, 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"
@@ -1636,7 +1641,7 @@ msgstr "định_dạng"
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "ti�n_tố"
 
@@ -1646,9 +1651,9 @@ msgstr "nối thêm ti�n tố vào từng đư�ng dẫn tập tin trong kho
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "tập_tin"
@@ -1678,7 +1683,7 @@ msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "kho"
 
@@ -1686,7 +1691,7 @@ msgstr "kho"
 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:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "lệnh"
@@ -1699,18 +1704,20 @@ msgstr "đư�ng dẫn đến lệnh git-upload-archive trên máy chủ"
 msgid "Unexpected option --remote"
 msgstr "Gặp tùy ch�n không cần --remote"
 
-#: archive.c:580
-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:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "tùy ch�n “%s� yêu cầu “%s�"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "Gặp tùy ch�n không cần --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "Các tùy ch�n --add-file và --remote không thể sử dụng cùng với nhau"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1819,7 +1826,7 @@ msgstr "cần một điểm xét duyệt %s"
 msgid "could not create file '%s'"
 msgstr "không thể tạo tập tin “%s�"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "không thể đ�c tập tin “%s�"
@@ -1870,10 +1877,10 @@ msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1896,103 +1903,94 @@ msgstr "không có đư�ng dẫn %s trong “%s�"
 msgid "cannot read blob %s for path %s"
 msgstr "không thể đ�c blob %s cho đư�ng dẫn “%s�"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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\"."
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
 msgstr ""
-"\n"
-"Sau khi sửa nguyên nhân lỗi bạn có lẻ cần thử sửa\n"
-"thông tin theo dõi máy chủ bằng cách g�i lệnh\n"
-"\"git branch --set-upstream-to=%s%s%s\"."
+"không thể kế thừa cấu hình theo dõi thượng nguồn của nhi�u tham chiếu khi mà "
+"lệnh cải tổ được yêu cầu"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "Chưa cài đặt nhánh %s như là thượng nguồn của nó."
+msgid "not setting branch '%s' as its own upstream"
+msgstr "không cài đặt nhánh '%s' như là thượng nguồn của nó"
 
-#: branch.c:93
+#: branch.c:144
 #, 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 '%s' by rebasing."
+msgstr "nhánh “%s� cài đặt để theo dõi “%s� bằng cách rebase."
 
-#: branch.c:94
+#: branch.c:145
 #, 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 '%s'."
+msgstr "nhánh “%s� cài đặt để theo dõi “%s�."
 
-#: branch.c:98
+#: branch.c:148
 #, 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:"
+msgstr "nhánh “%s� cài đặt để theo dõi:"
 
-#: 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�."
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "không thể ghi cấu hình nhánh thượng nguồn"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
 msgstr ""
-"Nhánh “%s� cài đặt để theo dõi tham chiếu máy chủ “%s� bằng cách rebase."
+"\n"
+"Sau khi sửa nguyên nhân gây lỗi bạn có lẻ cần thử sửa\n"
+"thông tin theo dõi máy chủ bằng cách g�i lệnh:"
 
-#: branch.c:105
+#: branch.c:203
 #, 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 "asked to inherit tracking from '%s', but no remote is set"
+msgstr ""
+"đã h�i để kế thừa theo dõi từ '%s', nhưng không có máy chủ nào được đặt"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
 msgstr ""
-"Nhánh “%s� cài đặt để theo dõi tham chiếu nội bộ “%s� bằng cách rebase."
+"đã h�i để kế thừa theo dõi từ '%s', nhưng không có cấu hình hòa trộn nào "
+"được đặt"
 
-#: branch.c:110
+#: branch.c:252
 #, 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 "not tracking: ambiguous information for ref %s"
+msgstr "không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "Không thể ghi cấu hình nhánh thượng nguồn"
-
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Không theo dõi: thông tin chưa rõ ràng cho tham chiếu %s"
+msgid "'%s' is not a valid branch name"
+msgstr "“%s� không phải là một tên nhánh hợp lệ"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-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:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "�ã có nhánh mang tên “%s�."
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "Không thể ép buộc cập nhật nhánh hiện hành."
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "không thể ép buộc cập nhật nhánh “%s� đã được lấy ra tại “%s�"
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid "cannot set up 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."
+"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:235
+#: branch.c:338
 #, 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:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2012,27 +2010,28 @@ 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:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "Không phải tên đối tượng hợp lệ: “%s�."
+msgid "not a valid object name: '%s'"
+msgstr "không phải là tên đối tượng hợp lệ: “%s�"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "Tên đối tượng chưa rõ ràng: “%s�."
+msgid "ambiguous object name: '%s'"
+msgstr "tên đối tượng chưa rõ ràng: “%s�."
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "Nhánh không hợp lệ: “%s�."
+msgid "not a valid branch point: '%s'"
+msgstr "không phải là một điểm nhánh hợp lệ: “%s�"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "“%s� đã được lấy ra tại “%s� rồi"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD của cây làm việc %s chưa được cập nhật"
@@ -2057,7 +2056,7 @@ msgstr "“%s� không giống như tập tin v2 hay v3 bundle (định dạng
 msgid "unrecognized header: %s%s (%d)"
 msgstr "phần đầu không được thừa nhận: %s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2114,7 +2113,7 @@ msgstr "phiên bản bundle %d không được hỗ trợ"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "không thể ghi phiên bản bundle %d với thuật toán %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "đối số không được thừa nhận: %s"
@@ -2151,7 +2150,7 @@ msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "giá trị màu không hợp lệ: %.*s"
@@ -2203,202 +2202,202 @@ msgstr ""
 msgid "unable to find all commit-graph files"
 msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã "
 "bị h�ng"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "không thể tìm thấy lần chuyển giao %s"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "commit-graph yêu cầu dữ liệu tạo tràn nhưng không có"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "không thể phân tích lần chuyển giao “%s�"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "không thể lấy kiểu của đối tượng “%s�"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "�ang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 "Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần "
 "chuyển giao"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "�ang d�n dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "�ang tính mức hình h�c tô-pô tạo đồ thị các lần chuyển giao"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "�ang tính toán số tạo đồ thị các lần chuyển giao"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "�ang tính toán chuyển giao các bộ l�c Bloom đư�ng dẫn bị thay đổi"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "�ang sưu tập các lần chuyển giao được tham chiếu"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] ""
 "�ang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "gặp lỗi thêm gói %s"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "gặp lỗi khi mở mục lục cho “%s�"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "�ang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối "
 "tượng đã đóng gói"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "�ang tìm các cạnh mở tộng trong đồ thị lần chuyển giao"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "gặp lỗi khi ghi số đúng của mã đồ h�a cơ sở"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "không thể tạo các thư mục dẫn đầu của “%s�"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "không thể tạo lớp sơ đồ tạm th�i"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "không thể chỉnh sửa quy�n chia sẻ thành “%s�"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "�ang ghi ra đồ thị các lần chuyển giao trong lần %d"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm th�i"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "�ang quét các lần chuyển giao đã hòa trộn"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "�ang hòa trộn đồ-thị-các-lần-chuyển-giao"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 "cố gắng để ghi một đồ thị các lần chuyển giao, nhưng “core.commitGraph� bị "
 "vô hiệu hóa"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "có quá nhi�u lần chuyển giao để ghi đồ thị"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là "
 "đã h�ng"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != "
 "%u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "�ang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ "
 "thị lần chuyển giao"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != "
 "%s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm "
 "dứt quá sớm"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2406,7 +2405,7 @@ msgstr ""
 "đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, "
 "nhưng không phải số không ở chỗ khác"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2414,22 +2413,22 @@ msgstr ""
 "đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển "
 "giao %s, nhưng số không ở chỗ khác"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr ""
 "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %<PRIuMAX> < "
 "%<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "ngày chuyển giao cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là "
 "%<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "không thể phân tích cú pháp %s"
@@ -2459,28 +2458,28 @@ msgstr ""
 "Tắt l�i nhắn này bằng cách chạy\n"
 "\"git config advice.graftFileDeprecated false\""
 
-#: commit.c:1239
+#: commit.c:1241
 #, 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."
 
-#: commit.c:1243
+#: commit.c:1245
 #, 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."
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "Lần chuyển giao %s không có chữ ký GPG."
 
-#: commit.c:1249
+#: commit.c:1251
 #, 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"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2547,7 +2546,7 @@ msgstr "khóa không chứa một phần: %s"
 msgid "key does not contain variable name: %s"
 msgstr "khóa không chứa bất kỳ một tên biến nào: %s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "khóa không đúng: %s"
@@ -2700,144 +2699,144 @@ msgstr "core.commentChar chỉ được có một ký tự"
 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:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "giá trị cho %s sai dạng"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "giá trị cho %s sai dạng: %s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mức nén gói %d không hợp lệ"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "không thể tải đối tượng blob cấu hình “%s�"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "tham chiếu “%s� không chỉ đến một blob nào cả"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "không thể phân giải điểm xét duyệt “%s�"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "gặp lỗi khi phân tích cú pháp %s"
 
-#: config.c:1914
+#: config.c:1917
 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:2282
+#: config.c:2285
 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:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s không hợp lệ: “%s�"
 
-#: config.c:2501
+#: config.c:2504
 #, 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:2547
+#: config.c:2550
 #, 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:2549
+#: config.c:2552
 #, 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:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "tên của phần không hợp lệ “%s�"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s có đa giá trị"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "gặp lỗi khi ghi tập tin cấu hình “%s�"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "không thể khóa tập tin cấu hình %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "đang mở “%s�"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "mẫu không hợp lệ: %s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "tập tin cấu hình “%s� không hợp lệ"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat trên %s gặp lỗi"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "không thể mmap “%s�%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod trên %s gặp lỗi"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "không thể ghi tập tin cấu hình “%s�"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "không thể đặt “%s� thành “%s�"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "không thể thôi đặt “%s�"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "tên của phần không hợp lệ: %s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "thiếu giá trị cho cho “%s�"
@@ -3014,7 +3013,7 @@ msgstr "đã khóa tên đư�ng dẫn lạ “%s�"
 msgid "unable to fork"
 msgstr "không thể rẽ nhánh tiến trình con"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "�ang kiểm tra kết nối"
 
@@ -3306,17 +3305,17 @@ msgstr ""
 "Không phải là một thư mục git. Dùng --no-index để so sánh hai đư�ng dẫn bên "
 "ngoài một cây làm việc"
 
-#: diff.c:157
+#: diff.c:158
 #, 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:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Không hiểu đối số dirstat “%s�\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3324,7 +3323,7 @@ msgstr ""
 "cài đặt màu đã di chuyển phải là một trong “no�, “default�, “blocks�, "
 "“zebra�, “dimmed-zebra�, “plain�"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3334,7 +3333,7 @@ msgstr ""
 "change�, “ignore-space-at-eol�, “ignore-all-space�, “allow-indentation-"
 "change�"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -3342,12 +3341,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change không thể tổ hợp cùng với các chế "
 "độ khoảng trắng khác"
 
-#: diff.c:411
+#: diff.c:412
 #, 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:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3356,49 +3355,49 @@ msgstr ""
 "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat�:\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, 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:4642
-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:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "tùy ch�n '%s', '%s', '%s' và '%s' không thể dùng cùng nhau"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "Các tùy ch�n -G, -S, và --find-object loại từ lẫn nhau"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "tùy ch�n '%s', '%s' và '%s' không thể dùng cùng nhau"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr ""
-"-G và --pickaxe-regex là loại trừ lẫn nhau, dùng --pickaxe-regex với -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "tùy ch�n '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s'"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
 msgstr ""
-"tùy ch�n --pickaxe-all và --find-object loại từ lẫn nhau, hãy dùng --pickaxe-"
-"all với -G và -S"
+"tùy ch�n '%s' và '%s' không thể dùng cùng nhau, dùng '%s' với '%s' và '%s'"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow cần chính xác một đặc tả đư�ng dẫn"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "giá trị --stat không hợp lệ: “%s�"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "tùy ch�n “%s� cần một giá trị bằng số"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3407,42 +3406,42 @@ msgstr ""
 "Gặp lỗi khi phân tích đối số tùy ch�n --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "không hiểu lớp thay đổi “%c� trong --diff-filter=%s"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "không thể phân giải “%s�"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s cần dạng <n>/<m>"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s cần một ký tự, nhưng lại nhận được “%s�"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "đối số --color-moved sai: %s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "chế độ “%s� không hợp lệ trong --color-moved-ws"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -3450,155 +3449,155 @@ msgstr ""
 "tùy ch�n  diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
 "\"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "tham số cho %s không hợp lệ"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "đưa cho -I biểu thức chính quy không hợp lệ: “%s�"
 
-#: diff.c:5295
+#: diff.c:5246
 #, 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:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "đối số --word-diff sai: %s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "Các tùy ch�n định dạng khi xuất các khác biệt"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "tạo miếng vá"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "chặn m�i kết xuất từ diff"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "tạo khác biệt ở định dạng thô"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "đồng nghĩa với “-p --raw�"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "đồng nghĩa với “-p --stat�"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "--stat thuận tiện cho máy đ�c"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "chỉ xuất những dòng cuối của --stat"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<tham_số_1,tham_số_2>…"
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "đồng nghĩa với --dirstat=cumulative"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "chỉ hiển thị tên của các tập tin đổi"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "tạo diffstat"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<rá»™ng>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "tạo diffstat với độ rộng đã cho"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "tạo diffstat với tên độ rộng đã cho"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "tạo diffstat với độ rộng đồ thị đã cho"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<số_lượng>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "tạo diffstat với các dòng bị giới hạn"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "tạo tổng hợp xúc tích trong diffstat"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục"
 "\""
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "hiển thị thay đổi được tô màu"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<kiểu>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -3606,7 +3605,7 @@ msgstr ""
 "tô sáng các lỗi v� khoảng trắng trong các dòng “context�, “old� và “new� "
 "trong khác biệt"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3614,89 +3613,89 @@ msgstr ""
 "không munge tên đư�ng dẫn và sử dụng NUL làm bộ phân tách trư�ng đầu ra "
 "trong --raw hay --numstat"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<ti�n_tố>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "hiển thị ti�n tố nguồn đã cho thay cho \"a/\""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "hiển thị ti�n tố đích đã cho thay cho \"b/\""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "treo vào trước một ti�n tố bổ sung cho mỗi dòng kết xuất"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "đừng hiển thị bất kỳ ti�n tố nguồn hay đích"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ "
 "định"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<ký_tự>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+�"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-�"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “�"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "Tùy ch�n khác biệt đổi tên"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "dò tìm các tên thay đổi"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "b� qua preimage (ti�n ảnh??) cho các việc xóa"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "dò bản sao"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "tắt dò tìm đổi tên"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "dùng các blob trống rống như là nguồn đổi tên"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -3704,160 +3703,160 @@ msgstr ""
 "ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt "
 "quá giới hạn đưa ra"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "Tùy ch�n thuật toán khác biệt"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "sản sinh khác biệt ít nhất có thể"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "l� đi sự thay đổi do số lượng khoảng trắng gây ra"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "b� qua ký tự v� đầu dòng tại cuối dòng"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "b� qua các thay đổi cho toàn bộ các dòng là trống"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<regex>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "b� qua các thay đổi có tất cả các dòng khớp <regex>"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đ�c"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<thuật toán>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "ch�n một thuật toán khác biệt"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<văn bản>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<chế độ>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "hiển thị khác biệt từ, sử dụng <chế độ> để b� giới hạn các từ bị thay đổi"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "dùng <regex> để quyết định từ là cái gì"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "tÆ°Æ¡ng Ä‘Æ°Æ¡ng vá»›i --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "các dòng di chuyển của mã mà được tô màu khác nhau"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "cách b� qua khoảng trắng trong --color-moved"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "Các tùy ch�n khác biệt khác"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các "
 "đư�ng dẫn liên quan"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "coi m�i tập tin là dạng văn bản thư�ng"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "tắt m�i kết xuất của chương trình"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "chạy các bộ l�c văn bản thông thư�ng bên ngoài khi so sánh các tập tin nhị "
 "phân"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<khi>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "b� qua các thay đổi trong mô-đun-con trong khi tạo khác biệt"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<định dạng>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "ẩn các mục “git add -N� từ bảng mục lục"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "coi các mục “git add -N� như là có thật trong bảng mục lục"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<chuá»—i>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3865,7 +3864,7 @@ msgstr ""
 "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của "
 "chuỗi được chỉ ra"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3873,35 +3872,35 @@ msgstr ""
 "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu "
 "thức chính quy được chỉ ra"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "đi�u khiển thứ tự xuát hiện các tập tin trong kết xuất"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<đư�ng-dẫn>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "hiển thị các thay đổi trong đư�ng dẫn đã cho đầu tiên"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "b� qua đầu ra đến đư�ng dẫn đã cho"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<mã-số-đối-tượng>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3909,32 +3908,32 @@ msgstr ""
 "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối "
 "tượng được chỉ ra"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "ch�n các tập tin theo kiểu khác biệt"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<tập_tin>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "Xuất ra một tập tin cụ thể"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr "nhận thấy đổi tên toàn diện đã bị b� qua bởi có quá nhi�u tập tin."
 
-#: diff.c:6309
+#: diff.c:6260
 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:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3976,29 +3975,29 @@ msgstr "mẫu âm không được thừa nhận: “%s�"
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s� đã bị lặp lại"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "vô hiệu khớp mẫu nón"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "không thể dùng %s như là một tập tin loại trừ"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "không thể mở thư mục “%s�"
 
-#: dir.c:2766
+#: dir.c:2720
 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:2890
+#: dir.c:2844
 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:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4006,36 +4005,36 @@ 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"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "tập tin ghi bảng mục lục bị h�ng trong kho %s"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "không thể tạo thư mục cho %s"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "không thể di d�i thư mục git từ “%s� sang “%s�"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "gợi ý: Ch� trình biên soạn của bạn đóng tập tin…%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "Nội dung l�c"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "không thể lấy thống kê tập tin “%s�"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "đư�ng dẫn không gian tên git \"%s\" sai"
@@ -4045,273 +4044,269 @@ msgstr "đư�ng dẫn không gian tên git \"%s\" sai"
 msgid "too many args to run %s"
 msgstr "quá nhi�u tham số để chạy %s"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: cần danh sách shallow"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, 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:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "không thể ghi lên máy phục vụ"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc cần multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "dòng shallow không hợp lệ: %s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "dòng unshallow không hợp lệ: %s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "không tìm thấy đối tượng: %s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "lỗi trong đối tượng: %s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "không tìm shallow nào: %s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "nhận %s %d - %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "lần chuyển giao %s không hợp lệ"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "chịu thua"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "xong"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "nhận %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "�ánh dấu %s là đã hoàn thành"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "đã sẵn có %s (%s)"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "lỗi giao thức: phần đầu gói bị sai"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: không thể rẽ nhánh %s"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack: kết xuất index-pack không hợp lệ"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s gặp lỗi"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "có lỗi trong sideband demultiplexer"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Phiên bản máy chủ là %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "Máy chủ hỗ trợ %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "Máy chủ không hỗ trợ máy khách shallow"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "Máy chủ không hỗ trợ --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "Máy chủ không hỗ trợ --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "Máy chủ không hỗ trợ --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "Máy chủ không hỗ trợ định dạng đối tượng của kho này"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "không có lần chuyển giao chung nào"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "kho nguồn là nông, nên b� từ chối nhân bản."
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch gặp lỗi."
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "các thuật toán không khớp nhau: máy khách %s; máy chủ %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "máy chủ không hỗ trợ thuật toán “%s�"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "Máy chủ hỗ trợ bộ l�c"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "không thể ghi các yêu cầu lên máy phục vụ"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "gặp lỗi khi đ�c phần đầu của đoạn %s"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "cần “%s�, nhưng lại nhận “%s�"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "gặp dòng không được thừa nhận: “%s�"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "gặp lỗi khi xử lý tín hiệu trả l�i: %d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "cần tập tin gói để gửi sau “ready�"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "không cần thêm phần nào để gửi sau “ready�"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "lỗi xử lý thông tin shallow: %d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "cần wanted-ref, nhưng lại nhận được “%s�"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref không được mong đợi: “%s�"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "lỗi khi xử lý wanted refs: %d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: cần nhận được trả l�i là kết thúc gói"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "không khớp phần đầu máy chủ"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 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"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "gặp “ready� đột xuất từ máy chủ"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, 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:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 "Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "không thể tạo tập tin tạm th�i"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s�"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
@@ -4319,7 +4314,7 @@ msgstr ""
 "gpg.ssh.allowedSignersFile cần được cấu hình và tồn tại để xác minh chữ ký "
 "ssh"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4327,57 +4322,57 @@ msgstr ""
 "ssh-keygen -Y find-principals/verify là cần thiết để xác minh chữ ký ssh (có "
 "sẵn trong phiên bản openssh 8.2p1+)"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "tập tin thu hồi chữ ký ssh đã được cấu hình nhưng không tìm thấy: %s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "chữ sai / không tương thích “%s�"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "gặp lỗi khi lấy dấu vân tay ssh cho khóa “%s�"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr ""
 "hoặc là user.signingkey hoặc gpg.ssh.defaultKeyCommand cần được cấu hình"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr ""
 "gpg.ssh.defaultKeyCommand thành công nhưng lại không trả v� khóa nào: %s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand gặp lỗi: %s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg gặp lỗi khi ký dữ liệu"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "user.signingkey cần được đặt cho ký ssh"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "gặp lỗi khi ghi chìa khóa ký ssh vào “%s�"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "gặp lỗi khi ghi bộ đệm chìa khóa ký ssh vào “%s�"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
@@ -4385,7 +4380,7 @@ msgstr ""
 "ssh-keygen -Y sign là cần thiết cho ký ssh (sẵn có trong openssh phiên bản "
 "8.2p1+)"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "gặp lỗi khi đ�c bộ đệm dữ liệu chữ ký ssh từ “%s�"
@@ -4395,7 +4390,7 @@ msgstr "gặp lá»—i khi Ä‘á»�c bá»™ đệm dữ liệu chữ ký ssh từ “%sâ
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "b� qua màu không hợp lệ “%.*s� trong log.graphColors"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4403,18 +4398,18 @@ msgstr ""
 "mẫu đã cho có chứa NULL byte (qua -f <file>). �i�u này chỉ được hỗ trợ với -"
 "P dÆ°á»›i PCRE v2"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "“%s�: không thể đ�c %s"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "gặp lỗi khi lấy thống kê v� “%s�"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "“%s�: đ�c ngắn"
@@ -4535,8 +4530,8 @@ msgstr "Tiếp tục và coi rằng ý bạn là “%s�."
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "Chạy “%s� để thay thế? (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "Chạy “%s� để thay thế? (y/N)? "
 
 #: help.c:654
 #, c-format
@@ -4752,7 +4747,7 @@ msgstr "cần đẩy dữ liệu lên đĩa sau tham số ls-refs (liệt kê th
 msgid "quoted CRLF detected"
 msgstr "phát hiện CRLF được trích dẫn"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "thao tác sai “%s� cho “%s�"
@@ -4984,7 +4979,7 @@ msgstr "mô-đun-con"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "XUNG �ỘT (%s): Xung đột hòa trộn trong %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4993,7 +4988,7 @@ msgstr ""
 "XUNG �ỘT (sửa/xóa): %s bị xóa trong %s và sửa trong %s. Phiên bản %s của %s "
 "còn lại trong cây (tree)."
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5005,7 +5000,7 @@ msgstr ""
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s"
@@ -5020,7 +5015,7 @@ msgstr ""
 "hòa trộn:\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "�ã cập nhật rồi."
 
@@ -5307,7 +5302,7 @@ msgstr "hòa trộn không trả v� lần chuyển giao nào"
 msgid "Could not parse object '%s'"
 msgstr "Không thể phân tích đối tượng “%s�"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "Không thể ghi bảng mục lục."
@@ -5316,8 +5311,8 @@ msgstr "Không thể ghi bảng mục lục."
 msgid "failed to read the cache"
 msgstr "gặp lỗi khi đ�c bộ nhớ đệm"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 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"
@@ -5326,212 +5321,212 @@ msgstr "không thể ghi tập tin lưu bảng mục lục mới"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "fanout OID nhi�u gói chỉ mục có kích thước sai"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "tập tin đồ thị multi-pack-index %s quá nh�"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "không nhận ra phiên bản %d của multi-pack-index"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "phiên bản băm multi-pack-index %u không khớp phiên bản %u"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s� trước “%s�"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "pack-int-id sai: %u (%u các gói tổng)"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nh�"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "gặp lỗi khi thêm tập tin gói “%s�"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "gặp lỗi khi mở pack-index “%s�"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "gặp lỗi khi phân bổ đối tượng “%d� trong tập tin gói"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "không thể phân tích cú pháp dòng: %s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "dòng dị hình: %s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr "b� qua multi-pack-index sẵn có; tổng kiểm không khớp"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "không thể tải gói"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "không thể mở mục lục cho %s"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "�ang thêm tập tin gói từ multi-pack-index"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "không hiểu \"preferred pack\": %s"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "không thể ch�n gói ưa dùng %s với không đối tượng nào"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "đã không thấy tập tin gói %s để mà xóa"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "\"preferred pack\" “%s� đã hết hạn"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "không có tập tin gói để đánh mục lục."
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "không thể ghi “multi-pack bitmap�"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "không thể ghi “multi-pack-index�"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "gặp lỗi khi gỡ b� %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "đã có tập tin multi-pack-index, nhưng gặp lỗi khi phân tích cú pháp"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "tổng kiểm không đúng"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "�ang khóa cho các gói bị tham chiếu"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx chẳng chứa oid nào"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "�ang sắp xếp các đối tượng theo tập tin gói"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "�ang thẩm tra các khoảng bù đối tượng"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 "khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "�ang đếm các đối tượng được tham chiếu"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "�ang tìm và xóa các gói không được tham chiếu"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "không thể lấy thông tin thống kê v� các đối tượng gói"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "không thể hoàn thiện các đối tượng gói"
 
@@ -5592,259 +5587,259 @@ 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-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "không thể thư�ng hóa đư�ng dẫn đối tượng thay thế: “%s�"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s: đang b� qua kho đối tượng thay thế, lồng nhau quá sâu"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "không thể chuẩn hóa thư mục đối tượng: “%s�"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "không thể fdopen tập tin khóa thay thế"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "không thể đ�c tập tin thay thế"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "không thể di chuyển tập tin thay thế vào chỗ"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "đư�ng dẫn “%s� không tồn tại"
 
-#: object-file.c:722
+#: object-file.c:762
 #, 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ợ."
 
-#: object-file.c:728
+#: object-file.c:768
 #, 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ộ."
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "kho tham chiếu “%s� là nông"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "kho tham chiếu “%s� bị cấy ghép"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s�"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap gặp lỗi%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "tập tin đối tượng %s trống rỗng"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "đối tượng mất h�ng “%s�"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "gặp rác tại cuối của đối tượng bị mất “%s�"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "không thể phân tích phần đầu của “%s�"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "kiểu đối tượng không hợp lệ"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "không thể giải gói phần đầu %s"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "phần đầu cho %s quá dài, vượt quá %d byte"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "gặp lỗi khi đ�c đối tượng “%s�"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "c%s thay thế không được tìm thấy cho %s"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "đối tượng mất %s (được lưu trong %s) bị h�ng"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị h�ng"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "không thể ghi tập tin %s"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "không thể đặt quy�n thành “%s�"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "lỗi ghi tập tin"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "không đủ thẩm quy�n để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "không thể tạo tập tin tạm th�i"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "không thể ghi tập tin đối tượng đã mất"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "không thể xả nén đối tượng mới %s (%d)"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "gặp lỗi utime() trên “%s�"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "không thể đ�c đối tượng cho %s"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "lần chuyển giao sai h�ng"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "thẻ sai h�ng"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "gặp lỗi đ�c khi đánh mục lục %s"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "không đ�c ngắn khi đánh mục lục %s"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: kiểu tập tin không được hỗ trợ"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s không phải là một đối tượng hợp lệ"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, 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ệ"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "không thể mở %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "mã băm không khớp cho %s (cần %s)"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "không thể mmap %s"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "không thể giải gói phần đầu của “%s�"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "không thể phân tích phần đầu của “%s�"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "không thể giải gói nội dung của “%s�"
@@ -5973,25 +5968,25 @@ msgstr "không thể phân tích đối tượng: “%s�"
 msgid "hash mismatch %s"
 msgstr "mã băm không khớp %s"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "ánh xạ multi-pack thiếu mục lục để dành cần thiết"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index: không thể mở gói"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "không thể lấy kích cỡ của %s"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "không thể tìm thấy %s trong gói “%s� tại vị trí %<PRIuMAX>"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "không thể dung lượng đĩa đã dùng của %s"
@@ -6040,46 +6035,51 @@ msgstr "gặp lỗi làm cho %s đ�c được"
 msgid "could not write '%s' promisor file"
 msgstr "không thể ghi tập tin promisor “%s�"
 
-#: packfile.c:626
+#: packfile.c:627
 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:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "tập tin gói %s không thể được ánh xạ %s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, 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:1927
+#: packfile.c:1928
 #, 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-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "tùy ch�n “%s� cần một giá trị bằng số"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "ngày tháng hết hạn dị hình “%s�"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "tùy ch�n “%s� cần \"always\", \"auto\", hoặc \"never\""
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "tên đối tượng dị hình “%s�"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "tùy ch�n “%s� cần \"%s\" hoặc \"%s\""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6115,36 +6115,36 @@ msgstr "%s cần một giá trị dạng số không âm với một hậu tố
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "tùy ch�n chưa rõ rang: %s (nên là --%s%s hay --%s%s)"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang)?"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "bí danh của --%s"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "không hiểu tùy ch�n “%s�"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "không hiểu tùy ch�n “%c�"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "không hiểu tùy ch�n non-ascii trong chuỗi: “%s�"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "cách dùng: %s"
@@ -6152,7 +6152,7 @@ msgstr "cách dùng: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "     hoặc: %s"
@@ -6176,17 +6176,17 @@ msgstr "     hoặc: %s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-S�"
 
@@ -6316,17 +6316,17 @@ msgstr "lỗi đ�c"
 msgid "the remote end hung up unexpectedly"
 msgstr "máy chủ bị treo bất ng�"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "lỗi giao thức: ký tự chi�u dài dòng bị sai: %.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "lỗi giao thức: chi�u dài dòng bị sai %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "lỗi máy chủ: %s"
@@ -6378,7 +6378,7 @@ msgstr "không thể lấy thông tin thống kê v� “log“"
 msgid "could not read `log` output"
 msgstr "không thể đ�c kết xuất “log�"
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "không thể phân tích lần chuyển giao “%s�"
@@ -6401,61 +6401,57 @@ msgstr "không thể phân tích cú pháp phần đầu git “%.*s�"
 msgid "failed to generate diff"
 msgstr "gặp lỗi khi tạo khác biệt"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only và --right-only loại từ lẫn nhau"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "không thể phân tích nhật ký cho “%s�"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 "sẽ không thêm các bí danh “%s� (“%s� đã có từ trước trong bảng mục lục)"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "không thể tạo một blob rỗng trong cơ sở dữ liệu đối tượng"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: chỉ có thể thêm tập tin thông thư�ng, liên kết m�m hoặc git-directories"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "“%s� không có một lần chuyển giao nào được lấy ra"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "không thể đánh mục lục tập tin “%s�"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "không thể thêm %s vào bảng mục lục"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "không thể lấy thống kê “%s�"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "Làm tươi mới bảng mục lục"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6464,7 +6460,7 @@ msgstr ""
 "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
 "Dùng phiên bản %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6473,143 +6469,143 @@ 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:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "chữ ký sai 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "phiên bản mục lục sai %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được"
 
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "đang l� đi phần mở rộng %.4s"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "không hiểu định dạng mục lục 0x%08x"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "trư�ng tên sai sạng trong mục lục, gần đư�ng dẫn “%s�"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "các mục tin stage không đúng thứ tự trong mục lục"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "nhi�u mục stage cho tập tin hòa trộn “%s�"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "các mục tin stage không đúng thứ tự cho “%s�"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "tập tin ghi bảng mục lục bị h�ng"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "không thể tạo tuyến load_cache_entries: %s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "không thể gia nhập tuyến load_cache_entries: %s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: mở tập tin mục lục gặp lỗi"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: không thể lấy thống kê bảng mục lục đã mở"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: tập tin mục lục nh� hơn mong đợi"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s: không thể ánh xạ tập tin mục lục%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "không thể tạo tuyến load_index_extensions: %s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "không thể gia nhập tuyến load_index_extensions: %s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s�"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "mục lục bị h�ng, cần %s trong %s, nhưng lại nhận được %s"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "không thể đóng “%s�"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\""
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "không thể lấy thông tin thống kê v� “%s�"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "không thể mở thư mục git: %s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "không thể b� liên kết (unlink): “%s�"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "không thể sửa các bít phân quy�n trên “%s�"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: không thể xóa b� stage #0"
@@ -6732,8 +6728,8 @@ msgstr ""
 "Tuy nhiên, nếu bạn xóa b� m�i thứ, việc cải tổ sẽ bị bãi b�.\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6776,7 +6772,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s: “preserve� bị cấm bởi “merges�"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "đã ra đi"
 
@@ -6815,7 +6811,8 @@ msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "đối số không được thừa nhận %%(%s): %s"
@@ -6825,11 +6822,6 @@ msgstr "đối số không được thừa nhận %%(%s): %s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) không nhận các đối số"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tham số không được thừa nhận %%(objectsize): %s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6840,11 +6832,6 @@ msgstr "%%(deltabase) không nhận các đối số"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) không nhận các đối số"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "tham số không được thừa nhận %%(subject): %s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6860,26 +6847,11 @@ msgstr "không hiểu tham số %%(trailers): %s"
 msgid "positive value expected contents:lines=%s"
 msgstr "cần nội dung mang giá trị dương:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "đối số không được thừa nhận %%(contents): %s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "đối số không được thừa nhận %%(raw): %s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "cần giá trị dương “%s� trong %%(%s)"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "đối số “%s� không được thừa nhận trong %%(%s)"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6900,21 +6872,11 @@ msgstr "vị trí không được thừa nhận:%s"
 msgid "unrecognized width:%s"
 msgstr "chi�u rộng không được thừa nhận:%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "đối số không được thừa nhận %%(align): %s"
-
 #: ref-filter.c:542
 #, 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:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "đối số không được thừa nhận %%(if): %s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6938,15 +6900,10 @@ msgstr ""
 "không phải là một kho git, nhưng trư�ng “%.*s� yêu cầu truy cập vào dữ liệu "
 "đối tượng"
 
-#: ref-filter.c:844
-#, 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:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, 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)"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "định dạng: nguyên tử %%(%s) được dùng mà không có nguyên tử %%(%s)"
 
 #: ref-filter.c:912
 #, c-format
@@ -6958,16 +6915,6 @@ msgstr "định dạng: nguyên tử %%(then) được dùng nhi�u hơn một
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
 
-#: ref-filter.c:946
-#, 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:948
-#, 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:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7042,22 +6989,22 @@ msgstr "đối tượng dị hình tại “%s�"
 msgid "ignoring ref with broken name %s"
 msgstr "đang l� đi tham chiếu với tên h�ng %s"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "đang l� đi tham chiếu h�ng %s"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "định dạng: thiếu nguyên tử %%(end)"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "tên đối tượng dị hình %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "tùy ch�n “%s� phải chỉ đến một lần chuyển giao"
@@ -7102,71 +7049,71 @@ msgstr "không thể lấy v� “%s�"
 msgid "invalid branch name: %s = %s"
 msgstr "tên nhánh không hợp lệ: %s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "đang l� đi tham chiếu m�m thừa %s"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "nhật ký cho tham chiếu %s có khoảng trống sau %s"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "nhật ký cho tham chiếu %s kết thúc bất ng� trên %s"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "nhật ký cho %s trống rỗng"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "từ chối cập nhật tham chiếu với tên sai “%s�"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "update_ref bị lỗi cho ref “%s�: %s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "không cho phép đa cập nhật cho tham chiếu “%s�"
 
-#: refs.c:2142
+#: refs.c:2150
 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.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "các cập nhật tham chiếu bị bãi b� bởi móc"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "“%s� sẵn có; không thể tạo “%s�"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "không thể xử lý “%s� và “%s� cùng một lúc"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "không thể gỡ b� tham chiếu: %s"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, 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:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "không thể xóa b� tham chiếu: %s"
@@ -7176,50 +7123,50 @@ msgstr "không thể xóa b� tham chiếu: %s"
 msgid "invalid refspec '%s'"
 msgstr "refspec không hợp lệ “%s�"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng “/�: %s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "đã đưa ra nhi�u hơn một gói nhận v�, đang sử dụng cái đầu tiên"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "đã đưa ra nhi�u hơn một gói tải lên, đang sử dụng cái đầu tiên"
 
-#: remote.c:590
+#: remote.c:699
 #, 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:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s thư�ng theo dõi %s, không phải %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s theo dõi cả %s và %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "khóa “%s� của mẫu k có “*�"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "giá trị “%s� của mẫu k có “*�"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "refspec %s nguồn không khớp bất kỳ cái gì"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "refspec %s nguồn khớp nhi�u hơn một"
@@ -7228,7 +7175,7 @@ msgstr "refspec %s nguồn khớp nhi�u hơn một"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7253,7 +7200,7 @@ msgstr ""
 "Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham "
 "chiếu dạng đầy đủ."
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7264,7 +7211,7 @@ msgstr ""
 "Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n"
 "“%s:refs/heads/%s�?"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7275,7 +7222,7 @@ msgstr ""
 "Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n"
 "“%s:refs/tags/%s�?"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7286,7 +7233,7 @@ msgstr ""
 "Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n"
 "“%s:refs/tags/%s�?"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7297,115 +7244,115 @@ msgstr ""
 "Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n"
 "“%s:refs/tags/%s�?"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "“%s� không thể được phân giải thành nhánh"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "không thể xóa “%s�: tham chiếu trên máy chủ không tồn tại"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "dst refspec %s khớp nhi�u hơn một"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "dst ref %s nhận từ hơn một nguồn"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD không chỉ đến một nhánh nào cả"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "không có nhánh nào như thế: “%s�"
 
-#: remote.c:1736
+#: remote.c:1846
 #, 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:1742
+#: remote.c:1852
 #, 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:1757
+#: remote.c:1867
 #, 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:1769
+#: remote.c:1882
 #, 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:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "đẩy refspecs cho “%s� không bao gồm “%s�"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "đẩy lên mà không có đích (push.default là “nothing�)"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "không thể phân giải đẩy “đơn giản� đến một đích đơn"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "không thể tìm thấy tham chiếu máy chủ %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* �ang b� qua tham chiếu thú vị nội bộ “%s�"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 "Nhánh của bạn dựa trên cơ sở là “%s�, nhưng trên thượng nguồn không còn.\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Nhánh của bạn đã cập nhật với “%s�.\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Nhánh của bạn và “%s� tham chiếu đến các lần chuyển giao khác nhau.\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (dùng \"%s\" để biết thêm chi tiết)\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "Nhánh của bạn đứng trước “%s� %d lần chuyển giao.\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7414,11 +7361,11 @@ msgstr[0] ""
 "Nhánh của bạn đứng đằng sau “%s� %d lần chuyển giao, và có thể được chuyển-"
 "tiếp-nhanh.\n"
 
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7431,13 +7378,13 @@ msgstr[0] ""
 "và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
 "tương ứng với mỗi lần.\n"
 
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
 "bạn)\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "không thể phân tích tên đối tượng mong muốn “%s�"
@@ -7470,7 +7417,7 @@ msgstr "không thể ghi bản ghi rerere"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "gặp lỗi đ�c khi đang ghi “%s� (%s)"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "gặp lỗi khi đẩy dữ liệu “%s� lên đĩa"
@@ -7515,8 +7462,8 @@ msgstr "không thể unlink stray “%s�"
 msgid "Recorded preimage for '%s'"
 msgstr "Preimage đã được ghi lại cho “%s�"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "không thể tạo thư mục “%s�"
@@ -7554,37 +7501,29 @@ msgstr "không thể mở thư mục rr-cache"
 msgid "could not determine HEAD revision"
 msgstr "không thể dò tìm điểm xét duyệt HEAD"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "gặp lỗi khi tìm cây của %s"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input xung khắc với --no-walk"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk xung khắc với --unsorted-input"
-
-#: revision.c:2690
+#: revision.c:2686
 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:2693
+#: revision.c:2689
 #, 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:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "không thể tạo tuyến trình async: %s"
@@ -7650,8 +7589,8 @@ msgstr "chế độ d�n dẹp ghi chú các lần chuyển giao không hợp l
 msgid "could not delete '%s'"
 msgstr "không thể xóa b� “%s�"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "không thể gỡ b� “%s�"
@@ -7713,13 +7652,13 @@ msgstr ""
 "�ể bãi b� và quay trở lại trạng thái trước \"git revert\",\n"
 "chạy \"git revert --abort\"."
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "không thể khóa “%s�"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "không thể ghi vào “%s�"
@@ -7729,12 +7668,18 @@ msgstr "không thể ghi vào “%s�"
 msgid "could not write eol to '%s'"
 msgstr "không thể ghi eol vào “%s�"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "gặp lỗi khi hoàn thành “%s�"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "không thể đ�c “%s�"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7749,7 +7694,7 @@ msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chún
 msgid "%s: fast-forward"
 msgstr "%s: chuyển-tiếp-nhanh"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Chế độ d�n dẹp không hợp lệ %s"
@@ -7780,8 +7725,8 @@ msgstr "không có khóa hiện diện trong “%.*s�"
 msgid "unable to dequote value of '%s'"
 msgstr "không thể giải trích dẫn giá trị của “%s�"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "không thể mở “%s� để đ�c"
@@ -7844,11 +7789,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "móc “prepare-commit-msg� bị lỗi"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7879,7 +7824,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7907,351 +7852,352 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr ""
 "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "đã r�i kh�i HEAD"
 
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (root-commit)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "không thể phân tích HEAD"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s không phải là một lần chuyển giao!"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "không thể phân tích tác giả của lần chuyển giao"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "không thể đ�c phần chú thích (message) từ “%s�"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "định danh tác giả không hợp lệ “%s�"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "tác giả sai h�ng: thiếu thông tin ngày tháng"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "không thể cập nhật %s"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "không thể phân tích lần chuyển giao %s"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "không thể phân tích lần chuyển giao cha mẹ “%s�"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "�ây là chú thích cho lần chuyển giao thứ nhất:"
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, 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:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "Chú thích cho lần chuyển giao thứ nhất sẽ bị b� qua:"
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, 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:1757
+#: sequencer.c:1759
 #, 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:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "không thể ghi “%s�"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "cần một HEAD để sửa"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "không thể đ�c phần chú thích (message) của HEAD"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, 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:2089
+#: sequencer.c:2091
 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:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "không thể sửa chữa lần chuyển giao gốc"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, 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:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, 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:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, 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:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "không thể đổi tên “%s� thành “%s�"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "không thể hoàn nguyên %s… %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "không thể áp dụng miếng vá %s… %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "xóa %s %s -- vá nội dung thượng nguồn đã có\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, 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:2370
+#: sequencer.c:2372
 #, 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:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s không nhận các đối số: “%s�"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "thiếu đối số cho %s"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "không thể phân tích cú pháp “%s�"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "dòng không hợp lệ %d: %.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, 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:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "không thể đ�c “%s�."
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "đang hủy b� thao tác cherry pick đang thực hiện"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "đang hủy b� các thao tác hoàn nguyên đang thực hiện"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 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:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "bảng chỉ thị không thể dùng được: %s"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "không có lần chuyển giao nào được phân tích."
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "không thể cherry-pick trong khi hoàn nguyên."
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 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:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "giá trị cho %s không hợp lệ: %s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "squash-onto không dùng được"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "bảng tùy ch�n dị hình: “%s�"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "có thao tác hoàn nguyên đang được thực hiện"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "có thao tác “cherry-pick� đang được thực hiện"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, 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:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "không thể khóa HEAD"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 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:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 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:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "không mở được “%s�"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "không thể đ�c “%s�: %s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "gặp kết thúc tập tin đột xuất"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, 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:3198
+#: sequencer.c:3200
 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:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "không có tiến trình hoàn nguyên nào"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "không có cherry-pick đang được thực hiện"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "gặp lỗi khi b� qua đối tượng chuyển giao"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "ở đây không có gì để mà b� qua cả"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8260,16 +8206,16 @@ msgstr ""
 "bạn đã sẵn sàng chuyển giao chưa?\n"
 "thá»­ \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8288,27 +8234,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Không thể áp dụng %s… %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Không hòa trộn %.*s"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "�ang thực thi: %s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8323,11 +8269,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 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:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8344,90 +8290,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "tên nhãn dị hình: “%.*s�"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "ghi lần chuyển giao gốc giả"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "Ä‘ang ghi squash-onto"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "không thể phân giải “%s�"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "không thể phân tích “%.*s�"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "chẳng có gì để hòa trộn: “%.*s�"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "không thể lấy chú thích của lần chuyển giao của “%s�"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "không thể ngay cả khi thử hòa trộn “%.*s�"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "Không thể autostash"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "Gặp đáp ứng stash không cần: “%s�"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "Không thể tạo thư mục cho “%s�"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "�ã tạo autostash: %s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "không thể reset --hard"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�ã áp dụng autostash.\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "không thử lưu “%s�"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8439,29 +8385,29 @@ 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:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "�p dụng autostash có hiệu quả trong các xung đột."
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "Autostash đã sẵn có; nên tạo một mục stash mới."
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "không thể tách r�i HEAD"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Dừng lại ở HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Dừng lại ở %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8482,58 +8428,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "�ang cải tổ (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Dừng lại ở %s…  %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "không thể đ�c orig-head"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "không thể đ�c “onto�."
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "không thể cập nhật HEAD thành %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "Cài tổ và cập nhật %s một cách thành công.\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 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:4654
+#: sequencer.c:4651
 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:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "tập tin không hợp lệ: “%s�"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nội dung không hợp lệ: “%s�"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8543,69 +8489,69 @@ 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:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "không thể ghi tập tin: “%s�"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "không thể xóa b� CHERRY_PICK_HEAD"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 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:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: không thể cherry-pick một %s"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: điểm xét duyệt sai"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 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:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "b� qua lần chuyển giao được áp dụng kế trước %s"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr ""
 "dùng --reapply-cherry-picks để bao gồm các lần chuyển giao đã bị b� qua"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script: các tùy ch�n được không xử lý"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "không có gì để làm"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 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"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "văn lệnh đã sẵn được sắp đặt rồi."
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "“%s� ngoài một kho chứa tại “%s�"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8615,7 +8561,7 @@ msgstr ""
 "Dùng “git <lệnh> -- <đư�ng/dẫn>…� để chỉ định đư�ng dẫn mà nó không tồn tại "
 "một cách nội bộ."
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8627,12 +8573,12 @@ 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:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "tùy ch�n “%s� phải trước các đối số đầu tiên không có tùy ch�n"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8643,98 +8589,98 @@ 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:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "thao tác này phải được thực hiện trong thư mục làm việc"
 
-#: setup.c:658
+#: setup.c:722
 #, 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:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "tìm thấy phần mở rộng kho chưa biết:"
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:"
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "tập tin .git là quá lớn: “%s�"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "gặp lỗi khi đ�c %s"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "định dạng tập tin git không hợp lệ: %s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "không có đư�ng dẫn trong tập tin git: %s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "không phải là kho git: %s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "“$%s� quá lớn"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "không phải là kho git: “%s�"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "không thể chdir (chuyển đổi thư mục) sang “%s�"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "không thể quay lại cwd"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "gặp lỗi khi lấy thống kê v� “%*s%s%s�"
 
-#: setup.c:1231
+#: setup.c:1295
 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:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "không thể chuyển sang “%s�"
 
-#: setup.c:1251
+#: setup.c:1315
 #, 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:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8744,7 +8690,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:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8753,15 +8699,15 @@ msgstr ""
 "gặp vấn đ� với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n"
 "ngư�i sở hữu tập tin phải luôn có quy�n đ�c và ghi."
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "gặp lỗi khi rẽ nhánh tiến trình"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid gặp lỗi"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "mục tin mục lục là một thư mục, nhưng không \"sparse\" (%08x)"
@@ -8816,13 +8762,13 @@ msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/giây"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "không thể mở “%s� để ghi"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "không thể sửa “%s�"
@@ -8917,7 +8863,7 @@ msgstr ""
 msgid "process for submodule '%s' failed"
 msgstr "xử lý cho mô-đun-con “%s� gặp lỗi"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 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ệ."
 
@@ -9164,7 +9110,7 @@ msgstr "giao thức này không há»— trợ cài đặt Ä‘Æ°á»�ng dẫn dịch vá
 msgid "invalid remote service path"
 msgstr "đư�ng dẫn dịch vụ máy chủ không hợp lệ"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "thao tác không được gia thức hỗ trợ"
 
@@ -9386,7 +9332,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "Bãi b�."
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết"
 
@@ -9406,7 +9352,7 @@ msgstr "tên tập tin trống rỗng trong mục tin cây"
 msgid "too-short tree file"
 msgstr "tập tin cây quá ngắn"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9417,7 +9363,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:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9427,7 +9373,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9438,7 +9384,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:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9448,7 +9394,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9458,7 +9404,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:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9468,7 +9414,7 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9478,7 +9424,16 @@ msgstr ""
 "trong nó:\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"Từ chối gỡ b� thư mục làm việc hiện tại:\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9488,7 +9443,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:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9498,7 +9453,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9508,7 +9463,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:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9518,7 +9473,7 @@ msgstr ""
 "trá»™n:\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9527,7 +9482,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:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9536,7 +9491,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:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9547,7 +9502,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:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9558,7 +9513,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9568,7 +9523,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:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9578,7 +9533,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9588,7 +9543,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn %s."
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9598,12 +9553,12 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, 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:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9612,7 +9567,7 @@ msgstr ""
 "Không thể cập nhật mô-đun-con:\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9623,7 +9578,7 @@ msgstr ""
 "mẫu sparse:\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9633,7 +9588,7 @@ msgstr ""
 "sparse:\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9644,12 +9599,12 @@ msgstr ""
 "cấp các mẫu sparse:\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "Bãi b�\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
@@ -9658,11 +9613,11 @@ msgstr ""
 "Sau khi sửa các đư�ng dẫn phía trên, bạn có thể chạy “git sparse-checkout "
 "reapply“.\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "�ang cập nhật các tập tin"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9672,17 +9627,17 @@ msgstr ""
 "HOA/thư�ng trên một hệ thống tập tin không phân biệt HOA/thư�ng)\n"
 "và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "�ang cập nhật các c� mục lục"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr ""
 "cây làm việc và lần chuyển giao không được theo dõi có các mục trùng lặp: %s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "cần đẩy dữ liệu lên đĩa sau các tham số của lệnh fetch"
 
@@ -9719,100 +9674,100 @@ msgstr "đoạn đư�ng dẫn “..� không hợp lệ"
 msgid "Fetching objects"
 msgstr "�ang lấy v� các đối tượng"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "gặp lỗi khi đ�c “%s�"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "“%s� tại cây làm việc chình không phải là thư mục kho"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "tập tin “%s� không chứa đư�ng dẫn tuyệt đối đến vị trí cây làm việc hiện"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" không tồn tại"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "“%s� không phải là tập tin .git, mã lỗi %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "“%s� không chỉ ngược đến “%s�"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "không phải thư mục"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git không phải là một tập tin"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr "tệp .git bị h�ng"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr "tập tin .git không chính xác"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "không phải là một đư�ng dẫn hợp lệ"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "không thể phân bổ kho chứa; .git không phải là một tập tin"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "không thể phân bổ kho chứa; tập tin .git bị h�ng"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir không thể đ�c được"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir không chính xác"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "không phải thư mục hợp lệ"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "tập tin gitdir không tồn tại"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "không thể đ�c tập tin gitdir (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "đ�c ngắn (cần %<PRIuMAX> byte, đ�c %<PRIuMAX>)"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "tập tin gitdir (thư mục git) không hợp lệ"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "tập tin gitdir chỉ đến vị trí không tồn tại"
 
@@ -9873,11 +9828,11 @@ msgstr ""
 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:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "Những thay đổi sẽ được chuyển giao:"
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
 
@@ -9981,21 +9936,21 @@ msgstr "nội dung bị sửa đổi, "
 msgid "untracked content, "
 msgstr "nội dung chưa được theo dõi, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, 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:989
+#: wt-status.c:995
 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:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -10003,7 +9958,7 @@ msgstr ""
 "Không sửa hay xóa b� đư�ng ở trên.\n"
 "M�i thứ phía dưới sẽ được xóa b�."
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -10014,109 +9969,116 @@ msgstr ""
 "Nó cần %.2f giây để tính toán giá trị của trước/sau của nhánh.\n"
 "Bạn có thể dùng “--no-ahead-behind� tránh phải đi�u này.\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "Bạn có những đư�ng dẫn chưa được hòa trộn."
 
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
 
-#: wt-status.c:1200
+#: wt-status.c:1206
 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:1204
+#: wt-status.c:1210
 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:1207
+#: wt-status.c:1213
 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:1216
+#: wt-status.c:1224
 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:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "Miếng vá hiện tại bị trống rỗng."
 
-#: wt-status.c:1223
+#: wt-status.c:1232
 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:1225
+#: wt-status.c:1234
 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:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr ""
+"  (dùng \"git am --allow-empty\" ghi miếng vá này như một lần chuyển giao "
+"rá»—ng)"
+
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "thiếu git-rebase-todo."
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "Không thực hiện lệnh nào."
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (xem thêm trong %s)"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "Không có lệnh nào còn lại."
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
 
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (dùng lệnh \"git rebase --edit-todo\" để xem và sửa)"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Bạn hiện nay đang thực hiện việc “rebase� nhánh “%s� trên “%s�."
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "Bạn hiện nay đang thực hiện việc “rebase� (cải tổ)."
 
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 "  (sửa các xung đột và sau đó chạy lệnh “cải tổ� \"git rebase --continue\")"
 
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (dùng lệnh “cải tổ� \"git rebase --skip\" để b� qua lần vá này)"
 
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (dùng lệnh “cải tổ� \"git rebase --abort\" để check-out nhánh nguyên thủy)"
 
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 "  (khi tất cả các xung đột đã sửa xong: chạy lệnh “cải tổ� \"git rebase --"
 "continue\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -10124,169 +10086,169 @@ msgstr ""
 "Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao trong khi "
 "đang “rebase� nhánh “%s� trên “%s�."
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc "
 "rebase."
 
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Một khi thư mục làm việc của bạn đã g�n gàng, chạy lệnh “cải tổ� \"git "
 "rebase --continue\")"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao trong khi đang "
 "rebase nhánh “%s� trên “%s�."
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase."
 
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (dùng \"git commit --amend\" để “tu bổ� lần chuyển giao hiện tại)"
 
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (chạy lệnh “cải tổ� \"git rebase --continue\" một khi bạn cảm thấy hài "
 "lòng v� những thay đổi của mình)"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick hiện tại đang được thực hiện."
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Bạn hiện nay đang thực hiện việc cherry-pick lần chuyển giao %s."
 
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 "  (sửa các xung đột và sau đó chạy lệnh \"git cherry-pick --continue\")"
 
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
 
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git cherry-pick --"
 "continue\")"
 
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (dùng \"git cherry-pick --skip\" để b� qua miếng vá này)"
 
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (dùng \"git cherry-pick --abort\" để hủy b� thao tác cherry-pick)"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "Hoàn nguyên hiện tại đang thực hiện."
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s�."
 
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
 
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (chạy lệnh \"git revert --continue\" để tiếp tục)"
 
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
 
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (dùng lệnh \"git revert --skip\" để b� qua lần vá này)"
 
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (dùng \"git revert --abort\" để hủy b� thao tác hoàn nguyên)"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
 "nhánh “%s�."
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
 
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "Bạn đang trong lần lấy ra sparse."
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr ""
 "Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện "
 "tại."
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "Trên nhánh "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "rebase đang được thực hiện: lên trên "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "HEAD được tách r�i tại "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "HEAD được tách r�i từ "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "Hiện tại chẳng ở nhánh nào cả."
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "Lần chuyển giao khởi tạo"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "Vẫn chưa chuyển giao"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "Những tập tin chưa được theo dõi"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "Những tập tin bị l� đi"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10298,32 +10260,32 @@ msgstr ""
 "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
 "tự thêm các tập tin mới (xem “git help status�.."
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
 
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " (dùng tùy ch�n -u để hiển thị các tập tin chưa được theo dõi)"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "Không có thay đổi nào"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -10332,87 +10294,87 @@ msgstr ""
 "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
 "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
 "theo dõi hiện diện\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
 "đưa vào theo dõi)\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "không có gì để chuyển giao\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD (không nhánh)"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "khác"
 
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "đằng sau "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "phía trước "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 "thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "không thể gửi lệnh IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "không thể đ�c đáp ứng IPC"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "không thể khởi chạy accept_thread “%s�"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "không thể khởi chạy bộ làm việc worker[0] cho “%s�"
@@ -10450,113 +10412,119 @@ 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:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Không thể đ�c bảng mục lục"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "Không thể ghi ra miếng vá"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "gặp lỗi khi sửa miếng vá"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Không thể lấy thông tin thống kê v� “%s�"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "Miếng vá trống rỗng. Nên b� qua."
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Không thể áp dụng miếng vá “%s�"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 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:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "chạy thử"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "chi tiết"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "sửa bằng cách tương tác"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "ch�n “hunks� theo kiểu tương tác"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "sửa diff hiện nay và áp dụng nó"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 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:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "cập nhật các tập tin được theo dõi"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "thư�ng hóa lại EOL của các tập tin được theo dõi (ý là -u)"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 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:381
+#: builtin/add.c:378
 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:384
+#: builtin/add.c:381
 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:386
+#: builtin/add.c:383
 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:387
+#: builtin/add.c:384
 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:388
+#: builtin/add.c:385
 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:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "cho phép cập nhật các mục ở ngoài “sparse-checkout cone�"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 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:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "cảnh báo khi thêm một kho nhúng"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "ứng dụng chạy phía sau cho “git stash -p�"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10587,12 +10555,12 @@ msgstr ""
 "\n"
 "Xem \"git help submodule\" để biết thêm chi tiết."
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "thêm cần một kho git nhúng: %s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10602,51 +10570,27 @@ msgstr ""
 "Tắt thông báo này bằng cách chạy lệnh\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "thêm tập tin gặp lỗi"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run xung khắc với --interactive/--patch"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file xung khắc với --interactive/--patch"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file xung khắc với --edit"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A và -u xung khắc nhau"
-
-#: builtin/add.c:547
-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:551
+#: builtin/add.c:548
 #, 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:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đư�ng dẫn"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul cần --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' và các tham số đặc tả đư�ng dẫn không thể dùng cùng nhau"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, 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:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10656,109 +10600,117 @@ msgstr ""
 "Tắt thông báo này bằng cách chạy lệnh\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "Giá trị cho --empty không hợp lệ: %s"
+
+#: builtin/am.c:392
 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:456
+#: builtin/am.c:482
 #, 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:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Dòng đầu vào dị hình: “%s�."
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, 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:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek gặp lỗi"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "không thể phân tích cú pháp “%s�"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 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:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "dấu th�i gian không hợp lệ"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "dòng Ngày tháng không hợp lệ"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "độ lệch múi gi� không hợp lệ"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "Dò tìm định dạng miếng vá gặp lỗi."
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "Gặp lỗi khi chia nh� các miếng vá."
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Khi bạn đã giải quyết xong trục trặc này, hãy chạy \"%s --continue\"."
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, 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:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr ""
+"�ể ghi một miếng vá trống rỗng như một lần chuyển giao rông, \"%s --allow-"
+"empty\"."
+
+#: builtin/am.c:1161
 #, 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:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể "
 "bị mất."
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "Miếng vá trống rỗng."
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "thiếu dòng tác giả trong lần chuyển gia %s"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "dòng định danh không hợp lệ: %.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "Kho thiếu đối tượng blob cần thiết để thực hiện “3-way merge�."
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 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:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10766,24 +10718,24 @@ 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:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "�ang dùng phương án dự phòng: vá bản cơ sở và “hòa trộn 3-đư�ng�…"
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "Gặp lỗi khi trộn vào các thay đổi."
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "áp dụng vào một lịch sử trống rỗng"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, 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:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -10791,41 +10743,59 @@ 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:1708
+#: builtin/am.c:1735
 #, c-format
 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:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "không thể ghi tập tin lưu mục lục"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, 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:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "�ang b� qua: %.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "�ang tạo một lần chuyển giao trống rỗng: %.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "Miếng vá trống rỗng."
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�p dụng: %.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 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:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gặp lỗi khi vá tại %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "Dùng “git am --show-current-patch=diff� để xem miếng vá bị lỗi"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "Không có thay đổi nào - được ghi thành một lần chuyển giao rỗng."
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10836,7 +10806,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:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10849,17 +10819,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:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Không thể phân tích đối tượng “%s�."
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "gặp lỗi khi d�n bảng mục lục"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -10867,160 +10837,168 @@ 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:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Giá trị không hợp lệ cho --patch-format: %s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "Giá trị không hợp lệ cho --show-current-patch: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "tùy ch�n '%s=%s' và '%s=%s' không thể dùng cùng nhau"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<các tùy ch�n>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<các tùy ch�n>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "tùy ch�n lịch sử -- không-toán-tử"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 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:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "im lặng"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "thêm dòng Signed-off-by vào cuối ghi chú của lần chuyển giao"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển c� -k cho git-mailinfo"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển c� -b cho git-mailinfo"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển c� -m cho git-mailinfo"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 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:2292
+#: builtin/am.c:2348
 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:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "cắt m�i thứ trước dòng scissors"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "chuyển nó qua git-mailinfo"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "chuyển nó qua git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "định dạng"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 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:2332
+#: builtin/am.c:2388
 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:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "b� qua miếng vá hiện hành"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 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:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "b� qua thao tác vá nhưng vẫn giữ HEAD nơi nó chỉ đến"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "hiển thị miếng vá đã được áp dụng rồi"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "ghi lại miếng vá trống rỗng như là một lần chuyển giao trống"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "nói dối v� ngày chuyển giao"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 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:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "mã-số-khóa"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "Các lần chuyển giao ký-GPG"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "xử lý các miếng vá trống rỗng như thế nào"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "(dùng nội bộ cho git-rebase)"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -11028,16 +11006,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:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, 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:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -11046,11 +11024,11 @@ 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:2431
+#: builtin/am.c:2493
 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."
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lệnh"
 
@@ -11510,11 +11488,11 @@ msgstr "không coi các lần chuyển giao gốc là giới hạn (Mặc địn
 msgid "show work cost statistics"
 msgstr "hiển thị thống kê công sức làm việc"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "ép buộc báo cáo tiến triển công việc"
@@ -11563,7 +11541,7 @@ msgstr "hiển thị thÆ° Ä‘iện tá»­ của tác giả thay cho tên (Mặc Ä‘á
 msgid "ignore whitespace differences"
 msgstr "b� qua các khác biệt do khoảng trắng gây ra"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "rev"
 
@@ -11616,7 +11594,7 @@ msgstr "vùng"
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "xử lý chỉ dòng vùng <đầu>,<cuối> hoặc tính năng :<funcname>"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -11629,17 +11607,17 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 năm, 11 tháng trước"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "tập tin %s chỉ có %lu dòng"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Các dòng blame"
 
@@ -11671,7 +11649,7 @@ msgstr "git branch [<các tùy ch�n>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<các tùy ch�n>] [-r | -a] [--format]"
 
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11680,7 +11658,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:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11689,12 +11667,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:172
+#: builtin/branch.c:171
 #, 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:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11703,7 +11681,7 @@ 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:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "Cập nhật tập tin cấu hình gặp lỗi"
 
@@ -11715,99 +11693,99 @@ msgstr "không thể dùng tùy ch�n -a với -d"
 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:244
+#: builtin/branch.c:247
 #, 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:259
+#: builtin/branch.c:262
 #, 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:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "không tìm thấy nhánh “%s�."
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, 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:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Nhánh “%s� đã bị xóa (từng là %s)\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "không thể phân tích chuỗi định dạng"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, 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:497
+#: builtin/branch.c:501
 #, 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:514
+#: builtin/branch.c:518
 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:516
+#: builtin/branch.c:520
 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:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Tên nhánh không hợp lệ: “%s�"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "Gặp lỗi khi đổi tên nhánh"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "Gặp lỗi khi sao chép nhánh"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "�ã tạo một bản sao của nhánh khuyết danh “%s�"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�ã đổi tên nhánh khuyết danh “%s� đi"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, 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:580
+#: builtin/branch.c:584
 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:582
+#: builtin/branch.c:586
 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:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11818,180 +11796,176 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c� sẽ được cắt b�.\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 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:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "không xuất các thông tin"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "đặt cấu hình thao dõi nhánh"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "không dùng"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "thượng nguồn"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "thay đổi thông tin thượng nguồn"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "b� đặt thông tin thượng nguồn"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "tô màu kết xuất"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "thao tác trên nhánh “remote-tracking�"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 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:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 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:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "Hành động git-branch:"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "liệt kê cả nhánh “remote-tracking� và nội bộ"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "xóa một toàn bộ nhánh đã hòa trộn"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 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:656
+#: builtin/branch.c:663
 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:657
+#: builtin/branch.c:664
 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:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "sao chép một nhánh và reflog của nó"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 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:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "liệt kê các tên nhánh"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "hiển thị nhánh hiện hành"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "tạo reflog của nhánh"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "sửa mô tả cho nhánh"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "buộc tạo, di chuyển/đổi tên, xóa"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 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:667
+#: builtin/branch.c:674
 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:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "liệt kê các nhánh trong các cột"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "đối tượng"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "chỉ hiển thị các nhánh của đối tượng"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 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:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "định dạng sẽ dùng cho đầu ra"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "tùy ch�n --column và --verbose xung khắc nhau"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "cần chỉ ra tên nhánh"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "Không thể đưa ra mô tả HEAD đã tách r�i"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 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:780
+#: builtin/branch.c:786
 #, 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:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Không có nhánh nào có tên “%s�."
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 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:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "quá nhi�u tham số cho thao tác đổi tên"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "quá nhi�u tham số để đặt thượng nguồn mới"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11999,30 +11973,30 @@ 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:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "không có nhánh nào như thế “%s�"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "chưa có nhánh “%s�"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "quá nhi�u tham số để b� đặt thượng nguồn"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 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:846
+#: builtin/branch.c:852
 #, 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:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -12031,7 +12005,7 @@ msgstr ""
 "nhánh.\n"
 "Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12302,8 +12276,8 @@ 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:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "chặn các báo cáo tiến trình hoạt động"
 
@@ -12361,10 +12335,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<các tùy ch�n>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "chuá»—i"
 
@@ -12429,96 +12403,91 @@ msgstr "git switch [<các tùy ch�n>] [<nhánh>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<các tùy ch�n>] [--source=<nhánh>] <tập tin>…"
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "đư�ng dẫn “%s� không có các phiên bản của chúng ta"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "đư�ng dẫn “%s� không có các phiên bản của chúng"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "đư�ng dẫn “%s� không có tất cả các phiên bản cần thiết"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "đư�ng dẫn “%s� không có các phiên bản cần thiết"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "đư�ng dẫn “%s�: không thể hòa trộn"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Không thể thêm kết quả hòa trộn cho “%s�"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "�ã tạo lại %d xung đột hòa trộn"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "�ã cập nhật đư�ng dẫn %d từ %s"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "�ã cập nhật đư�ng dẫn %d từ mục lục"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "không được dùng “%s� với các đư�ng dẫn cập nhật"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "không được dùng “%s� với %s"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Không thể cập nhật các đư�ng dẫn và chuyển đến nhánh “%s� cùng một lúc."
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "không chỉ định “%s� cũng không “%s�"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "phải có “%s� khi không chỉ định “%s�"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "“%s� hay “%s� không thể được sử dụng với %s"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "đư�ng dẫn “%s� không được hòa trộn"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 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:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12528,50 +12497,50 @@ msgstr ""
 "sau:\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, 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:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD hiện gi� tại"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "không thể cập nhật HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�ặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�ã sẵn sàng trên “%s�\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, 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:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "�ã chuyển đến nhánh mới “%s�\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "�ã chuyển đến nhánh “%s�\n"
 
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhi�u hơn %d.\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12590,7 +12559,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12611,19 +12580,19 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 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:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 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:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12632,7 +12601,7 @@ msgstr ""
 "“%s� không thể là cả tập tin nội bộ và một nhánh theo dõi.\n"
 "Vui long dùng -- (và tùy ch�n thêm --no-guess) để tránh lẫn lộn"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12652,51 +12621,51 @@ msgstr ""
 "chưa rõ ràng, ví dụ máy chủ “origin�, cân nhắc cài đặt\n"
 "checkout.defaultRemote=origin trong cấu hình của bạn."
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "“%s� khớp với nhi�u (%d) nhánh máy chủ được theo dõi"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "chỉ cần một tham chiếu"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, 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:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiếu không hợp lệ: %s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, 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:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s�"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s�"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "cần một nhánh, nhưng lại nhận được “%s�"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "cần một nhánh, nhưng lại nhận được “%s�"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12704,7 +12673,7 @@ msgstr ""
 "không thể chuyển nhánh trong khi đang hòa trộn\n"
 "Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"."
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12712,7 +12681,7 @@ msgstr ""
 "không thể chuyển nhanh ở giữa một phiên am\n"
 "Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"."
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12720,7 +12689,7 @@ msgstr ""
 "không thể chuyển nhánh trong khi cải tổ\n"
 "Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"."
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12728,7 +12697,7 @@ msgstr ""
 "không thể chuyển nhánh trong khi  cherry-picking\n"
 "Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"."
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12736,143 +12705,131 @@ msgstr ""
 "không thể chuyển nhánh trong khi hoàn nguyên\n"
 "Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"."
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr ""
 "bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa "
 "bÆ°á»›c"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 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:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, 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:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "“%s� không thể được dùng với “%s�"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "“%s� không thể nhận <điểm-đầu>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, 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:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 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:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "xung đột kiểu (hòa trộn, diff3 hoặc zdiff3)"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "r�i b� HEAD tại lần chuyển giao theo tên"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "đặt thông tin thượng nguồn cho nhánh mới"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 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:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "cập nhật các tập tin bị b� qua (mặc định)"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 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:1555
+#: builtin/checkout.c:1576
 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:1558
+#: builtin/checkout.c:1579
 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:1562
+#: builtin/checkout.c:1583
 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 rải rác"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c, -%c và --orphan loại từ lẫn nhau"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "tùy ch�n '-%c', '-%c' và '%s' không thể dùng cùng nhau"
 
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p và --overlay loại từ lẫn nhau"
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "thiếu tên nhánh; hãy thử -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "không thể phân giải “%s�"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "đư�ng dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, 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:1725
+#: builtin/checkout.c:1745
 #, 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:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file xung khắc với --detach"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file xung khắc với --patch"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -12880,71 +12837,71 @@ msgstr ""
 "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
 "checkout bảng mục lục (index)."
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "bạn phải chỉ định các thư mục muốn hồi phục"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "nhánh"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "tạo và checkout một nhánh mới"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "tạo/đặt_lại và checkout một nhánh"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "gợi ý thứ hai “git checkout <không-nhánh-nào-như-vậy>� (mặc định)"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "dùng chế độ che phủ (mặc định)"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "tạo và chuyển đến một nhánh mới"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "tạo/đặt_lại và chuyển đến một nhánh"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "gợi ý thứ hai \"git switch <không-nhánh-nào-như-vậy>\""
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "vứt b� các sửa đổi địa phương"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "lấy ra từ tree-ish nào"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "phục hồi bảng mục lục"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "phục hồi cây làm việc (mặc định)"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "b� qua những thứ chưa hòa trộn: %s"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "dùng chế độ che phủ"
 
@@ -12980,7 +12937,15 @@ msgstr "Nên b� qua kho chứa %s\n"
 msgid "could not lstat %s\n"
 msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "Từ chối gỡ b� thư mục làm việc hiện tại\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "Nên từ chối gỡ b� thư mục làm việc hiện tại\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12993,7 +12958,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:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -13014,33 +12979,33 @@ msgstr ""
 "*          - ch�n tất\n"
 "           - (để trống) kết thúc việc ch�n\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Hả (%s)?\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, 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:693
+#: builtin/clean.c:719
 #, 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:714
+#: builtin/clean.c:740
 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:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Xóa b� “%s� [y/N]? "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -13058,51 +13023,51 @@ 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:822
+#: builtin/clean.c:848
 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:838
+#: builtin/clean.c:864
 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:900
+#: builtin/clean.c:926
 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:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "ép buộc"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "d�n bằng kiểu tương tác"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "gỡ b� toàn bộ thư mục"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "mẫu"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "thêm <mẫu> vào trong qui tắc b� qua"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "đồng th�i gỡ b� cả các tập tin bị b� qua"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "chỉ gỡ b� những tập tin bị b� qua"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -13110,7 +13075,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:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -13118,7 +13083,7 @@ 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/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x và -X không thể dùng cùng nhau"
 
@@ -13174,19 +13139,20 @@ msgstr "thư-mục-mẫu"
 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:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "kho tham chiếu"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "chỉ dùng --reference khi nhân bản"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "tên"
@@ -13203,7 +13169,7 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
 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:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "độ-sâu"
@@ -13212,7 +13178,7 @@ msgstr "độ-sâu"
 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:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "th�i-gian"
@@ -13221,17 +13187,17 @@ msgstr "th�i-gian"
 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:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "điểm xét duyệt"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 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:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
 
@@ -13261,22 +13227,22 @@ msgstr "khóa=giá_trị"
 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:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "đặc-tả-máy-phục-vụ"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "tùy ch�n để chuyển giao"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "chỉ dùng địa chỉ IPv4"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "chỉ dùng địa chỉ IPv6"
@@ -13368,29 +13334,25 @@ msgstr "không thể đóng gói để d�n dẹp"
 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:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "Có quá nhi�u đối số."
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 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:903
 #, 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:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "tùy ch�n --bare và --separate-git-dir xung khắc nhau."
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "tùy ch�n '%s', và '%s %s' không thể dùng cùng nhau"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chứa “%s� chưa tồn tại"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, 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"
@@ -13411,8 +13373,8 @@ msgstr ""
 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:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, 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�"
@@ -13537,7 +13499,7 @@ msgstr ""
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <các tùy ch�n chia "
 "tách>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "tmục"
 
@@ -13626,7 +13588,7 @@ msgstr ""
 msgid "Collecting commits from input"
 msgstr "Sưu tập các lần chuyển giao từ đầu vào"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "không hiểu câu lệnh con: %s"
@@ -13644,7 +13606,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "cha mẹ bị trùng lặp %s đã bị b� qua"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "không phải là tên đối tượng hợp lệ “%s�"
@@ -13667,13 +13629,13 @@ msgstr "cha-mẹ"
 msgid "id of a parent commit object"
 msgstr "mã số của đối tượng chuyển giao cha mẹ"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "chú thích"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "chú thích của lần chuyển giao"
 
@@ -13681,7 +13643,7 @@ msgstr "chú thích của lần chuyển giao"
 msgid "read commit log message from file"
 msgstr "đ�c chú thích nhật ký lần chuyển giao từ tập tin"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "Ký lần chuyển giao dùng GPG"
@@ -13764,10 +13726,6 @@ msgstr ""
 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:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file với -a là không có ý nghĩa gì"
-
 #: builtin/commit.c:375
 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ý."
@@ -13858,8 +13816,8 @@ msgstr "không đ�c được tệp nhật ký “%s�"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "không thể kết hợp “-m� với “--fixup�:%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "tùy ch�n '%s', và '%s:%s' không thể dùng cùng nhau"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -13970,7 +13928,7 @@ msgstr "không thể chuyển phần đuôi cho “--trailers�"
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, 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"
@@ -13987,15 +13945,11 @@ msgstr ""
 msgid "Invalid ignored mode '%s'"
 msgstr "Chế độ b� qua không hợp lệ “%s�"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, 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:1196
-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:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr ""
@@ -14009,120 +13963,118 @@ msgstr ""
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "không thể tổ hợp tùy ch�n \"reword\" của --fixup với đư�ng dẫn “%s�"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr ""
+"không thể tổ hợp tùy ch�n \"reword\" của '%s' với đư�ng dẫn '%s' cùng nhau"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"tùy ch�n \"reword\" của --fixup là loại trừ qua lại với --patch/--"
-"interactive/--all/--include/--only"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "không thể tổ hợp tùy ch�n \"reword\" của '%s' với '%s' cùng nhau"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 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:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ� cả."
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 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:1265
+#: builtin/commit.c:1266
 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:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr ""
 "Bạn đang ở giữa của quá trình cải tổ -- nên không thể thực hiện việc “tu bổ�."
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 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:1280
+#: builtin/commit.c:1281
 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/-F/--fixup."
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "Tùy ch�n -m không thể được tổ hợp cùng với -c/-C/-F."
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 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:1309
+#: builtin/commit.c:1310
 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:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "không hiểu tùy ch�n: --fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "các đư�ng dẫn “%s …� với tùy ch�n -a không hợp lý"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "hiển thị trạng thái ở dạng súc tích"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "hiển thị thông tin v� tạm cất"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "tính đầy đủ giá trị trước/sau"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "phiên bản"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "kết xuất dạng máy-có-thể-đ�c"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 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:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "chấm dứt các mục bằng NUL"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "chế độ"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 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:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -14130,11 +14082,11 @@ msgstr ""
 "hiển thị các tập tin bị b� qua, các chế độ tùy ch�n: traditional, matching, "
 "no. (Mặc định: traditional)"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -14142,199 +14094,199 @@ 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:1511
+#: builtin/commit.c:1512
 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:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "không dò tìm các tên thay đổi"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Không hỗ trỡ tổ hợp các tham số các tập tin bị b� qua và không được theo dõi"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 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:1620
+#: builtin/commit.c:1621
 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:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "Các tùy ch�n ghi chú commit"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "đ�c chú thích từ tập tin"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "lần_chuyển_giao"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 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:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "dùng ghi chú có định dạng autosquash để sửa chữa hoặc tu bổ/reword lần "
 "chuyển giao đã chỉ ra"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 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:1635
+#: builtin/commit.c:1636
 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:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "bộ dò vết"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "thêm đuôi tự ch�n"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "thêm dòng Signed-off-by vào cuối"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 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:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "chuyển giao tất cả các tập tin có thay đổi"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 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:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "thêm các tập-tin bằng tương tác"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "vòng qua móc (hook) pre-commit và commit-msg"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "hiển thị xem cái gì có thể được chuyển giao"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "“tu bổ� (amend) lần commit trước"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "ok để ghi lại một thay đổi trống rỗng"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 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:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tập tin MERGE_HEAD sai h�ng (%s)"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "không thể đ�c MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, 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:1787
+#: builtin/commit.c:1788
 #, 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:1792
+#: builtin/commit.c:1793
 #, 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:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr ""
 "Bãi b� việc chuyển giao bởi vì phần thân chú thích của nó trống rỗng.\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14842,7 +14794,7 @@ msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
 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:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
 
@@ -14858,25 +14810,14 @@ msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-
 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:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long là xung khắc với tùy ch�n --abbrev=0"
-
 #: builtin/describe.c:622
 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:673
-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:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken là xung khắc với commit-ishes"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin và --merge-base loại từ lẫn nhau"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "tùy ch�n '%s' và commit-ishes không thể dùng cùng nhau"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14897,26 +14838,26 @@ msgstr "tùy ch�n không hợp lệ: %s"
 msgid "%s...%s: no merge base"
 msgstr "%s…%s: không có cơ sở hòa trộn"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "Không phải là kho git"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "đối tượng đã cho “%s� không hợp lệ."
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "đã cho nhi�u hơn hai đối tượng blob: “%s�"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "đã cho đối tượng không thể nắm giữ “%s�."
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s…%s: có nhi�u cơ sở để hòa trộn, nên dùng %s"
@@ -14927,22 +14868,22 @@ 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:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, 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:303
+#: builtin/difftool.c:297
 #, 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:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14950,88 +14891,80 @@ 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:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "cả hai tập tin đã bị sửa: “%s� và “%s�."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "cây làm việc ở bên trái."
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "các tập tin tạm đã sẵn có trong “%s�."
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "bạn có lẽ muốn d�n dẹp hay phục hồi ở đây."
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "gặp lỗi: %d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "thực hiện một diff toàn thư mục"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 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:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "dùng liên kết m�m trong diff-thư-mục"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "công cụ"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "dùng công cụ diff đã cho"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 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:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "làm cho “git-difftool� thoát khi g�i công cụ diff trả v� mã khác không"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "chỉ định một lệnh tùy ý để xem diff"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "chuyển cho “diff�"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool cần cây làm việc hoặc --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff xung khắc với --no-index"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 
@@ -15070,126 +15003,118 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "Lỗi: không thể xuất thẻ lồng nhau trừ khi --mark-tags được chỉ định."
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map thẻ không thể là rỗng"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "hiển thị tiến triển sau <n> đối tượng"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "ch�n đi�u khiển của thẻ đã ký"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 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:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "ch�n bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "đổ các đánh dấu này vào tập-tin"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "nhập vào đánh dấu từ tập tin này"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "nhập vào đánh dấu từ tập tin sẵn có"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 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:1219
+#: builtin/fast-export.c:1192
 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:1221
+#: builtin/fast-export.c:1194
 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:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "b� qua kết xuất của dữ liệu blob"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "áp dụng refspec cho refs đã xuất"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "kết xuất anonymize"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "từ:đến"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "chuyển đổi <from> sang <to> đầu ra ẩn danh"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 "các cha mẹ tham chiếu cái mà không trong luồng dữ liệu fast-export bởi mã id "
 "đối tượng"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "hiển thị các mã id nguyên gốc của blobs/commits"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "gắn thẻ với các mã ID đánh dấu"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map mà không có --anonymize là không hợp lý"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "Không thể chuyển qua cả hai --import-marks và --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "Thiếu các đánh dấu cho mô-đun-con “%s�"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "Thiếu đánh dấu cho mô-đun-con “%s�"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "Cần lệnh “mark�, nhưng lại nhận được %s"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "Cần lệnh “to�, nhưng lại nhận được %s"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "Cần định dạng tên:tên_tập_tin cho tùy ch�n ghi lại mô-đun-con"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr ""
@@ -15200,119 +15125,119 @@ msgstr ""
 msgid "Lockfile created but not reported: %s"
 msgstr "Tập tin khóa đã được tạo nhưng chưa được báo cáo: %s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<các tùy ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<các tùy ch�n>] [<nhóm>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<các tùy ch�n>] [(<kho> | <nhóm>)…]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<các tùy ch�n>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel không thể âm"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "lấy v� từ tất cả các máy chủ"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "đặt thượng nguồn cho git pull/fetch"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 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:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "sử dụng giao dịch hạt nhân bên phía máy chủ"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 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:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "lấy từ nhi�u máy chủ cùng lúc"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 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:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "không lấy tất cả các thẻ (--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "số lượng mô-đun-con được lấy đồng th�i"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr ""
 "sửa đặc tả đư�ng dẫn cho các tham chiếu m�i chỗ có trong refs/prefetch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 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:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
 
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "khi-cần"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 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:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "ghi các tham chiếu lấy v� vào tập tin FETCH_HEAD"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "giữ lại gói đã tải v�"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "cho phép cập nhật th.chiếu HEAD"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "làm sâu hơn lịch sử của bản sao"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 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:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "chuyển đổi hoàn toàn sang kho git"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 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:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -15320,142 +15245,146 @@ 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:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "chỉ ra refmap cần lấy v�"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 "báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 "không lấy v� một packfile; thay vào đó, hãy in tổ tiên của đỉnh đàm phán"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "chạy “maintenance --auto� sau khi lấy v�"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "kiểm cho các-cập-nhật-bắt-buộc trên m�i nhánh đã cập nhật"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "ghi ra đồ thị các lần chuyển giao sau khi lấy v�"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "chấp nhận tham chiếu từ đầu vào tiêu chuẩn"
 
-#: builtin/fetch.c:586
-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:592
+msgid "couldn't find remote ref HEAD"
+msgstr "không thể tìm thấy HEAD tham chiếu máy chủ"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, 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:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "không tìm thấy đối tượng %s"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[đã cập nhật]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[Bị từ chối]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "không thể fetch (lấy) v� nhánh hiện hành"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "lấy ra trong cây làm việc khác"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[cập nhật thẻ]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "không thể cập nhật tham chiếu nội bộ"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "nên xóa chồng các thẻ có sẵn"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[thẻ mới]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[nhánh mới]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[ref (tham chiếu) mới]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "cưỡng bức cập nhật"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "không-phải-chuyển-tiếp-nhanh"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"Việc lấy v� thư�ng chỉ ra các nhánh buộc phải cập nhật,\n"
-"nhưng lựa ch�n bị tắt. �ể kích hoạt lại, sử dụng c�\n"
+"việc lấy v� thư�ng chỉ ra các nhánh buộc phải cập nhật,\n"
+"nhưng lựa ch�n bị tắt; để kích hoạt lại, sử dụng c�\n"
 "“--show-forced-updates� hoặc chạy “git config fetch.showForcedUpdates true�."
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"Việc này cần %.2f giây để kiểm tra các cập nhật ép buộc. Bạn có thể dùng\n"
+"việc này cần %.2f giây để kiểm tra các cập nhật ép buộc; bạn có thể dùng\n"
 "“--no-show-forced-updates� hoặc chạy “git config fetch.showForcedUpdates "
 "false�\n"
-"để tránh kiểm tra này.\n"
+"để tránh kiểm tra này\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, 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:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %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:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "Từ %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15464,143 +15393,142 @@ 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:1341
+#: builtin/fetch.c:1349
 #, 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:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s đã trở thành không đầu (không được quản lý))"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[đã xóa]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "(không)"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, 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)"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "từ chối lấy v� vào nhánh “%s� đã được lấy ra tại “%s�"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, 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"
+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:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Tùy ch�n \"%s\" bị b� qua với %s\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "tùy ch�n \"%s\" bị b� qua với %s\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "đối tượng “%s� không tồn tại"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "phát hiện nhi�u nhánh, không tương thích với --set-upstream"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"không thể đặt thượng nguồn của HEAD thành '%s' từ '%s' khi mà nó chẳng chỉ "
+"đến nhánh nào cả."
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "không cài đặt thượng nguồn cho một nhánh được theo dõi trên máy chủ"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "không cài đặt thượng nguồn cho một thẻ nhánh trên máy chủ"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "không hiểu kiểu nhánh"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 "không tìm thấy nhánh nguồn.\n"
-"bạn cần phải chỉ định chính xác một nhánh với tùy ch�n --set-upstream."
+"bạn cần phải chỉ định chính xác một nhánh với tùy ch�n --set-upstream"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "�ang lấy “%s� v�\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
-msgstr "Không thể lấy“%s� v�"
+msgid "could not fetch %s"
+msgstr "không thể lấy “%s� v�"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "không thể lấy “%s� (mã thoát: %d)\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
 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�)."
+"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:1945
-msgid "You need to specify a tag name."
-msgstr "Bạn phải định rõ tên thẻ."
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "bạn cần chỉ định một tên thẻ"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only cần một tham số hay nhi�u --negotiate-tip=* hơn"
 
-#: builtin/fetch.c:2013
-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:2015
-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:2036
+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:2020
-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:2022
+#: builtin/fetch.c:2045
 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:2039
+#: builtin/fetch.c:2062
 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:2041
+#: builtin/fetch.c:2064
 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:2050
+#: builtin/fetch.c:2073
 #, 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"
+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:2057
-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ý"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "việc lấy v� một nhóm và chỉ định refspecs là không hợp lý"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "phải cung cấp máy chủ khi sử dụng --negotiate-only"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "Giao thức không hỗ trợ --negotiate-only, nên thoát."
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "giao thức không hỗ trợ --negotiate-only, nên thoát"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -15608,11 +15536,11 @@ msgstr ""
 "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
 "partialclone"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic chỉ có thể dùng khi lấy v� từ một máy chủ"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin chỉ có thể dùng khi lấy v� từ một máy chủ"
 
@@ -15623,23 +15551,27 @@ msgstr ""
 "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
 "tin>]"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:19
 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:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "bí danh cho --log (không được dùng)"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "văn bản"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 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:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "dùng <tên> thay cho nhánh đích thật"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "tập tin để đ�c dữ liệu từ đó"
 
@@ -15663,47 +15595,47 @@ msgstr ""
 "git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-"
 "chuyển-giao>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "trích dẫn để phù hợp cho hệ v� (shell)"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "trích dẫn để phù hợp cho perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "trích dẫn để phù hợp cho python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "trích dẫn để phù hợp cho Tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "hiển thị chỉ <n> tham chiếu khớp"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "các màu định dạng lưu tâm"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 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:46
+#: builtin/for-each-ref.c:47
 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:47
+#: builtin/for-each-ref.c:48
 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:48
+#: builtin/for-each-ref.c:49
 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:49
+#: builtin/for-each-ref.c:50
 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"
 
@@ -15854,124 +15786,124 @@ msgstr "%s: thiếu đối tượng hoặc h�ng: %s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s: đối tượng có kiểu chưa biết “%s�: %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: không thể phân tích cú đối tượng: %s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "tập tin sha1 sai: %s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "�ang kiểm tra thư mục đối tượng"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "�ang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "�ang lấy liên kết %s"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "%s không hợp lệ"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: HEAD đã tách r�i không chỉ vào đâu cả"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "�ang kiểm tra cây nhớ tạm"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: con tr� sha1 không hợp lệ trong cache-tree"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "non-tree trong cache-tree"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các tùy ch�n>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "hiển thị các đối tượng không thể đ�c được"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "hiển thị các đối tượng không được quản lý"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes�"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes� (mặc định)"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 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:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "cho phép kiểm tra hạn chế hơn"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 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:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "hiển thị quá trình"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 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:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "�ang kiểm tra các đối tượng"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: thiếu đối tượng"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s�"
@@ -15990,17 +15922,12 @@ msgstr "Gặp lỗi khi lấy thông tin thống kê v� tập tin %s: %s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "gặp lỗi khi phân tích “%s� giá trị “%s�"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "không thể lấy thông tin thống kê v� “%s�"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "không thể đ�c “%s�"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -16015,54 +15942,54 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "xóa b� các đối tượng không được tham chiếu"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 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:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "bật chế độ auto-gc"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 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:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, 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:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "gặp lỗi khi phân tích giá trị prune %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, 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:609
+#: builtin/gc.c:610
 #, 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:610
+#: builtin/gc.c:611
 #, 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:650
+#: builtin/gc.c:652
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -16070,210 +15997,210 @@ 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:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Có quá nhi�u đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune� "
 "để xóa b� chúng đi."
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<nhiệm vụ>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule không được phép"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "đối số --schedule không được thừa nhận %s"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "gặp lỗi khi ghi đồ thị các lần chuyển giao"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "gặp lỗi khi tải trước các máy chủ"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "gặp lỗi khi lấy thông tin thống kê v� tiến trình “git pack-objects�"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "gặp lỗi khi hoàn tất tiến trình “git pack-objects�"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "gặp lỗi khi ghi multi-pack-index"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "gặp lỗi khi chạy “git multi-pack-index expire�"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "gặp lỗi khi chạy “git multi-pack-index repack�"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "b� qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "đã có khóa của tập tin “%s�, b� qua bảo trì"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s�"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "“%s� không phải một nhiệm vụ hợp lệ"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "nhiệm vụ “%s� không được ch�n nhi�u lần"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "chạy nhiệm vụ dựa trên trạng thái của kho chứa"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "tần số"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "chạy nhiệm vụ dựa trên tần suất"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "đừng báo cáo diễn tiến hay các thông tin khác ra đầu lỗi tiêu chuẩn"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "tác vụ"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "chạy một nhiệm vụ cụ thể"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "dùng nhi�u nhất là một trong --auto và --schedule=<frequency>"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "gặp lỗi khi chạy “git config�"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "gặp lỗi khi khai triển đư�ng dẫn “%s�"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "gặp lỗi khi khởi chạy launchctl"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "gặp lỗi khi tạo thư mục cho \"%s\""
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "gặp lỗi khi mồi dịch vụ %s"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "gặp lỗi khi tạo tập tin xml tạm th�i"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "gặp lỗi khi lấy thông tin thống kê v� schtasks"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr ""
 "gặp lỗi khi chạy “crontab -l�; hệ thống của bạn có thể không hỗ trợ “cron�"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "gặp lỗi khi chạy “crontab�; hiển thị của bạn có lẽ không hỗ trợ “cron�"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "gặp lỗi khi mở đầu vào tiêu chuẩn của “crontab�"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "“crontab� đã chết"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "gặp lỗi khi khởi chạy systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "gặp lỗi khi chạy systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "gặp lỗi khi xóa “%s�"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "đối số --scheduler không được thừa nhận “%s�"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "hoặc là bộ lập lịch systemd hoặc là crontab không sẵn có"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "bộ lên lịch %s không sẵn có"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "một tiến trình khác được lập kế hoạch chạy n�n để bảo trì"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<bộ lên lịch>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "bộ lên lịch"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "bộ lên lịch để kích hoạt chạy chương trình bảo trì git"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "gặp lỗi khi thêm cấu hình toàn cục"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance run <lệnh_con> [<các tùy ch�n>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "lện con không hợp lệ: %s"
@@ -16642,25 +16569,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "không nhận ra định dạng trợ giúp “%s�"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "Gặp lỗi khi khởi chạy emacsclient."
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "phiên bản của emacsclient “%d� quá cũ (< 22)."
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "gặp lỗi khi thực thi “%s�"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16669,7 +16596,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:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16678,39 +16605,39 @@ 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:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "“%s�: không rõ chương trình xem man."
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 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:490
+#: builtin/help.c:489
 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:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "“%s� được đặt bí danh thành “%s�"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "chuá»—i alias.%s sai: %s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "tùy ch�n này không nhận tham số nào khác"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "cách dùng: %s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "Chạy lệnh “git help config� để có thêm thông tin"
 
@@ -16971,18 +16898,10 @@ msgstr "%s sai"
 msgid "unknown hash algorithm '%s'"
 msgstr "không hiểu thuật toán băm dữ liệu “%s�"
 
-#: builtin/index-pack.c:1848
-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:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin cần một kho git"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format không thể được dùng với --stdin"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "dùng tùy ch�n --verify mà không đưa ra tên packfile"
@@ -17108,10 +17027,6 @@ msgstr "băm"
 msgid "specify the hash algorithm to use"
 msgstr "chỉ định thuật toán băm dữ liệu muốn dùng"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "Các tùy ch�n --separate-git-dir và --bare loại từ lẫn nhau"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -17245,85 +17160,85 @@ msgstr ""
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<vùng>:<tập_tin> không thể được sử dụng với đặc tả đư�ng dẫn"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kết xuất cuối cùng: %d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "không thể đ�c đối tượng %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "không nhận ra kiểu: %d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s: bao b�c không hợp lệ từ chế độ mô tả"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "không thể mở tập tin miếng vá: %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "cần chính xác một vùng"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "không phải là một vùng"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "“cover letter� cần cho định dạng thư"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "gặp lỗi khi tạo các tập tin cover-letter"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 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:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "hai thư mục kết xuất?"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "không hiểu lần chuyển giao %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, 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:1522
+#: builtin/log.c:1537
 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:1532
+#: builtin/log.c:1547
 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"
@@ -17334,294 +17249,277 @@ 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:1555
+#: builtin/log.c:1570
 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:1572
+#: builtin/log.c:1587
 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:1582
+#: builtin/log.c:1597
 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:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "không thể lấy mã miếng vá"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr ""
 "gặp lỗi khi suy luận range-diff (vùng khác biệt) gốc của sê-ri hiện tại"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "dùng “%s� như là gốc range-diff của sê-ri hiện tại"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 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:1752
+#: builtin/log.c:1767
 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:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "hiển thị miếng vá ra đầu ra chuẩn"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 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:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch�"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 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:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "đếm reroll"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 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:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "chi�u dài tên tập tin đầu ra tối đa"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "dùng [V� RFC] thay cho [V�]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "dùng [<ti�n-tố>] thay cho [V�]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "lưu các tập tin kết quả trong <t.mục>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [V�]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 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:1787
+#: builtin/log.c:1802
 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:1789
+#: builtin/log.c:1804
 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:1791
+#: builtin/log.c:1806
 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:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "L�i nhắn"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "đầu đ� thư"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "thêm đầu đ� thư"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "thêm To: đầu đ� thư"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đ� thư"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "thụt l�"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 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:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "dùng thư đầu tiên để trả l�i <message-id>"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "ranh giá»›i"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phép luồng l�i nhắn, kiểu: “shallow�, “deep�"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "lần_chuyển_giao_n�n"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 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:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "thêm chữ ký từ một tập tin"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 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:1822
+#: builtin/log.c:1837
 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:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "hiển thị các thay đổi dựa trên <rev> trong các chữ bao b�c hoặc miếng vá đơn"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "hiển thị các thay đổi dựa trên <refspec> trong các chữ bao b�c hoặc miếng vá "
 "Ä‘Æ¡n"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "tỷ lệ phần trăm theo cái tạo là weighted"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "dòng định danh không hợp lệ: %s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n và -k loại trừ lẫn nhau"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr ""
-"Các tùy ch�n --stdout, --output, và --output-directory loại từ lẫn nhau"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff cần --cover-letter hoặc vá đơn"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff dựa trên v%d:"
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor yêu cầu --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff dựa trên v%d:"
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "không thể đ�c tập tin chữ ký “%s�"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "�ang tạo các miếng vá"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 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:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -17629,121 +17527,125 @@ 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:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<các tùy ch�n>] [<tập-tin>…]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "các đư�ng dẫn được ngăn cách bởi ký tự NULL"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 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:619
+#: builtin/ls-files.c:622
 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:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "dùng chữ cái viết thư�ng cho các tập tin “fsmonitor clean�"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 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:625
+#: builtin/ls-files.c:628
 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:627
+#: builtin/ls-files.c:630
 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:629
+#: builtin/ls-files.c:632
 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:631
+#: builtin/ls-files.c:634
 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:634
+#: builtin/ls-files.c:637
 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:636
+#: builtin/ls-files.c:639
 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:638
+#: builtin/ls-files.c:641
 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:640
+#: builtin/ls-files.c:643
 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:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "không hiển thị thư mục rỗng"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 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:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "hiển thị thông tin resolve-undo"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 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:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "đ�c mẫu cần loại trừ từ <tập-tin>"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 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:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "thêm loại trừ tiêu chuẩn kiểu git"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 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:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "đệ quy xuyên qua mô-đun con"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 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:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "tree-ish"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 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:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "hiển thị dữ liệu gỡ lỗi"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "chặn các mục tin trùng lặp"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "hiển thị thư mục \"sparse\" trong sự có mặt của mục lục \"sparse\""
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -17937,26 +17839,30 @@ msgid "use a diff3 based merge"
 msgstr "dùng kiểu hòa dựa trên diff3"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "dùng kiểu hòa trộn dựa trên 'zealous diff3'"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "để tránh xung đột, sử dụng phiên bản của chúng ta"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "để tránh xung đột, sử dụng phiên bản của h�"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "để tránh xung đột, sử dụng phiên bản kết hợp"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "để tránh xung đột, hãy sử dụng kích thước bộ tạo này"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "không cảnh báo v� các xung đột xảy ra"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2"
 
@@ -17994,181 +17900,185 @@ msgstr "�ang hòa trộn %s với %s\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<các tùy ch�n>] [<commit>…]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "switch “m� yêu cầu một giá trị"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "tùy ch�n “%s� yêu cầu một giá trị"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, 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:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "Các chiến lược sẵn sàng là:"
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, 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:257 builtin/pull.c:134
+#: builtin/merge.c:258 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:260 builtin/pull.c:137
+#: builtin/merge.c:261 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:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 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:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 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:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 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:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "sửa chú thích trước khi chuyển giao"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 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:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 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:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "chiến lược"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "chiến lược hòa trộn sẽ dùng"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "tùy_ch�n=giá_trị"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 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:284
+#: builtin/merge.c:285
 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:291
+msgid "use <name> instead of the real target"
+msgstr "dùng <tên> thay cho đích thật"
+
+#: builtin/merge.c:294
 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:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort nhưng để lại bảng mục lục và cây làm việc"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 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:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "cho phép hòa trộn lịch sử không liên quan"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "vòng qua móc (hook) pre-merge-commit và commit-msg"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, 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:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "�ã cập nhật rồi. (không có gì để squash)"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- không cập nhật HEAD\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, 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:515
+#: builtin/merge.c:517
 #, 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:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 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:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "không hiểu chiến lược: -X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "không thể ghi %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đ�c từ “%s�"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, 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:829
+#: builtin/merge.c:831
 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"
@@ -18180,11 +18090,11 @@ msgstr ""
 "topic.\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "Nếu phần chú thích rỗng sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18193,75 +18103,75 @@ msgstr ""
 "Những dòng được bắt đầu bằng “%c� sẽ được b� qua, và nếu phần chú\n"
 "thích rỗng sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt v�i.\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, 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:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "Không phải nhánh hiện hành."
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "Không có máy chủ cho nhánh hiện hành."
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 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:1016
+#: builtin/merge.c:1018
 #, 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:1073
+#: builtin/merge.c:1075
 #, 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:1174
+#: builtin/merge.c:1177
 #, 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:1208
+#: builtin/merge.c:1211
 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:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort không nhận các đối số"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 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:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit không nhận các đối số"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue không nhận đối số"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 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:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18269,7 +18179,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:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -18277,86 +18187,78 @@ 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:1386
+#: builtin/merge.c:1389
 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:1400
-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:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "Bạn không thể kết hợp --squash với --commit."
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 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:1435
+#: builtin/merge.c:1438
 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:1437
+#: builtin/merge.c:1440
 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:1442
+#: builtin/merge.c:1445
 #, 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:1444
+#: builtin/merge.c:1447
 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:1531
+#: builtin/merge.c:1534
 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:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "�ang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, 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:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, 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:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�ang thử chiến lược hòa trộn %s…\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, 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:1722
+#: builtin/merge.c:1725
 #, 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:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "Sử dụng chiến lược %s để chuẩn bị giải quyết bằng tay.\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
@@ -18402,7 +18304,7 @@ msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 "thẻ trên đầu vào tiêu chuẩn không chỉ đến một lần chuyển giao hợp lệ nào cả"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "không thể ghi vào tập tin lưu thẻ"
 
@@ -18466,7 +18368,7 @@ msgstr "ghi mục lục multi-pack chỉ chứa các mục lục đã cho"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "ảnh chụp nhanh refs để ch�n các lần chuyển giao ánh xạ"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18566,53 +18468,53 @@ msgstr "%s, nguồn=%s, đích=%s"
 msgid "Renaming %s to %s\n"
 msgstr "�ổi tên %s thành %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gặp lỗi khi đổi tên “%s�"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<các tùy ch�n>] <commit>…"
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<các tùy ch�n>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<các tùy ch�n>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "chỉ hiển thị các tham chiếu cơ sở (không phải các tên đối tượng)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "b� qua các tham chiếu khớp với <mẫu>"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr ""
 "liệt kê tất cả các lần chuyển giao có thể đ�c được từ tất cả các tham chiếu"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "đ�c từ đầu vào tiêu chuẩn"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "cho phép in các tên “chưa định nghĩa� (mặc định)"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "bãi b� tham chiếu các thẻ trong đầu vào (dùng nội bộ)"
 
@@ -18730,26 +18632,26 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "Ghi hay sửa ghi chú cho đối tượng sau đây:"
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "không thể khởi chạy “show� cho đối tượng “%s�"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "không thể đ�c kết xuất “show�"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "gặp lỗi khi hoàn thành “show� cho đối tượng “%s�"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr ""
 "xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy ch�n -m hoặc là -F"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "không thể ghi đối tượng ghi chú (note)"
 
@@ -18758,7 +18660,7 @@ 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:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "không thể mở hay đ�c “%s�"
@@ -18800,8 +18702,8 @@ msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "có quá nhi�u đối số"
 
@@ -18848,7 +18750,7 @@ msgstr ""
 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:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "�ang gỡ b� ghi chú (note) cho đối tượng %s\n"
@@ -18972,17 +18874,17 @@ msgstr "bạn phải chỉ định tham chiếu ghi chú để hòa trộn"
 msgid "unknown -s/--strategy: %s"
 msgstr "không hiểu -s/--strategy: %s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, 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:874
+#: builtin/notes.c:878
 #, 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:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18993,41 +18895,41 @@ 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:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, 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/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "�ối tượng %s không có ghi chú (note)\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 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:913
+#: builtin/notes.c:917
 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:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "không gỡ b�, chỉ hiển thị"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "dùng “notes� từ <notes-ref>"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "không hiểu câu lệnh con: %s"
@@ -19427,10 +19329,6 @@ msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "không thể dùng tùy ch�n --filter mà không có --stdout"
@@ -19447,7 +19345,7 @@ msgstr "không thể dùng danh sách rev bên trong với --stdin-packs"
 msgid "Enumerating objects"
 msgstr "�ánh số các đối tượng"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19490,19 +19388,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <th�i-gian>] [--] [<head>…]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "các đối tượng hết hạn cũ hơn khoảng <th�i gian>"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "giới hạn giao đến các đối tượng nằm ngoài các tập tin gói hứa hẹn"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại"
 
@@ -19535,7 +19433,7 @@ msgstr "cho phép chuyển-tiếp-nhanh"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "đi�u khiển cách dùng các móc (hook) pre-merge-commit và commit-msg"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "tự động stash/stash pop trước và sau"
 
@@ -19614,6 +19512,7 @@ msgid "<remote>"
 msgstr "<máy chủ>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<nhánh>"
 
@@ -19645,13 +19544,13 @@ msgstr "không thể truy cập lần chuyển giao “%s�"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "b� qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19665,9 +19564,9 @@ msgstr ""
 "Bạn có thể làm như vậy bằng cách chạy một trong những lệnh sau đây\n"
 "thỉnh thoảng trước khi thực hiện lệnh pull tiếp theo của bạn:\n"
 "\n"
-"  git config pull.rebase false  # merge (chiến lược mặc định)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
-"  git config pull.ff only       # fast-forward only\n"
+"  git config pull.ff only       # chỉ fast-forward\n"
 "\n"
 "Bạn có thể thay thế \"git config\" với \"git config --global\" để thiết lập "
 "mặc định\n"
@@ -19676,21 +19575,21 @@ msgstr ""
 "hoặc --ff-only trên dòng lệnh để ghi đè các mặc định đã cấu hình cho mỗi\n"
 "lần g�i.\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 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:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "pull vá»›i rebase"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 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:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19701,7 +19600,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:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19719,23 +19618,23 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 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:1072
+#: builtin/pull.c:1102
 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:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "Không thể thực hiện chuyển tiếp nhanh trên nhi�u nhánh."
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "Caanfchir định làm thế nào để giải quyết các nhánh phân kỳ."
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 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ộ"
@@ -19919,7 +19818,7 @@ msgstr "�ang đẩy lên %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s�"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "kho"
 
@@ -19992,10 +19891,6 @@ msgstr "ký lần đẩy dùng GPG"
 msgid "request atomic transaction on remote side"
 msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete là xung khắc với các tùy ch�n --all, --mirror và --tags"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
@@ -20026,26 +19921,14 @@ msgstr ""
 "\n"
 "    git push <tên>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all và --tags xung khắc nhau"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all không thể được tổ hợp cùng với đặc tả đư�ng dẫn"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror và --tags xung khắc nhau"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror không thể được tổ hợp cùng với đặc tả đư�ng dẫn"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all và --mirror xung khắc nhau"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "các tùy ch�n push phải không có ký tự dòng mới"
@@ -20473,18 +20356,6 @@ msgstr ""
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges đã bị thay thế bằng --rebase-merges"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "không thể kết hợp “--keep-base� với “--onto�"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "không thể kết hợp “--keep-base� với “--root�"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "không thể kết hợp “--root� với “--fork-point�"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
@@ -20551,8 +20422,9 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy cần --merge hay --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "không thể tổ hợp các tùy ch�n áp dụng với các tùy ch�n hòa trộn"
+msgid "apply options and merge options cannot be used together"
+msgstr ""
+"không thể tổ hợp các tùy ch�n áp dụng với các tùy ch�n hòa trộn với nhau"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20593,7 +20465,7 @@ msgid "no such branch/commit '%s'"
 msgstr "không có nhánh/lần chuyển giao “%s� như thế"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "Không có tham chiếu nào như thế: %s"
@@ -20662,7 +20534,7 @@ msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thư-mục-git>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -20692,7 +20564,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:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -20713,13 +20585,13 @@ 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:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "im lặng"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "Bạn phải chỉ định thư mục."
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "bạn phải chỉ định thư mục"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20743,41 +20615,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <tham_chiếu>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "“%s� không phải là dấu th�i gian hợp lệ"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "�ánh dấu các đối tượng tiếp cận được…"
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s chẳng chỉ đến đâu cả!"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "chưa chỉ ra reflog để xóa"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "không phải một reflog: %s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "không reflog cho “%s�"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "định dạng tham chiếu không hợp lệ: %s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -20868,6 +20740,11 @@ msgstr "git remote update [<các tùy ch�n>] [<nhóm> | <máy-chủ>]…"
 msgid "Updating %s"
 msgstr "�ang cập nhật %s"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Không thể lấy“%s� v�"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -21312,150 +21189,142 @@ msgstr ""
 "không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối "
 "tượng hứa hẹn"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: �ang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-"
 "objects."
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "không thể mở mục lục cho “%s�"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "gói %s là quá lớn để được xem là trong tiến trình hình h�c"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "gói %s là quá lớn để được cuộn lại"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "không thể mở tập tin tạm %s để ghi"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "không thể đóng tập tin tạm th�i chụp nhanh các tham chiếu"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "đóng gói m�i thứ trong một gói đơn"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "giống với -a, và chỉnh sửa các đối tượng không đ�c được thiếu sót"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "xóa b� các gói dư thừa, và chạy git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "chuyển --no-reuse-delta cho git-pack-objects"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "chuyển --no-reuse-object cho git-pack-objects"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "không chạy git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "chuyển --local cho git-pack-objects"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "ghi mục lục ánh xạ"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "chuyển --delta-islands cho git-pack-objects"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "ngày ước tính"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "với -A, các đối tượng cũ hơn khoảng th�i gian này thì không bị mất"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "với -a, đóng gói lại các đối tượng không thể đ�c được"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "kích thước cửa sổ được dùng cho nén “delta�"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "giới hạn độ sâu tối đa của “delta�"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "giới hạn số lượng tối đa tuyến trình"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "kích thước tối đa cho từng tập tin gói"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "đừng đóng gói lại gói này"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "tìm một tiến trình hình h�c với hệ số <N>"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "ghi mục lục “multi-pack� của các gói kết quả"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable và -A xung khắc nhau"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric là xung khắc với tùy ch�n -A, -a"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "Không có gì mới để mà đóng gói."
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "thiếu tập tin cần thiết: %s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "không thể b� liên kết: %s"
@@ -21538,67 +21407,61 @@ msgstr "cat-file đã báo cáo gặp lỗi nghiêm tr�ng"
 msgid "unable to open %s for reading"
 msgstr "không thể mở “%s� để đ�c"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "không thể sinh tiến trình con mktree"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "không thể đ�c từ mktree"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree đã báo cáo gặp lỗi nghiêm tr�ng"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree đã không trả v� một tên đối tượng"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "không thể fstat %s"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "không thể ghi đối tượng vào cơ sở dữ liệu"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "không phải là tên đối tượng hợp lệ: “%s�"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "không thể lấy kiểu đối tượng cho %s"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "việc sửa tập tin đối tượng gặp lỗi"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "đối tượng mới là giống với cái cũ: “%s�"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "không thể phân tích %s như là một lần chuyển giao"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s�"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s�"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -21607,31 +21470,31 @@ msgstr ""
 "lần chuyển giao gốc “%s� có chứa thẻ hòa trộn “%s� cái mà bị loại b�; dùng "
 "tùy ch�n --edit thay cho --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "lần chuyển giao gốc “%s� có chữ ký GPG"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "chữ ký sẽ được b� đi trong lần chuyển giao thay thế!"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "không thể ghi lần chuyển giao thay thế cho: “%s�"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft cho “%s� không cần thiết"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "lần chuyển giao mới là giống với cái cũ: “%s�"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21640,71 +21503,71 @@ msgstr ""
 "không thể chuyển đổi các graft sau đây:\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "liệt kê các refs thay thế"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "xóa tham chiếu thay thế"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "sửa đối tượng sẵn có"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "thay đổi cha mẹ của lần chuyển giao"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "chuyển đổi các tập tin graft sẵn có"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "thay thế tham chiếu nếu nó đã sẵn có"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "đừng in đẹp các nội dung cho --edit"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "dùng định dạng này"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "--format không thể được dùng khi không liệt kê gì"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f chỉ hợp lý khi ghi một cái thay thế"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw chỉ hợp lý với --edit"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d cần ít nhất một tham số"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "số lượng đối số không đúng"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e cần chính các là một đối số"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-q cần ít nhất một tham số"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file không nhận đối số"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "chỉ một mẫu được chỉ ra với tùy ch�n -l"
 
@@ -21726,133 +21589,125 @@ msgstr "“git rerere forgetâ€� mà không có các Ä‘Æ°á»�ng dẫn là đã láº
 msgid "unable to generate diff for '%s'"
 msgstr "không thể tạo khác biệt cho “%s�"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đư�ng/dẫn>…"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đư�ng/dẫn>…]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "pha trá»™n"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "m�m"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "cứng"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "hòa trộn"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "giữ lại"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "Bạn không có HEAD nào hợp lệ."
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "Gặp lỗi khi tìm cây của HEAD."
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, 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:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD hiện gi� tại %s"
 
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, 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:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 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:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "đặt lại (reset) HEAD và bảng mục lục"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "chỉ đặt lại (reset) HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 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:310
+#: builtin/reset.c:405
 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:316
+#: builtin/reset.c:411
 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:350
+#: builtin/reset.c:445
 #, 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:358
+#: builtin/reset.c:453
 #, 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:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch xung khắc với --{hard,mixed,soft}"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 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 -- </các/đư�ng/dẫn>�."
 
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, 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:394
+#: builtin/reset.c:489
 #, 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:398
-msgid "-N can only be used with --mixed"
-msgstr "-N chỉ được dùng khi có --mixed"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "Những thay đổi được đưa ra kh�i bệ phóng sau khi reset:"
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21867,19 +21722,15 @@ msgstr ""
 "trong\n"
 "cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, 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:445
+#: builtin/reset.c:546
 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:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "l�c đối tượng yêu cầu --objects"
@@ -21889,8 +21740,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "được đánh dấu đếm là xung khắc với --objects"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "đánh dấu để đếm và '%s' không thể dùng cùng nhau"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -22325,13 +22177,6 @@ msgstr "<n>[,<cơ_sở>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "hiển thị <n> các mục “ref-log� gần nhất kể từ n�n (base)"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr ""
-"--reflog là không tương thích với các tùy ch�n --all, --remotes, --"
-"independent hay --merge-base"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "chưa đưa ra nhánh, và HEAD không hợp lệ"
@@ -22351,18 +22196,18 @@ msgstr[0] "chỉ có thể hiển thị cùng lúc %d hạng mục."
 msgid "no such ref %s"
 msgstr "không có tham chiếu nào như thế %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "không thể xử lý nhi�u hơn %d điểm xét duyệt."
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "“%s� không phải tham chiếu hợp lệ."
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
@@ -22431,13 +22276,17 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <các-tùy-ch�
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "cây làm việc này không phải là sparse"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
 "không thể phân tích cú pháp cây làm việc này (tập tin sparse-checkout có lẽ "
 "không tồn tại)"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
@@ -22446,75 +22295,97 @@ msgstr ""
 "thư mục “%s� có chứa các tập tin chưa được theo dõi, nhưng lại không trong "
 "“sparse-checkout cone�"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "gặp lỗi khi gỡ b� thư mục \"%s\""
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "gặp lỗi khi tạo thư mục cho tập tin sparse-checkout"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "không thể nâng cấp định dạng kho lưu trữ để kích hoạt worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "gặp lỗi khi sửa cấu hình \"sparse-index\""
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "khởi tạo sparse-checkout trong chế độ nón"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "bật tắt việc sử dụng một \"sparse index\""
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "gặp lỗi khi sửa cấu hình \"sparse-index\""
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "không thể thư�ng hóa đư�ng dẫn “%s�"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "không thể b� trích dẫn chuỗi kiểu C “%s�"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "không thể tải các mẫu sparse-checkout"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "đặt các mẫu sparse-checkout sẵn có không sử dụng chế độ cone"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <các mẫu>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "đ�c các mẫu từ đầu vào tiêu chuẩn"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "không có sparse-checkout để thêm vào"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | <các "
+"mẫu>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "phải trong một sparse-checkout để áp dụng lại các mẫu sparse"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "gặp lỗi khi đ�c lại thư mục làm việc"
 
@@ -22540,22 +22411,26 @@ msgstr "git stash branch <tên-nhánh> [<stash>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [-m|--message <l�i nhắn>]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <ghi chú>]\n"
 "          [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n"
 "          [--] [<đặc/tả/đư�ng/dẫn>…]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ghi chú>]"
 
 #: builtin/stash.c:55
@@ -22648,140 +22523,156 @@ msgstr "�ang hòa trộn %s với %s"
 msgid "Index was not unstashed."
 msgstr "Bảng mục lục đã không được b� stash."
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 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)"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "�ã xóa %s (%s)"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Không thể xóa b� mục stash"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "�%s� không phải tham chiếu đến stash"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 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ó."
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "Chưa chỉ ra tên của nhánh"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "gặp lỗi khi phân tích cây"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "gặp lỗi khi tháo dỡ cây"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "bao gồm các tập tin không được theo dõi trong stash"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "chỉ hiển thị các tập tin không được theo dõi trong stash"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Không thể cập nhật %s với %s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "phần chú thích cho stash"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" cần một đối số <lần chuyển giao>"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "Không có thay đổi đã được đưa lên bệ phóng"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "Chưa có thay đổi nào được ch�n"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 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"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 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"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "Không thể ghi lại các tập tin chưa theo dõi"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 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"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "Không thể ghi lại trạng thái bệ phóng hiện hành"
+
+#: builtin/stash.c:1414
 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"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 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"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "Không thể dùng --staged và --include-untracked hay --all cùng một lúc"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "Có lẽ bạn đã quên “git add � phải không?"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "Không có thay đổi nội bộ nào được ghi lại"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "Không thể khởi tạo stash"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "Không thể ghi lại trạng thái hiện hành"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "�ã ghi lại thư mục làm việc và trạng thái mục lục %s"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "Không thể gỡ b� các thay đổi cây-làm-việc"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "giữ nguyên bảng mục lục"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "chỉ tạm cất đi các thay đổi đã đưa lên bệ phóng"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "cất đi ở chế độ miếng vá"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "chế độ im lặng"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "bao gồm các tập tin không được theo dõi trong stash"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "bao gồm các tập tin bị b� qua"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22805,7 +22696,7 @@ 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:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, 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"
@@ -22828,7 +22719,7 @@ msgstr ""
 "không thể tìm thấy cấu hình “%s�. Coi rằng đây là kho thượng nguồn có quy�n "
 "sở hữu chính nó."
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "điểm neo thay thế cho các đư�ng dẫn tương đối"
 
@@ -22925,7 +22816,7 @@ msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%
 msgid "failed to recurse into submodule '%s'"
 msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "chặn kết xuất v� tình trạng mô-đun-con"
 
@@ -23000,10 +22891,6 @@ msgstr ""
 msgid "could not fetch a revision for HEAD"
 msgstr "không thể lấy v� một điểm xem xét cho HEAD"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "Các tùy ch�n --cached và --files loại từ lẫn nhau"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -23032,16 +22919,16 @@ msgstr "chặn kết xuất của url mô-đun-con đồng bộ"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"Cây làm việc mô-đun-con “%s� có chứa thư mục .git (dùng “rm -rf� nếu bạn "
-"thực sự muốn gỡ b� nó cùng với toàn bộ lịch sử của chúng)"
+"Cây làm việc mô-đun-con “%s� có chứa thư mục .git. Việc này sẽ được thay thế "
+"với một tập tin .git bằng các sử dụng absorbgitdirs."
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23050,45 +22937,45 @@ msgstr ""
 "Cây làm việc mô-đun-con “%s� chứa các thay đổi nội bộ; hãy dùng “-f� để loại "
 "b� chúng đi"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "�ã xóa thư mục “%s�\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Không thể gỡ b� cây làm việc mô-đun-con “%s�\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "không thể tạo thư mục mô-đun-con rỗng “%s�"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Mô-đun-con “%s� (%s) được đăng ký cho đư�ng dẫn “%s�\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "gỡ b� cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "b� đăng ký tất cả các trong mô-đun-con"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--]  [</đư�ng/dẫn>…]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Dùng “--all� nếu bạn thực sự muốn hủy khởi tạo m�i mô-đun-con"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -23103,67 +22990,67 @@ msgstr ""
 "bằng\n"
 "“--reference-if-able� thay vì dùng “--reference�."
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, 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:1739
+#: builtin/submodule--helper.c:1740
 #, 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:1746
+#: builtin/submodule--helper.c:1747
 #, 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:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "từ chối tạo/dùng “%s� trong một thư mục git của mô đun con"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "việc sao “%s� vào đư�ng dẫn mô-đun-con “%s� gặp lỗi"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "thư mục không trống: “%s�"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, 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:1861
+#: builtin/submodule--helper.c:1862
 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:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "tên của mô-đun-con mới"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 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:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "chi�u sâu lịch sử khi tạo bản sao"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "ép buộc tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -23173,94 +23060,94 @@ msgstr ""
 "<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] --url <url> --path </"
 "đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "Chế độ cập nhật “%s� không hợp lệ cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Chế độ cập nhật “%s� không hợp lệ được cấu hình cho đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, 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:2047
+#: builtin/submodule--helper.c:2048
 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:2077
+#: builtin/submodule--helper.c:2078
 #, 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:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "B� qua mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, 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:2267
+#: builtin/submodule--helper.c:2268
 #, 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:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "Không thể lấy ra “%s� trong đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "Không thể cải tổ “%s� trong đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "Không thể hòa trộn (merge) “%s� trong đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr ""
 "Thực hiện không thành công lệnh “%s %s� trong đư�ng dẫn mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "�ư�ng dẫn mô-đun-con “%s�: đã checkout “%s�\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "�ư�ng dẫn mô-đun-con “%s�: được rebase vào trong “%s�\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "�ư�ng dẫn mô-đun-con “%s�: được hòa trộn vào “%s�\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "�ư�ng dẫn mô-đun-con “%s�: “%s %s�\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr ""
 "Không thể lấy v� trong đư�ng dẫn mô-đun-con “%s�; thử lấy v� trực tiếp %s:"
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
@@ -23269,87 +23156,87 @@ msgstr ""
 "�ã lấy v� từ đư�ng dẫn mô-đun con “%s�, nhưng nó không chứa %s. Lấy v� trực "
 "tiếp lần chuyển giao gặp lỗi đó."
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "đư�ng dẫn đến cây làm việc"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 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:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout hoặc không làm gì cả"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 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:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "công việc đồng th�i"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 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:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "đừng in tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 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:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "giá trị cho  tham số cập nhật bị sai"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr "chặn kết xuất cho cập nhật bởi cải tổ hoặc hòa trộn"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "ép buộc lấy ra các cập nhật"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "đừng lấy các đối tượng mới từ địa chỉ trên mạng"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr "ghi đè chế độ cập nhật trong trư�ng hợp kho lưu trữ là bản sao mới"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "chi�u sâu lịch sử muốn lấy v�"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "SHA1 là cần thiết cho superproject"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "SHA1 của HEAD của mô-đun-con"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr ""
 "git submodule--helper run-update-procedure [<các tùy ch�n>] </đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23358,96 +23245,92 @@ 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "đệ quy vào trong mô-đun-con"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<các tùy ch�n>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "ch�n nếu nó là an toàn để ghi vào tập tin .gitmodules"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "b� đặt cấu hình trong tập tin .gitmodules"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <tên> [<giá trị>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <tên>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "chặn kết xuất cho cài đặt url của một mô-đun-con"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] </đư�ng/dẫn> <url_mới>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "đặt nhánh theo dõi mặc định thành master"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "đặt nhánh theo dõi mặc định"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet](-d|--default)</đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <nhánh> </đư�ng/"
 "dẫn>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "cần --branch hoặc --default"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "Các tùy ch�n --branch và --default loại từ lẫn nhau"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "�ang thêm repo có sẵn tại “%s� vào bảng mục lục\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "“%s� đã tồn tại từ trước và không phải là một kho git hợp lệ"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "Thư mục git cho “%s� được tìm thấy một cách cục bộ với các máy chủ:\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23465,87 +23348,87 @@ msgstr ""
 "là bạn không chắc chắn đi�u đó nghĩa là gì thì ch�n tên khác với tùy ch�n “--"
 "name�."
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “%s�.\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "không thể lấy ra mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "Gặp lỗi khi thêm mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "Gặp lỗi khi đăng ký mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "�%s� thực sự đã tồn tại ở bảng mục lục rồi"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr ""
 "�%s� thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-con"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "nhánh của kho để thêm như là mô-đun-con"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "cho phép thêm một đư�ng dẫn mô-đun-con bị b� qua khác"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "chỉ hiển thị các thông điệp báo lỗi"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "vay mượn các đối tượng từ kho thay thế"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr ""
 "đặt tên của submodule bằng chuỗi đã cho thay vì mặc định là đư�ng dẫn của nó"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<các tùy ch�n>] [--] <kho> [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "�ư�ng dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
 "việc"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "repo URL: “%s� phải là đư�ng dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "“%s� không phải là một tên mô-đun-con hợp lệ"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s không hỗ trợ --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, 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ệ"
@@ -23644,11 +23527,11 @@ 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:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "không thể ký thẻ"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23661,15 +23544,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "kiểu đối tượng sai."
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "không có chú thích gì cho cho thẻ à?"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Nội dung ghi chú còn lại %s\n"
@@ -23750,46 +23633,22 @@ msgstr "chỉ hiển thị những thẻ mà nó không được hòa trộn"
 msgid "print only tags of the object"
 msgstr "chỉ hiển thị các thẻ của đối tượng"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column và -n xung khắc nhau"
-
-#: builtin/tag.c:546
-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:548
-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:550
-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:552
-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:554
-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:568
-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:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "tùy ch�n '%s' chỉ cho phép dùng trong chế độ liệt kê"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "“%s� không phải thẻ hợp lệ."
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "thẻ “%s� đã tồn tại rồi"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "�ã cập nhật thẻ “%s� (trước là %s)\n"
@@ -24220,132 +24079,120 @@ msgstr "không thể tạo thư mục của “%s�"
 msgid "initializing"
 msgstr "khởi tạo"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "�ang chuẩn bị cây làm việc (nhánh mới “%s�)"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "�ang chuẩn bị cây làm việc (đang cài đặt nhánh “%s�, trước đây tại %s)"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "�ang chuẩn bị cây làm việc (đang lấy ra “%s�)"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "�ang chuẩn bị cây làm việc (HEAD đã tách r�i “%s�)"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 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:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "tạo nhánh mới"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "tạo hay đặt lại một nhánh"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "di chuyển cây làm việc mới"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "giữ cây làm việc mới bị khóa"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "lý do khóa"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
 
-#: builtin/worktree.c:507
-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:509
-msgid "--reason requires --lock"
-msgstr "--reason cần --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "được thêm với --lock"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "hiển thị chú thích và lý do mở rộng, nếu có"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr ""
 "thêm chú thích kiểu “prunable� cho các cây làm việc hết hạn cũ hơn khoảng "
 "<th�i gian>"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose và --porcelain loại từ lẫn nhau"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, 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:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 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:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "“%s� đã được khóa rồi, lý do: %s"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "“%s� đã được khóa rồi"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s� chưa bị khóa"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa b�"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "“%s� là cây làm việc chính"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "không thể phác h�a ra tên đích đến “%s�"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -24354,7 +24201,7 @@ msgstr ""
 "không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n"
 "dùng “move -f -f� để ghi đè hoặc mở khóa trước đã"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -24362,38 +24209,38 @@ msgstr ""
 "không thể di chuyển một cây-làm-việc bị khóa;\n"
 "dùng “move -f -f� để ghi đè hoặc mở khóa trước đã"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "gặp lỗi khi chuyển “%s� sang “%s�"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "gặp lỗi khi chạy “git status� vào “%s�"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "“%s� có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --"
 "force để xóa nó"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "gặp lỗi khi chạy “git status� trong “%s�, mã %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -24402,7 +24249,7 @@ msgstr ""
 "không thể xóa b� một cây-làm-việc bị khóa, khóa vì: %s\n"
 "dùng “remove -f -f� để ghi đè hoặc mở khóa trước đã"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -24410,17 +24257,17 @@ msgstr ""
 "không thể xóa b� một cây-làm-việc bị khóa;\n"
 "dùng “remove -f -f� để ghi đè hoặc mở khóa trước đã"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "thẩm tra gặp lỗi, không thể gỡ b� một cây-làm-việc: %s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "sửa chữa: %s: %s"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "lá»—i: %s: %s"
@@ -24473,21 +24320,16 @@ msgstr ""
 "để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
 "Xem “git help git� để biết tổng quan của hệ thống."
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "chưa chỉ ra thư mục cho --git-dir\n"
+msgid "no directory given for '%s' option\n"
+msgstr "không đưa ra thư mục cho tùy ch�n '%s'\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "chưa đưa ra không gian làm việc cho --namespace\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "chưa đưa ra cây làm việc cho --work-tree\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24503,11 +24345,6 @@ msgstr "-c cần một chuỗi cấu hình\n"
 msgid "no config key given for --config-env\n"
 msgstr "không đưa ra khóa cấu hình cho --config-env\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "chưa đưa ra thư mục cho -C\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -24537,30 +24374,30 @@ msgstr "làm trống bí danh cho %s"
 msgid "recursive alias: %s"
 msgstr "đệ quy các bí danh: %s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "lỗi nghiêm tr�ng chưa biết khi ghi ra đầu ra tiêu chuẩn"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 "dò tìm thấy các bí danh quẩn tròn: biểu thức của “%s� không có điểm kết:%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "không thể xử lý %s như là một phần bổ sung"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24569,33 +24406,25 @@ msgstr ""
 "cách dùng: %s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "gặp lỗi khi khai triển bí danh “%s�; “%s� không phải là lệnh git\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "gặp lỗi khi chạy lệnh “%s�: %s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "tham số cho --packfile phải là một giá trị băm hợp lệ (nhận được “%s�)"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "không phải là kho git"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile cần --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args chỉ được dùng khi có --packfile"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "các tùy ch�n được không xử lý"
@@ -24880,6 +24709,175 @@ msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: không hiểu lệnh “%s� từ git"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "cần một thư mục làm việc"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "không tìm thấy gốc enlistment"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "không thể chuyển đến '%s'"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "không thể đóng cấu hình %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "không thể cấu hình log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "'Scalar enlistments' cần một cây làm việc"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "HEAD của máy chủ không phải một nhánh: '%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr "gặp lỗi khi lấy tên nhánh mặc định từ máy chủ; sử dụng mặc định nội bộ"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "gặp lỗi khi lấy tên nhánh mặc định"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "gặp lỗi khi hủy đăng ký kho chứa"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "gặp lỗi khi xóa thư mục dành được"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "nhánh để lấy ra sau khi nhân bản"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "khi nhân bản, tạo đầy đủ thư mục làm việc"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "chỉ siêu dữ liệu tải v� cho nhánh mà sẽ được lấy ra"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<các tùy ch�n>] [--] <kho> [<t.mục>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "không thể suy diễn tên cây làm việc từ '%s'"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "thư mục '%s' đã sẵn có"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "gặp lỗi khi lấy nhánh mặc định cho '%s'"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "không thể cấu hình máy chủ trong '%s'"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "không thể cấu hình '%s'"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "nhân bản từng phần gặp lỗi; đang cố thử nhân bản đầy đủ"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "không thể cấu hình cho nhân bản đầy đủ"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` không nhận các tham số"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "cấu hình m�i enlistments đã đăng ký"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all hoặc <enlistment>, không thể là cả hai"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "kho git ra Ä‘i trong '%s'"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"Nhiệm vụ:\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "không có nhiệm vụ nào như thế: “%s�"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "từ chối gỡ b� thư mục làm việc hiện tại"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "bao gồm phiên bản Git"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "bao gồm các tùy ch�n biên dịch của Git"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <lệnh> [<các tùy ch�n>]\n"
+"\n"
+"Các lệnh:\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "hiện không có thông tin v� trình biên dịch\n"
@@ -24904,38 +24902,38 @@ msgstr "ngày hết hạn"
 msgid "no-op (backward compatibility)"
 msgstr "no-op (tương thích ngược)"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "chi tiết hơn nữa"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "im lặng hơn nữa"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "sử dụng <n> chữ số để hiển thị tên đối tượng"
 
-#: parse-options.h:335
+#: parse-options.h:337
 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"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "đ�c đặc tả đư�ng dẫn từ tập tin"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 "với --pathspec-from-file, các phần tử đặc tả đư�ng dẫn bị ngăn cách bởi ký "
 "tá»± NULL"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "khóa"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "tên trư�ng cần sắp xếp"
 
@@ -25007,17 +25005,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "Hiển thị tên và địa chỉ thư điện tử của các liên hệ dạng chuẩn hóa"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "�ảm bảo rằng một tên tham chiếu ở dạng thức tốt"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "Chuyển các nhánh hoặc phục hồi lại các tập tin cây làm việc"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "Sao chép các tập tin từ mục lục ra cây làm việc"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "�ảm bảo rằng một tên tham chiếu ở dạng thức tốt"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Tìm những lần chuyển giao còn chưa được áp dụng lên thượng nguồn"
@@ -25221,57 +25219,57 @@ msgid "Add or parse structured information in commit messages"
 msgstr "Thêm hay phân tích thông tin cấu trúc trong ghi chú lần chuyển giao"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Bộ duyện kho Git"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Hiển thị nhật ký các lần chuyển giao"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "Hiển thị thông tin v� các tập tin trong bảng mục lục và cây làm việc"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Liệt kê các tham chiếu trong một kho chứa trên mạng"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Liệt kê nội dung của đối tượng cây"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Trích xuất miếng và và nguồn tác giả từ một thư điện tử đơn"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Chương trình phân tách UNIX mbox đơn giản"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "Chạy các nhiệm vụ để tối ưu hóa dữ liệu kho Git"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "Hợp nhất hai hay nhi�u hơn lịch sử của các nhà phát triển"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Tìm các tổ tiên chung tốt có thể được cho hòa trộn"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Chạy một hòa trộn tập tin “3-đư�ng�"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Chạy một hòa trộn cho các tập tin cần hòa trộn"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Một chương trình hỗ trợ tiêu chuẩn dùng với git-merge-index"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "Hiển thị hòa trộn ba-đư�ng mà không đụng chạm đến mục lục"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
@@ -25279,357 +25277,357 @@ msgstr ""
 "trá»™n"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "Hiển thị hòa trộn ba-đư�ng mà không đụng chạm đến mục lục"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "Ghi và thẩm tra các multi-pack-indexes"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "Tạo một đối tượng thẻ với kiểm tra mở rộng"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Xây dựng một tree-object từ văn bản định dạng ls-tree"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "Ghi và thẩm tra các multi-pack-indexes"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Di chuyển hay đổi tên một tập tin, thư mục hoặc liên kết m�m"
 
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Tìm các tên liên kết m�m cho điểm xét đã cho"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Thêm hoặc đi�u tra đối tượng ghi chú"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Nhập vào từ và gửi đến các kho cần thiết"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Tạo một kho lưu được đóng gói cho các đối"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Tìm các tập tin gói dư thừa"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "�óng gói các phần đầu và thẻ để truy cập kho hiệu quả hơn"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "Tính toán ID duy nhất cho một miếng vá"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr ""
 "Xén bớt tất các các đối tượng không tiếp cận được từ cơ sở dữ liệu đối tượng"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "Xóa b� các đối tượng mở rộng cái mà đã sẵn có trong các tập tin gói"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Lấy v� và hợp nhất với kho khác hay một nhánh nội bộ"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "Cập nhật th.chiếu máy chủ cùng với các đối tượng liên quan đến nó"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Ấp dụng một bộ miếng vá quilt vào trong nhánh hiện hành"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "So sánh hai vùng chuyển giao (vd: hai phiên bản của một nhánh)"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "��c thông tin cây vào trong mục lục"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "Thu hoạch các lần chuyển giao trên đỉnh của đầu mút cơ sở khác"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "Nhận cái mà được đẩy vào trong kho"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "Quản lý thông tin reflog"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "Quản lý tập hợp các kho chứa đã được theo dõi"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "�óng gói các đối tượng chưa đóng gói ở một kho chứa"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "Tạo, liệt kê, xóa các tham chiếu để thay thế các đối tượng"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "Tạo ra một tóm tắt các thay đổi còn treo"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Dùng lại các giải pháp đã ghi lại của các hòa trộn bị xung đột"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "�ặt lại HEAD hiện hành thành trạng thái đã cho"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "Hoàn nguyên các tập tin cây làm việc"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "Hoàn lại một số lần chuyển giao sẵn có"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Liệt kê các đối tượng chuyển giao theo thứ tự tôpô đảo ngược"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "Cậy ra và xử lý các tham số"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "Hoàn lại một số lần chuyển giao sẵn có"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "Gỡ b� các tập tin từ cây làm việc và từ bảng mục lục"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "Gửi một tập hợp của các miếng vá ở dạng thư điện tử"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "�ẩy các đối tượng lên thông qua giao thức Git đến kho chứa khác"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Nã cài đặt quốc tế hóa của Git cho văn lệnh hệ v�"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "Mã cài đặt văn lệnh hệ v� Git chung"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Hệ v� đăng nhập có hạn chế cho truy cập SSH chỉ-Git"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "Kết xuất “git log� dạng tóm tắt"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "Hiển thị các kiểu khác nhau của các đối tượng"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "Hiển thị những nhánh và các lần chuyển giao của chúng"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "Hiển thị các muc lục kho nén đã đóng gói"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "Liệt kê các tham chiếu trong một kho nội bộ"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "Nã cài đặt quốc tế hóa của Git cho văn lệnh hệ v�"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "Mã cài đặt văn lệnh hệ v� Git chung"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "Khởi tạo và sửa đổi sparse-checkout"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Tạm cất đi các thay đổi trong một thư mục làm việc bẩn"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "Thêm nội dung tập tin vào vùng bệ phóng"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Hiển thị trạng thái cây làm việc"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "Xóa b� các khoảng trắng không cần thiết"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "Khởi tạo, cập nhật hay đi�u tra các mô-đun-con"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Thao tác hai hướng giữ hai kho Subversion và Git"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "Các nhánh chuyển"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "��c, sửa và xóa tham chiếu m�m"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Tạo một tập tin tạm với nội dung của blob"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "Gỡ các đối tượng kh�i một kho lưu đã đóng gói"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "�ăng ký nội dung tập tin từ cây làm việc đến bảng mục lục"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "Cập nhật tên đối tượng được lưu trong một tham chiếu một cách an toàn"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Cập nhật tập tin thông tin phụ trợ để giúp đỡ các dịch vụ dumb"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "Gửi kho lưu trở lại cho git-archive"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Gửi các đối tượng đã đóng gói trở lại cho git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "Hiển thị một biến Git luận lý"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "Kiểm tra ký lần chuyển giao dùng GPG"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "Kiểm tra lại các tập tin kho (lưu trữ, nén) Git đã được đóng gói"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "Kiểm tra chữ ký GPG của các thẻ"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Giao diện Git trên n�n web (ứng dụng web chạy trên kho Git)"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "Quản lý nhi�u cây làm việc"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "Tạo một đối tượng cây từ đầu vào tiêu chuẩn stdin hiện tại"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "�ịnh nghĩa các thuộc tính cho mỗi đư�ng dẫn"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Giao diện dòng lệnh Git và quy ước"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "Hướng dẫn Git cơ bản cho nhà phát triển"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "Cung cấp tài khoản và mật khẩu cho Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "Git dành cho những ngư�i dùng CVS"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "Chỉnh kết xuất diff"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Một tập hợp lệnh hữu dụng tối thiểu để dùng Git hàng ngày"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Các câu h�i thư�ng gặp v� cách sử dụng Git"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Thuật ngữ chuyên môn Git"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Các móc được sử dụng bởi Git"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Chỉ định các tập tin không cần theo dõi"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Bộ duyện kho Git"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "�nh xạ tên tác giả/ngư�i chuyển giao và/hoặc địa chỉ E-Mail"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "�ịnh nghĩa thuộc tính mô-đun-con"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Không gian tên Git"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "Các chương trình hỗ trợ để tương tác với các kho chứa trên máy chủ"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Bố cục kho Git"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "Gắn một kho chứa vào trong một cái khác"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Hướng dẫn cách dùng Git"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Hướng dẫn cách dùng Git: phần hai"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "Hướng dẫn cách dùng Git"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Giao diện Git trên n�n web (ứng dụng web chạy trên kho Git)"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -25706,46 +25704,46 @@ msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$di
 msgid "usage: $dashless $USAGE"
 msgstr "cách dùng: $dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr ""
 "Không thể chuyển thư mục (chdir) sang $cdup, thư mục ở mức cao nhất của cây "
 "làm việc"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr ""
 "lỗi nghiêm tr�ng: $program_name không thể được dùng ngoaoif thư mục làm việc."
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr ""
 "Không thể ghi lại các nhánh: Bạn có các thay đổi chưa được đưa lên bệ phóng."
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "Không thể $action: Bạn có các thay đổi chưa được đưa lên bệ phóng."
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
 "Không thể $action: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
 "giao."
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr ""
 "Thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "Bạn cần chạy lệnh này từ thư mục ở mức cao nhất của cây làm việc."
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "Không thể dò tìm đư�ng dẫn tuyệt đối của thư mục git"
 
@@ -25826,7 +25824,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "gặp lỗi khi mở tập tin khúc để đ�c: %s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25841,7 +25839,7 @@ msgstr ""
 "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
 "tin"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25855,7 +25853,7 @@ msgstr ""
 "a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25871,7 +25869,7 @@ msgstr ""
 "d - đừng đưa ra kh�i bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
 "tập tin"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25885,7 +25883,7 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25899,7 +25897,7 @@ msgstr ""
 "a - loại b� khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại b� khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25913,7 +25911,7 @@ msgstr ""
 "a - loại b� khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng loại b� khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25927,7 +25925,7 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25941,7 +25939,7 @@ msgstr ""
 "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
 "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25963,88 +25961,88 @@ msgstr ""
 "e - sửa bằng tay khúc hiện hành\n"
 "? - in trợ giúp\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Các khúc đã ch�n không được áp dụng vào bảng mục lục!\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "b� qua những thứ chưa hòa trộn: %s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng việc thêm cho cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "�p dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Không còn khúc nào để mà nhảy đến\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Số không hợp lệ: “%s�\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Không còn khúc nào để mà tìm kiếm\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "�ịnh dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Không thấy khúc nào khớp mẫu đã cho\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Không có khúc kế trước\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Không có khúc kế tiếp\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Rất tiếc, không thể chia nh� khúc này\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Chi nh� thành %d khúc.\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Rất tiếc, không thể sửa khúc này\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -26064,56 +26062,56 @@ msgstr ""
 "add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
 "thay đổi đã đặt lên bệ phóng\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "thiếu --"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "không hiểu chế độ --patch: %s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "đối số không hợp lệ %s, cần --"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "múi gi� nội bộ khác biệt với GMT bởi khoảng th�i gian không-phút\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 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:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "lỗi nghiêm tr�ng: lệnh “%s� chết với mã thoát %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 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:316
+#: git-send-email.perl:346
 #, 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:321
+#: git-send-email.perl:351
 #, 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:450
+#: git-send-email.perl:484
 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:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -26123,11 +26121,11 @@ msgstr ""
 "git-send-email được cấu hình với các tùy ch�n sendemail.* - chú ý “e�.\n"
 "�ặt sendemail.forbidSendmailVariables thành false để tắt kiểm tra này.\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 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:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -26135,37 +26133,37 @@ msgstr ""
 "“batch-size� và “relogin� phải được chỉ định cùng với nhau (thông qua dòng "
 "lệnh hoặc tùy ch�n cấu hình)\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Không hiểu trư�ng --suppress-cc: “%s�\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Không hiểu cài đặt --confirm: “%s�\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, 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:619
+#: git-send-email.perl:655
 #, 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:621
+#: git-send-email.perl:657
 #, 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:626
+#: git-send-email.perl:662
 #, 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:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -26180,12 +26178,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:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gặp lỗi khi mở thư mục “%s�: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -26195,17 +26193,17 @@ msgstr ""
 "Chưa chỉ định các tập tin miếng vá!\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Không có dòng chủ đ� trong %s?"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gặp lỗi khi mở “%s� để ghi: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -26219,27 +26217,27 @@ msgstr ""
 "\n"
 "Xóa nội dung phần thân nếu bạn không muốn gửi tóm tắt.\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gặp lỗi khi mở “%s�: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Gặp lỗi khi mở %s.final: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 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:935
+#: git-send-email.perl:971
 #, 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:990
+#: git-send-email.perl:1026
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -26247,11 +26245,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:995
+#: git-send-email.perl:1031
 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:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -26264,20 +26262,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:1022
+#: git-send-email.perl:1058
 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:1040
+#: git-send-email.perl:1076
 #, 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:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, 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"
@@ -26285,16 +26283,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:1126
+#: git-send-email.perl:1162
 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:1446
+#: git-send-email.perl:1482
 #, 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:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -26321,114 +26319,114 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Gửi thư này chứ? ([y]có|[n]không|[e]sửa|[q]thoát|[a]tất): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "Gửi thư này trả l�i yêu cầu"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 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:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gặp lỗi! %s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 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:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gặp lỗi khi gửi %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Thá»­ gá»­i %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Gá»­i %s\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "Kết quả: "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "Kết quả: Tốt\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "không thể mở tập tin “%s�"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, 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:1762
+#: git-send-email.perl:1798
 #, 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:1819
+#: git-send-email.perl:1855
 #, 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:1854
+#: git-send-email.perl:1890
 #, 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:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Không thể thực thi “%s�"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) �ang thêm %s: %s từ: “%s�\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, 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:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "không thể lấy gửi thư dạng 7 bít"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "bảng mã truy�n không hợp lệ"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -26439,12 +26437,12 @@ msgstr ""
 "%s\n"
 "cảnh báo: không có miếng vá nào được gửi đi\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "không thể mở %s: %s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -26453,2382 +26451,13 @@ msgstr ""
 "nghiêm tr�ng: %s: %d là dài hơn 998 ký tự\n"
 "cảnh báo: không có miếng vá nào được gửi đi\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, 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:2094
+#: git-send-email.perl:2130
 #, 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](có/KHÔNG): "
-
-#~ msgid ""
-#~ "The following pathspecs didn't match any eligible path, but they do match "
-#~ "index\n"
-#~ "entries outside the current sparse checkout:\n"
-#~ msgstr ""
-#~ "Các đặc tả đư�ng dẫn sau đây không khớp với bất kỳ đư�ng dẫn thích hợp "
-#~ "nào,\n"
-#~ "nhưng chúng khớp với các mục mục lục bên ngoài \"sparse checkout\" hiện "
-#~ "tại:\n"
-
-#~ msgid ""
-#~ "Disable or modify the sparsity rules if you intend to update such entries."
-#~ msgstr ""
-#~ "Vô hiệu hóa hoặc sửa đổi các quy tắc sparsity nếu bạn có ý định cập nhật "
-#~ "các mục như vậy."
-
-#~ msgid "could not set GIT_DIR to '%s'"
-#~ msgstr "không thể đặt GIT_DIR thành “%s�"
-
-#~ msgid "unable to unpack %s header with --allow-unknown-type"
-#~ msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
-
-#~ msgid "unable to parse %s header with --allow-unknown-type"
-#~ msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
-
-#~ msgid "open /dev/null failed"
-#~ msgstr "gặp lỗi khi mở “/dev/null�"
-
-#~ 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 ""
-#~ "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 </các/đư�ng/dẫn>� hoặc “git rm </các/đư�ng/dẫn>�\n"
-#~ "và chuyển giao kết quả bằng lệnh “git commit�"
-
-#~ msgid "open /dev/null or dup failed"
-#~ msgstr "gặp lỗi khi mở “/dev/null� hay dup"
-
-#~ msgid "attempting to use sparse-index without cone mode"
-#~ msgstr "cố gắng sử dụng chỉ mục thưa thớt mà không có chế độ hình nón"
-
-#~ msgid "unable to update cache-tree, staying full"
-#~ msgstr "không thể cập nhật cây bộ nhớ đệm, chỗ chứa bị đầy"
-
-#~ msgid "Could not open '%s' for writing."
-#~ msgstr "Không thể mở “%s� để ghi."
-
-#~ msgid "could not create archive file '%s'"
-#~ msgstr "không thể tạo tập tin kho (lưu trữ, nén) “%s�"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-next-check <lúc_sai> <lúc_đúng> [<term>]"
-
-#~ msgid "--bisect-next-check requires 2 or 3 arguments"
-#~ msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
-
-#~ msgid "couldn't create a new file at '%s'"
-#~ msgstr "không thể tạo tập tin mới tại “%s�"
-
-#~ msgid "git commit-tree: failed to open '%s'"
-#~ msgstr "git commit-tree: gặp lỗi khi mở “%s�"
-
-#~ msgid "cannot open packfile '%s'"
-#~ msgstr "không thể mở packfile “%s�"
-
-#~ msgid "cannot store pack file"
-#~ msgstr "không thể lưu tập tin gói"
-
-#~ msgid "cannot store index file"
-#~ msgstr "không thể lưu trữ tập tin ghi mục lục"
-
-#~ msgid "exclude patterns are read from <file>"
-#~ msgstr "mẫu loại trừ được đ�c từ <tập tin>"
-
-#~ msgid "Unknown option for merge-recursive: -X%s"
-#~ msgstr "Không hiểu tùy ch�n cho merge-recursive: -X%s"
-
-#~ msgid "unusable todo list: '%s'"
-#~ msgstr "danh sách cần làm không dùng được: “%s�"
-
-#~ msgid "git rebase--interactive [<options>]"
-#~ msgstr "git rebase--interactive [<các tùy ch�n>]"
-
-#~ msgid "rebase merge commits"
-#~ msgstr "cải tổ các lần chuyển giao hòa trộn"
-
-#~ msgid "keep original branch points of cousins"
-#~ msgstr "giữ các điểm nhánh nguyên bản của các anh em h�"
-
-#~ msgid "move commits that begin with squash!/fixup!"
-#~ msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
-
-#~ msgid "sign commits"
-#~ msgstr "ký các lần chuyển giao"
-
-#~ msgid "continue rebase"
-#~ msgstr "tiếp tục cải tổ"
-
-#~ msgid "skip commit"
-#~ msgstr "b� qua lần chuyển giao"
-
-#~ msgid "edit the todo list"
-#~ msgstr "sửa danh sách cần làm"
-
-#~ msgid "show the current patch"
-#~ msgstr "hiển thị miếng vá hiện hành"
-
-#~ msgid "shorten commit ids in the todo list"
-#~ msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
-
-#~ msgid "expand commit ids in the todo list"
-#~ msgstr "khai triển mã chuyển giao trong danh sách cần làm"
-
-#~ msgid "check the todo list"
-#~ msgstr "kiểm tra danh sách cần làm"
-
-#~ msgid "rearrange fixup/squash lines"
-#~ msgstr "sắp xếp lại các dòng fixup/squash"
-
-#~ msgid "insert exec commands in todo list"
-#~ msgstr "chèn các lệnh thực thi trong danh sách cần làm"
-
-#~ msgid "onto"
-#~ msgstr "lên trên"
-
-#~ msgid "restrict-revision"
-#~ msgstr "điểm-xét-duyệt-hạn-chế"
-
-#~ msgid "restrict revision"
-#~ msgstr "điểm xét duyệt hạn chế"
-
-#~ msgid "squash-onto"
-#~ msgstr "squash-lên-trên"
-
-#~ msgid "squash onto"
-#~ msgstr "squash lên trên"
-
-#~ msgid "the upstream commit"
-#~ msgstr "lần chuyển giao thượng nguồn"
-
-#~ msgid "head-name"
-#~ msgstr "tên-đầu"
-
-#~ msgid "head name"
-#~ msgstr "tên đầu"
-
-#~ msgid "rebase strategy"
-#~ msgstr "chiến lược cải tổ"
-
-#~ msgid "strategy-opts"
-#~ msgstr "tùy-ch�n-chiến-lược"
-
-#~ msgid "strategy options"
-#~ msgstr "các tùy ch�n chiến lược"
-
-#~ msgid "switch-to"
-#~ msgstr "chuyển-đến"
-
-#~ msgid "the branch or commit to checkout"
-#~ msgstr "nhánh hay lần chuyển giao lần lấy ra"
-
-#~ msgid "onto-name"
-#~ msgstr "onto-name"
-
-#~ msgid "onto name"
-#~ msgstr "tên lên trên"
-
-#~ msgid "cmd"
-#~ msgstr "lệnh"
-
-#~ msgid "the command to run"
-#~ msgstr "lệnh muốn chạy"
-
-#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-#~ msgstr ""
-#~ "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
-
-#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "không thể kết hợp “--preserve-merges� với “--rebase-merges�"
-
-#~ msgid ""
-#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-#~ msgstr ""
-#~ "không thể kết hợp “--preserve-merges� với “--reschedule-failed-exec�"
-
-#~ msgid ""
-#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
-#~ "--name <name>"
-#~ msgstr ""
-#~ "git submodule--helper add-clone [<các tùy ch�n>…] --url <url> --path </"
-#~ "đư�ng/dẫn> --name <tên>"
-
-#~ msgid "failed to create file %s"
-#~ msgstr "gặp lỗi khi tạo tập tin %s"
-
-#~ msgid "exit immediately after initial ref advertisement"
-#~ msgstr "thoát ngay sau khi khởi tạo quảng cáo tham chiếu"
-
-#~ msgid "socket/pipe already in use: '%s'"
-#~ msgstr "socket/pipe đã đang được sử dụng rồi: “%s�"
-
-#~ msgid "could not start server on: '%s'"
-#~ msgstr "không thể khởi động máy phục vụ lên: “%s�"
-
-#~ msgid "could not spawn daemon in the background"
-#~ msgstr "không thể sinh ra daemon trong n�n"
-
-#~ msgid "waitpid failed"
-#~ msgstr "waitpid gặp lỗi"
-
-#~ msgid "daemon not online yet"
-#~ msgstr "\"daemon\" vẫn chưa trực tuyến"
-
-#~ msgid "daemon failed to start"
-#~ msgstr "daemon gặp lỗi khi khởi động"
-
-#~ msgid "waitpid is confused"
-#~ msgstr "waitpid là chưa rõ ràng"
-
-#~ msgid "daemon has not shutdown yet"
-#~ msgstr "\"daemon\" vẫn chưa được tắt đi"
-
-#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
-#~ msgstr "Các hạn chế giao thức không được hỗ trợ với cURL < 7.19.4"
-
-#~ msgid "running $command"
-#~ msgstr "đang chạy lệnh $command"
-
-#~ msgid "'$sm_path' does not have a commit checked out"
-#~ msgstr "“$sm_path� không có lần chuyển giao nào được lấy ra"
-
-#~ msgid "Submodule path '$displaypath': '$command $sha1'"
-#~ msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: “$command $sha1�"
-
-#~ msgid "Applied autostash."
-#~ msgstr "�ã áp dụng autostash."
-
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "Không thể lưu $stash_sha1"
-
-#~ 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 ""
-#~ "�p dụng autostash có hiệu quả trong các xung đột.\n"
-#~ "Các thay đổi của bạn an toàn trong stash (tạm cất đi).\n"
-#~ "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc "
-#~ "nào.\n"
-
-#~ msgid "Rebasing ($new_count/$total)"
-#~ msgstr "�ang rebase ($new_count/$total)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Commands:\n"
-#~ "p, pick <commit> = use commit\n"
-#~ "r, reword <commit> = use commit, but edit the commit message\n"
-#~ "e, edit <commit> = use commit, but stop for amending\n"
-#~ "s, squash <commit> = use commit, but meld into previous commit\n"
-#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
-#~ "message\n"
-#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
-#~ "d, drop <commit> = remove commit\n"
-#~ "l, label <label> = label current HEAD with a name\n"
-#~ "t, reset <label> = reset HEAD to a label\n"
-#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-#~ ".       create a merge commit using the original merge commit's\n"
-#~ ".       message (or the oneline, if no original merge commit was\n"
-#~ ".       specified). Use -c <commit> to reword the commit message.\n"
-#~ "\n"
-#~ "These lines can be re-ordered; they are executed from top to bottom.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Các lệnh:\n"
-#~ "p, pick <commit> = dùng lần chuyển giao\n"
-#~ "r, reword <commit> = dùng lần chuyển giao, nhưng sửa lại phần chú thích\n"
-#~ "e, edit <commit> = dùng lần chuyển giao, nhưng dừng lại để tu bổ (amend)\n"
-#~ "s, squash <commit> = dùng lần chuyển giao, nhưng meld vào lần chuyển giao "
-#~ "kế trước\n"
-#~ "f, fixup <commit> = giống như \"squash\", nhưng loại b� chú thích của lần "
-#~ "chuyển giao này\n"
-#~ "x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ v�\n"
-#~ "d, drop <commit> = xóa lần chuyển giao\n"
-#~ "l, label <label> = đánh nhãn HEAD hiện tại bằng một tên\n"
-#~ "t, reset <label> = đặt lại HEAD thành một nhãn\n"
-#~ "m, merge [-C <commit> | -c <commit>] <nhãn> [# <một_dòng>]\n"
-#~ ".       tạo một lần chuyển giao hòa trộn sử dụng chú thích của lần "
-#~ "chuyển\n"
-#~ ".       giao hòa trộn gốc (hoặc một_dòng, nếu không chỉ định lần chuyển "
-#~ "giao hòa\n"
-#~ ".       trộn gốc). Dùng -c <commit> để reword chú thích của lần chuyển "
-#~ "giao.\n"
-#~ "\n"
-#~ "Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống "
-#~ "dưới đáy.\n"
-
-#~ 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 ""
-#~ "Bạn có thể tu bổ lần chuyển giao ngay bây gi� bằng:\n"
-#~ "\n"
-#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "Một khi đã hài lòng với những thay đổi của mình, thì chạy:\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#~ msgid "$sha1: not a commit that can be picked"
-#~ msgstr "$sha1: không phải là lần chuyển giao mà có thể lấy ra được"
-
-#~ msgid "Invalid commit name: $sha1"
-#~ msgstr "Tên lần chuyển giao không hợp lệ: $sha1"
-
-#~ msgid "Cannot write current commit's replacement sha1"
-#~ msgstr "Không thể ghi lại sha1 thay thế của lần chuyển giao"
-
-#~ msgid "Fast-forward to $sha1"
-#~ msgstr "Chuyển-tiếp-nhanh đến $sha1"
-
-#~ msgid "Cannot fast-forward to $sha1"
-#~ msgstr "Không thể chuyển-tiếp-nhanh đến $sha1"
-
-#~ msgid "Cannot move HEAD to $first_parent"
-#~ 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"
-
-#~ msgid "Error redoing merge $sha1"
-#~ msgstr "Gặp lỗi khi hoàn lại bước hòa trộn $sha1"
-
-#~ msgid "Could not pick $sha1"
-#~ msgstr "Không thể lấy ra $sha1"
-
-#~ msgid "This is the commit message #${n}:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ #${n}:"
-
-#~ msgid "The commit message #${n} will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ #${n} sẽ bị b� qua:"
-
-#~ 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."
-
-#~ msgid "Cannot write $fixup_msg"
-#~ msgstr "Không thể $fixup_msg"
-
-#~ msgid "This is a combination of 2 commits."
-#~ msgstr "�ây là tổ hợp của 2 lần chuyển giao."
-
-#~ msgid "Could not apply $sha1... $rest"
-#~ msgstr "Không thể áp dụng $sha1… $rest"
-
-#~ 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 ""
-#~ "Không thể tu bổ lần chuyển giao sau khi lấy ra $sha1… $rest thành công\n"
-#~ "Việc này có thể là do một ghi chú cho lần chuyển giao là trống rỗng, hoặc "
-#~ "móc pre-commit\n"
-#~ "gặp lỗi. Nếu là móc pre-commit bị lỗi, Bạn có lẽ cần giải quyết trục trặc "
-#~ "này\n"
-#~ "trước khi bạn có thể làm việc lại với lần chuyển giao."
-
-#~ msgid "Stopped at $sha1_abbrev... $rest"
-#~ msgstr "Bị dừng tại $sha1_abbrev… $rest"
-
-#~ 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"
-
-#~ msgid "Executing: $rest"
-#~ msgstr "�ang thực thi: $rest"
-
-#~ msgid "Execution failed: $rest"
-#~ msgstr "Thực thi gặp lỗi: $rest"
-
-#~ 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"
-
-#~ msgid ""
-#~ "You can fix the problem, and then run\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-#~ msgstr ""
-#~ "Bạn có thể sửa các trục trặc, và sau đó chạy lệnh “cải tổ�:\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#~ 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 ""
-#~ "Thực thi thành công: $rest\n"
-#~ "nhưng còn các thay đổi trong mục lục và/hoặc cây làm việc\n"
-#~ "Chuyển giao hay tạm cất các thay đổi này đi, rồi chạy\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#~ msgid "Unknown command: $command $sha1 $rest"
-#~ msgstr "Lệnh chưa biết: $command $sha1 $rest"
-
-#~ 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�."
-
-#~ 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."
-
-#~ msgid "Could not remove CHERRY_PICK_HEAD"
-#~ msgstr "Không thể xóa b� CHERRY_PICK_HEAD"
-
-#~ 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 ""
-#~ "Bạn có các thay đổi so với trong bệ phóng trong\n"
-#~ "thư mục làm việc của bạn. Nếu các thay đổi này là muốn\n"
-#~ "squash vào lần chuyển giao kế trước, chạy:\n"
-#~ "\n"
-#~ "  git commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "Nếu chúng có ý là đi đến lần chuyển giao mới, thì chạy:\n"
-#~ "\n"
-#~ "  git commit $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "Trong cả hai trư�ng hợp, một khi bạn làm xong, tiếp tục bằng:\n"
-#~ "\n"
-#~ "  git rebase --continue\n"
-
-#~ 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"
-
-#~ msgid ""
-#~ "You have uncommitted changes in your working tree. Please commit them\n"
-#~ "first and then run 'git rebase --continue' again."
-#~ msgstr ""
-#~ "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc.\n"
-#~ "Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue� "
-#~ "lần nữa."
-
-#~ msgid "Could not commit staged changes."
-#~ msgstr "Không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-
-#~ msgid "Could not execute editor"
-#~ msgstr "Không thể thực thi trình biên soạn"
-
-#~ msgid "Could not checkout $switch_to"
-#~ msgstr "Không thể lấy ra $switch_to"
-
-#~ msgid "No HEAD?"
-#~ msgstr "Không HEAD?"
-
-#~ msgid "Could not create temporary $state_dir"
-#~ msgstr "Không thể tạo thư mục tạm th�i $state_dir"
-
-#~ msgid "Could not mark as interactive"
-#~ msgstr "Không thể đánh dấu là tương tác"
-
-#~ 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)"
-
-#~ msgid "Note that empty commits are commented out"
-#~ msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-
-#~ msgid "Could not init rewritten commits"
-#~ msgstr "Không thể khởi tạo các lần chuyển giao ghi lại"
-
-#~ 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."
-
-#~ msgid "Cannot pull with rebase: You have unstaged changes."
-#~ msgstr ""
-#~ "Không thể pull với cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-
-#~ msgid "Cannot rebase: Your index contains uncommitted changes."
-#~ msgstr ""
-#~ "Không thể cải tổ: Mục lục của bạn có chứa các thay đổi chưa được chuyển "
-#~ "giao."
-
-#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-#~ msgstr ""
-#~ "Không thể pull với cải tổ: Bạn có các thay đổi chưa được chuyển giao."
-
-#~ msgid "unable to write stateless separator packet"
-#~ msgstr "không thể ghi gói phân tách không trạng thái"
-
-#~ msgid "git merge --abort"
-#~ msgstr "git merge --abort"
-
-#~ msgid "git merge --continue"
-#~ msgstr "git merge --continue"
-
-#~ msgid "git stash clear"
-#~ msgstr "git stash clear"
-
-#~ msgid "remote server sent stateless separator"
-#~ msgstr "máy phục vụ từ xa gửi các bộ ngăn cách không tình trạng"
-
-#~ msgid "--cached and --3way cannot be used together."
-#~ msgstr "--cached và --3way không thể dùng cùng nhau."
-
-#~ msgid "both"
-#~ msgstr "cả hai"
-
-#~ msgid "one"
-#~ msgstr "má»™t"
-
-#~ msgid "Already up to date!"
-#~ msgstr "�ã cập nhật rồi!"
-
-#~ msgid "Already up to date. Yeeah!"
-#~ msgstr "�ã cập nhật rồi. Yeeah!"
-
-#~ msgid "--batch-size option is only for 'repack' subcommand"
-#~ msgstr "tùy ch�n --batch-size chỉ cho lệnh con “repack�"
-
-#~ msgid "Percentage by which creation is weighted"
-#~ msgstr "Tỷ lệ phần trăm cái tạo là weighted"
-
-#~ msgid ""
-#~ "the rebase.useBuiltin support has been removed!\n"
-#~ "See its entry in 'git help config' for details."
-#~ msgstr ""
-#~ "việc hỗ trợ rebase.useBuiltin đã bị xóa!\n"
-#~ "Xem mục tin của nó trong “ git help config� để biết chi tiết."
-
-#~ 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ự"
-
-#~ msgid "repository contains replace objects; skipping commit-graph"
-#~ msgstr ""
-#~ "kho lưu trữ chứa các đối tượng thay thế; b� qua sơ đồ lần chuyển giao"
-
-#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
-#~ msgstr ""
-#~ "kho lưu trữ chứa các mối ghép (đã lạc hậu); b� qua sơ đồ các lần chuyển "
-#~ "giao"
-
-#~ msgid "repository is shallow; skipping commit-graph"
-#~ msgstr "kho nguồn là nông, nên b� qua commit-graph"
-
-#~ msgid "commit-graph improper chunk offset %08x%08x"
-#~ msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x"
-
-#~ msgid "commit-graph chunk id %08x appears multiple times"
-#~ msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhi�u lần"
-
-#~ msgid "invalid chunk offset (too large)"
-#~ msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
-
-#~ msgid "Writing chunks to multi-pack-index"
-#~ msgstr "�ang ghi các khúc vào multi-pack-index"
-
-#~ msgid "rev-list died"
-#~ msgstr "rev-list đã chết"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
-#~ "<good_term> <bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> <lúc_sai> "
-#~ "<lúc_đúng>"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-#~ "<bad_term>"
-#~ msgstr ""
-#~ "git bisect--helper --bisect-check-and-set-terms <command> <lúc_sai> "
-#~ "<lúc_đúng>"
-
-#~ msgid "git bisect--helper --bisect-auto-next"
-#~ msgstr "git bisect--helper --bisect-auto-next"
-
-#~ msgid "write out the bisection state in BISECT_LOG"
-#~ msgstr "ghi ra tình trạng di chuyển nửa bước trong BISECT_LOG"
-
-#~ msgid "check and set terms in a bisection state"
-#~ msgstr "kiểm tra và đặt th�i điểm trong di chuyển nửa bước"
-
-#~ msgid ""
-#~ "verify the next bisection state then checkout the next bisection commit"
-#~ msgstr ""
-#~ "xác nhận trạng thái phân đôi kế sau đó lấy ra lần chuyển giao phân đôi kế"
-
-#~ msgid "--bisect-write requires either 4 or 5 arguments"
-#~ msgstr "--bisect-write cần 4 hoặc 5 tham số"
-
-#~ msgid "--check-and-set-terms requires 3 arguments"
-#~ msgstr "--check-and-set-terms cần 3 tham số"
-
-#~ msgid "--bisect-auto-next requires 0 arguments"
-#~ msgstr "--bisect-auto-next cần 0 tham số"
-
-#~ msgid "Force progress reporting"
-#~ msgstr "Ép buộc báo cáo diễn biến công việc"
-
-#~ 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�"
-
-#~ msgid "Error deleting branch '%s'"
-#~ msgstr "Gặp lỗi khi xóa b� nhánh “%s�"
-
-#~ 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)"
-
-#~ msgid "too many parameters"
-#~ msgstr "quá nhi�u đối số"
-
-#~ msgid "too few parameters"
-#~ msgstr "quá ít đối số"
-
-#~ msgid "Recurse into nested submodules"
-#~ msgstr "�ệ quy vào trong các mô-đun-con lồng nhau"
-
-#~ msgid "too many params"
-#~ msgstr "quá nhi�u đối số"
-
-#~ msgid "Bad rev input: $arg"
-#~ msgstr "�ầu vào rev sai: $arg"
-
-#~ msgid "Counting distinct commits in commit graph"
-#~ msgstr "�ang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao"
-
-#~ msgid "the commit graph format cannot write %d commits"
-#~ msgstr ""
-#~ "định dạng đồ h�a các lần chuyển giao không thể ghi %d lần chuyển giao"
-
-#~ msgid "store only"
-#~ msgstr "chỉ lưu (không nén)"
-
-#~ msgid "compress faster"
-#~ msgstr "nén nhanh hơn"
-
-#~ msgid "compress better"
-#~ msgstr "nén nh� hơn"
-
-#~ msgid "unexpected duplicate commit id %s"
-#~ msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s�"
-
-#~ msgid "error preparing packfile from multi-pack-index"
-#~ msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
-
-#~ msgid "%s: not a valid OID"
-#~ msgstr "%s không phải là một OID hợp lệ"
-
-#~ msgid "invalid committer '%s'"
-#~ msgstr "chuyển giao không hợp lệ “%s�"
-
-#~ msgid "invalid committer: %s"
-#~ msgstr "chuyển giao không hợp lệ: %s"
-
-#~ msgid "git bisect--helper --next-all"
-#~ msgstr "git bisect--helper --next-all"
-
-#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-#~ msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-
-#~ msgid "git bisect--helper --bisect-autostart"
-#~ msgstr "git bisect--helper --bisect-autostart"
-
-#~ msgid "perform 'git bisect next'"
-#~ msgstr "thực hiện “git bisect next�"
-
-#~ msgid "write the terms to .git/BISECT_TERMS"
-#~ msgstr "ghi th�i kỳ vào .git/BISECT_TERMS"
-
-#~ msgid "cleanup the bisection state"
-#~ msgstr "d�n dẹp tình trạng di chuyển nửa bước"
-
-#~ msgid "check for expected revs"
-#~ msgstr "kiểm tra cho điểm xem xét cần dùng"
-
-#~ msgid "start the bisection if it has not yet been started"
-#~ msgstr "chạy di chuyển phân đôi nếu nó vẫn chưa được khởi chạy"
-
-#~ msgid "--write-terms requires two arguments"
-#~ msgstr "--write-terms cần hai tham số"
-
-#~ msgid "--bisect-clean-state requires no arguments"
-#~ msgstr "--bisect-clean-state không nhận đối số"
-
-#~ msgid "--bisect-autostart does not accept arguments"
-#~ msgstr "--bisect-autostart không nhận đối số"
-
-#~ msgid "n,m"
-#~ msgstr "n,m"
-
-#~ 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"
-
-#~ msgid "name of output directory is too long"
-#~ msgstr "tên của thư mục kết xuất quá dài"
-
-#~ msgid "standard output, or directory, which one?"
-#~ msgstr "đầu ra chuẩn, hay thư mục, ch�n cái nào?"
-
-#~ msgid ""
-#~ "WARNING: Some packs in use have been renamed by\n"
-#~ "WARNING: prefixing old- to their name, in order to\n"
-#~ "WARNING: replace them with the new version of the\n"
-#~ "WARNING: file.  But the operation failed, and the\n"
-#~ "WARNING: attempt to rename them back to their\n"
-#~ "WARNING: original names also failed.\n"
-#~ "WARNING: Please rename them in %s manually:\n"
-#~ msgstr ""
-#~ "CẢNH B�O: Một số gói đang dùng vừa được đổi tên bằng cách\n"
-#~ "CẢNH B�O: đánh ti�n tố old- vào tên của chúng, mục đích là\n"
-#~ "CẢNH B�O: thay chúng bằng phiên bản mới của tập\n"
-#~ "CẢNH B�O: tin. Nhưng thao tác lại gặp lỗi, và nỗ\n"
-#~ "CẢNH B�O: lực để đổi ngược lại tên chúng cho đúng với tên\n"
-#~ "CẢNH B�O: nguyên gốc của nó cũng gặp lỗi.\n"
-#~ "CẢNH B�O: Vui lòng đổi tên chúng trong %s bằng tay:\n"
-
-#~ msgid "failed to remove '%s'"
-#~ msgstr "gặp lỗi khi gỡ b� “%s�"
-
-#~ msgid "Routines to help parsing remote repository access parameters"
-#~ msgstr ""
-#~ "Các thủ tục để giúp phân tích các tham số truy cập kho chứa trên mạng"
-
-#~ msgid "Bad rev input: $bisected_head"
-#~ msgstr "�ầu vào rev sai: $bisected_head"
-
-#~ msgid "Bad rev input: $rev"
-#~ msgstr "�ầu vào rev sai: $rev"
-
-#~ msgid "See git-${cmd}(1) for details."
-#~ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
-
-#~ msgid "unknown hash algorithm length"
-#~ msgstr "không hiểu chi�u dài thuật toán băm dữ liệu"
-
-#~ msgid ""
-#~ "commit-graph chunk lookup table entry missing; file may be incomplete"
-#~ msgstr ""
-#~ "bảng tìm kiếm mảnh đồ-thị-các-lần-chuyển-giao còn thiếu; tập tin có thể "
-#~ "sẽ không hoàn thiện"
-
-#~ msgid "Writing changed paths Bloom filters index"
-#~ msgstr "Ghi dữ liệu các mục lục Bloom đư�ng dẫn đã bị thay đổi"
-
-#~ msgid "hash version %u does not match"
-#~ msgstr "phiên bản băm “%u� không khớp"
-
-#~ msgid "Remote with no URL"
-#~ msgstr "Máy chủ không có địa chỉ URL"
-
-#~ msgid "%%(subject) does not take arguments"
-#~ msgstr "%%(subject) không nhận các đối số"
-
-#~ msgid "positive value expected objectname:short=%s"
-#~ msgstr "cần nội dung mang giá trị dương:shot=%s"
-
-#~ msgid "unrecognized %%(objectname) argument: %s"
-#~ msgstr "đối số không được thừa nhận %%(objectname): %s"
-
-#~ msgid "option `%s' is incompatible with --merged"
-#~ msgstr "tùy ch�n “%s� là xung khắc với tùy ch�n --merged"
-
-#~ msgid "option `%s' is incompatible with --no-merged"
-#~ msgstr "tùy ch�n “%s� là xung khắc với tùy ch�n --no-merged"
-
-#~ msgid "could not open '%s' for writing: %s"
-#~ msgstr "không thể mở “%s� để ghi: %s"
-
-#~ msgid "could not read ref '%s'"
-#~ msgstr "không thể đ�c tham chiếu “%s�"
-
-#~ msgid "ref '%s' already exists"
-#~ msgstr "tham chiếu “%s� đã có từ trước rồi"
-
-#~ msgid "unexpected object ID when writing '%s'"
-#~ msgstr "không cần ID đối tượng khi ghi “%s�"
-
-#~ msgid "unexpected object ID when deleting '%s'"
-#~ msgstr "gặp ID đối tượng không cần khi xóa “%s�"
-
-#~ msgid "The hash algorithm %s is not supported in this build."
-#~ msgstr "Thuật toán băm %s không được hỗ trợ trong bản biên dịch này."
-
-#~ msgid "could not open the file BISECT_TERMS"
-#~ msgstr "không thể mở tập tin BISECT_TERMS"
-
-#~ msgid "update BISECT_HEAD instead of checking out the current commit"
-#~ msgstr ""
-#~ "cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện "
-#~ "hành"
-
-#~ msgid "print only names (no SHA-1)"
-#~ msgstr "chỉ hiển thị tên (không SHA-1)"
-
-#~ msgid "passed to 'git am'"
-#~ msgstr "chuyển cho “git am�"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "Finding commits for commit graph from %d ref"
-#~ msgid_plural "Finding commits for commit graph from %d refs"
-#~ msgstr[0] ""
-#~ "�ang tìm các lần chuyển giao cho đồ thị lần chuyển giao từ %d tham chiếu"
-
-#~ msgid "invalid commit object id: %s"
-#~ msgstr "mã số đối tượng lần chuyển giao không hợp lệ: %s"
-
-#~ 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ệ"
-
-#~ 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)"
-
-#~ 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ệ"
-
-#~ msgid "unable to re-add worktree '%s'"
-#~ msgstr "không thể thêm-lại cây “%s�"
-
-#~ msgid "target '%s' already exists"
-#~ msgstr "đích “%s� đã tồn tại rồi"
-
-#~ msgid ""
-#~ "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"
-
-#~ msgid ""
-#~ "The following working tree files would be overwritten by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi cập "
-#~ "nhật checkout rải rác:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The following working tree files would be removed by sparse checkout "
-#~ "update:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị xóa b� bởi cập "
-#~ "nhật checkout rải rác:\n"
-#~ "%s"
-
-#~ msgid "annotated tag %s has no embedded name"
-#~ msgstr "thẻ được chú giải %s không có tên nhúng"
-
-#~ msgid "automatically stash/stash pop before and after rebase"
-#~ msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
-
-#~ 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."
-
-#~ msgid "(DEPRECATED) keep empty commits"
-#~ msgstr "(CŨ) giữ lại các lần chuyển giao rỗng"
-
-#~ msgid "Could not read '%s'"
-#~ msgstr "Không thể đ�c “%s�"
-
-#~ msgid "Cannot store %s"
-#~ msgstr "Không thể lưu “%s�"
-
-#~ msgid "set sparse-checkout patterns"
-#~ msgstr "đặt các mẫu sparse-checkout"
-
-#~ msgid "disable sparse-checkout"
-#~ msgstr "tắt sparse-checkout"
-
-#~ msgid "could not exec %s"
-#~ msgstr "không thể thực thi %s"
-
-#~ 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)"
-
-#~ msgid "Cannot update $ref_stash with $w_commit"
-#~ msgstr "Không thể cập nhật $ref_stash với $w_commit"
-
-#~ msgid "error: unknown option for 'stash push': $option"
-#~ msgstr "lỗi: không hiểu tùy ch�n cho “stash push�: $option"
-
-#~ 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"
-
-#~ msgid "unknown option: $opt"
-#~ msgstr "không hiểu tùy ch�n: $opt"
-
-#~ msgid "Too many revisions specified: $REV"
-#~ msgstr "Chỉ ra quá nhi�u điểm xét duyệt: $REV"
-
-#~ msgid "$reference is not a valid reference"
-#~ msgstr "$reference không phải là tham chiếu hợp lệ"
-
-#~ 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)"
-
-#~ msgid "'$args' is not a stash reference"
-#~ msgstr "�$args� không phải tham chiếu đến stash"
-
-#~ msgid "unable to refresh index"
-#~ msgstr "không thể làm tươi mới bảng mục lục"
-
-#~ 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"
-
-#~ 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."
-
-#~ msgid "Could not save index tree"
-#~ msgstr "Không thể ghi lại cây chỉ mục"
-
-#~ 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)"
-
-#~ 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"
-
-#~ msgid "Dropped ${REV} ($s)"
-#~ msgstr "�ã xóa ${REV} ($s)"
-
-#~ msgid "${REV}: Could not drop stash entry"
-#~ msgstr "${REV}: Không thể xóa b� mục stash"
-
-#~ msgid "(To restore them type \"git stash apply\")"
-#~ msgstr "(�ể phục hồi lại chúng hãy gõ \"git stash apply\")"
-
-#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
-#~ msgstr "Thay đổi chế độ bệ phóng [y,n,a,q,d%s,?]? "
-
-#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
-#~ msgstr "Xóa kh�i bệ phóng [y,n,a,q,d%s,?]? "
-
-#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-#~ msgstr "�ưa lên bệ phóng khúc này [y,n,a,q,d%s,?]? "
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for staging.\n"
-#~ msgstr ""
-#~ "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
-#~ "được đánh dấu để chuyển lên bệ phóng.\n"
-
-#~ 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 and all the remaining hunks\n"
-#~ "d - do not stage this hunk nor any of the remaining hunks\n"
-#~ msgstr ""
-#~ "y - đưa lên bệ phóng khúc này\n"
-#~ "n - đừng đưa lên bệ phóng khúc này\n"
-#~ "q - thoát; đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn "
-#~ "lại\n"
-#~ "a - đưa lên bệ phóng khúc này và tất cả các khúc còn lại sau này\n"
-#~ "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại\n"
-
-#~ msgid "could not copy '%s' to '%s'."
-#~ msgstr "không thể chép “%s� sang “%s�."
-
-#~ msgid "malformed ident line"
-#~ msgstr "dòng định danh không hợp lệ"
-
-#~ msgid "could not parse '%.*s'"
-#~ msgstr "không thể phân tích cú pháp “%.*s�"
-
-#~ msgid "could not checkout %s"
-#~ msgstr "không thể lấy ra %s"
-
-#~ msgid "filename in tree entry contains backslash: '%s'"
-#~ msgstr "tên tập tin trong mục tin cây có chứa ký tự gạch ngược: “%s�"
-
-#~ 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"
-
-#~ msgid "Maybe you wanted to say 'git add .'?\n"
-#~ msgstr "Có lẽ ý bạn là “git add .� phải không?\n"
-
-#~ msgid "packfile is invalid: %s"
-#~ msgstr "tập tin gói không hợp lệ: %s"
-
-#~ msgid "unable to open packfile for reuse: %s"
-#~ msgstr "không thể mở tập tin gói để dùng lại: %s"
-
-#~ msgid "unable to seek in reused packfile"
-#~ msgstr "không thể di chuyển vị trí đ�c trong tập tin gói dùng lại"
-
-#~ msgid "unable to read from reused packfile"
-#~ msgstr "không thể đ�c từ tập tin gói dùng lại"
-
-#~ msgid "no HEAD?"
-#~ msgstr "không HEAD?"
-
-#~ msgid "preserve empty commits during rebase"
-#~ msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ"
-
-#~ msgid "cannot combine --use-bitmap-index with object filtering"
-#~ msgstr "không thể tổ hợp --use-bitmap-index với l�c đối tượng"
-
-#~ 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 ""
-#~ "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"
-#~ "$sm_path\n"
-#~ "Sử dụng -f nếu bạn thực sự muốn thêm nó vào."
-
-#~ msgid "Use an experimental heuristic to improve diffs"
-#~ msgstr "Dùng một ph�ng đoán thử nghiệm để tăng cư�ng các diff"
-
-#~ msgid "git commit-graph [--object-dir <objdir>]"
-#~ msgstr "git commit-graph [--object-dir <objdir>]"
-
-#~ msgid "git commit-graph read [--object-dir <objdir>]"
-#~ msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#~ 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�"
-
-#~ msgid "cannot change partial clone promisor remote"
-#~ msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor"
-
-#~ msgid "error building trees"
-#~ msgstr "gặp lỗi khi xây dựng cây"
-
-#~ msgid "invalid date format '%s' in '%s'"
-#~ msgstr "định dạng ngày tháng không hợp lệ “%s� trong “%s�"
-
-#~ msgid "writing root commit"
-#~ msgstr "ghi chuyển giao gốc"
-
-#~ msgid "staged changes in the following files may be lost: %s"
-#~ msgstr ""
-#~ "các thay đổi đã đưa lên bệ phóng trong các tập tin sau đây có thể bị mất: "
-#~ "%s"
-
-#~ msgid ""
-#~ "--filter can only be used with the remote configured in extensions."
-#~ "partialClone"
-#~ msgstr ""
-#~ "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
-#~ "partialClone"
-
-#~ msgid "verify commit-msg hook"
-#~ msgstr "thẩm tra móc (hook) commit-msg"
-
-#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr "không thể kết hợp “--rebase-merges� với “--strategy-option�"
-
-#~ msgid "invalid sparse value '%s'"
-#~ msgstr "giá trị sparse không hợp lệ “%s�"
-
-#~ msgid ""
-#~ "Fetch normally indicates which branches had a forced update, but that "
-#~ "check has been disabled."
-#~ msgstr ""
-#~ "Lấy v� bình thư�ng cho biết các các nhánh nào buộc phải cập nhật, nhưng "
-#~ "việc kiểm tra đã bị vô hiệu hóa."
-
-#~ msgid ""
-#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-#~ msgstr ""
-#~ "hoặc chạy “git config fetch.showForcedUpdates false� để tránh kiểm tra "
-#~ "này.\n"
-
-#~ msgid ""
-#~ "log.mailmap is not set; its implicit value will change in an\n"
-#~ "upcoming release. To squelch this message and preserve current\n"
-#~ "behaviour, set the log.mailmap configuration value to false.\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behaviour now, set the\n"
-#~ "log.mailmap configuration value to true.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'log.mailmap' for further "
-#~ "information."
-#~ msgstr ""
-#~ "log.mailmap không được đặt; giá trị ngầm của nó sẽ thay đổi trong một\n"
-#~ "phát hành sắp tới. �ể chấm dứt thông báo này và duy trì hành xử\n"
-#~ "hiện tại, đặt giá trị cấu hình log.mailmap thành false.\n"
-#~ "\n"
-#~ "�ể làm chấm dứt thông báo này và áp cách hành xử mới, hãy đặt\n"
-#~ "giá trị cấu hình log.mailmap true.\n"
-#~ "\n"
-#~ "Xem “git help config “ và tìm kiếm “ log.mailmap “ để biết thêm thông tin."
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "Máy chủ hỗ trợ multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "Máy chủ hỗ trợ no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "Máy chủ hỗ trợ multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "Máy chủ hỗ trợ side-band-64k"
-
-#~ msgid "Server supports side-band"
-#~ msgstr "Máy chủ hỗ trợ side-band"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "Máy chủ hỗ trợ ofs-delta"
-
-#~ msgid "Checking out files"
-#~ msgstr "�ang lấy ra các tập tin"
-
-#~ 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."
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "gặp lỗi khi lấy thông tin thống kê v� %s\n"
-
-#~ 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 ""
-#~ "Nếu bạn muốn b� qua lần chuyển giao này thì dùng:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "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"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "verb không được thừa nhận: %s"
-
-#~ msgid "option '%s' requires a value"
-#~ msgstr "tùy ch�n “%s� yêu cầu một giá trị"
-
-#~ msgid "could not transform the todo list"
-#~ msgstr "không thể chuyển dạng danh sách cần làm"
-
-#~ msgid "default"
-#~ msgstr "mặc định"
-
-#~ msgid "Could not create directory '%s'"
-#~ msgstr "Không thể tạo thư mục “%s�"
-
-#~ msgid "allow rerere to update index with resolved conflict"
-#~ msgstr ""
-#~ "cho phép rerere cập nhật bảng mục lục với các xung đột đã được giải quyết"
-
-#~ msgid "could not open %s"
-#~ msgstr "không thể mở %s"
-
-#~ msgid "Could not move back to $head_name"
-#~ msgstr "Không thể quay trở lại $head_name"
-
-#~ 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 ""
-#~ "Hình như là ở đây sẵn có một thư mục $state_dir_base, và\n"
-#~ "Tôi tự h�i có phải bạn đang ở giữa một lệnh rebase khác. Nếu đúng là\n"
-#~ "như vậy, xin hãy thử\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "Nếu không phải thế, hãy thử\n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "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."
-
-#~ msgid ""
-#~ "fatal: cannot combine am options with either interactive or merge options"
-#~ msgstr ""
-#~ "lỗi nghiêm tr�ng: không thể tổ hợp các tùy ch�n am với các tùy ch�n tương "
-#~ "tác hay hòa trộn"
-
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr ""
-#~ "lỗi nghiêm tr�ng: không thể kết hợp “--signoff� với “--preserve-merges�"
-
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr ""
-#~ "lỗi nghiêm tr�ng: không thể kết hợp “--preserve-merges� với “--rebase-"
-#~ "merges�"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr ""
-#~ "lỗi nghiêm tr�ng: không thể kết hợp “--rebase-merges� với “--strategy-"
-#~ "option�"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr ""
-#~ "lỗi nghiêm tr�ng: không thể kết hợp “--rebase-merges� với “--strategy�"
-
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "thượng nguồn không hợp lệ “$upstream_name�"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "nghiêm tr�ng: không có nhánh như thế: “$branch_name�"
-
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "�ã tạo autostash: $stash_abbrev"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Changes to $onto:"
-#~ msgstr "Thay đổi thành $onto:"
-
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Thay đổi từ $mb thành $onto:"
-
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
-
-#~ 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ó…"
-
-#~ msgid "ignoring unknown color-moved-ws mode '%s'"
-#~ msgstr "b� qua chế độ color-moved-ws chưa biết “%s�"
-
-#~ msgid "only 'tree:0' is supported"
-#~ msgstr "chỉ “tree:0� là được hỗ trợ"
-
-#~ 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"
-
-#~ msgid "Adding merged %s"
-#~ msgstr "Thêm hòa trộn %s"
-
-#~ msgid "Internal error"
-#~ msgstr "Lá»—i ná»™i bá»™"
-
-#~ 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."
-
-#~ msgid "unable to write sha1 filename %s"
-#~ msgstr "không thể ghi vào tên tập tin sha1 %s"
-
-#~ msgid "cannot read sha1_file for %s"
-#~ msgstr "không thể đ�c sha1_file cho %s"
-
-#~ msgid ""
-#~ "error: cannot combine interactive options (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
-#~ "options (%s)"
-#~ msgstr ""
-#~ "lỗi: không thể tổ hợp các tùy ch�n tương tác (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) với các "
-#~ "tùy ch�n am (%s)"
-
-#~ msgid ""
-#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
-#~ "option) with am options (%s)"
-#~ msgstr ""
-#~ "lỗi: không thể kết hợp các tùy ch�n hòa trộn (--merge, --strategy, --"
-#~ "strategy-option) với một tùy ch�n am (%s)"
-
-#~ msgid "unrecognised option: '$arg'"
-#~ msgstr "không công nhận tùy ch�n: “$arg�"
-
-#~ msgid "'$invalid' is not a valid commit"
-#~ msgstr "�$invalid� không phải là lần chuyển giao hợp lệ"
-
-#~ msgid "could not parse '%s' (looking for '%s')"
-#~ msgstr "không thể phân tích “%s� (đang tìm kiếm cho “%s�)"
-
-#~ msgid "deprecated synonym for --create-reflog"
-#~ msgstr "đồng nghĩa đã lạc hậu cho --create-reflog"
-
-#~ msgid "Can't stat %s"
-#~ msgstr "không thể lấy thông tin thống kê v� “%s�"
-
-#~ msgid "abort rebase"
-#~ msgstr "bãi b� việc cải tổ"
-
-#~ msgid "make rebase script"
-#~ msgstr "tạo văn lệnh rebase"
-
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "không thể di chuyển một cây-làm-việc bị khóa"
-
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "không thể gỡ b� một cây-làm-việc bị khóa"
-
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "\tTuy nhiên, nếu bạn xóa b� m�i thứ, việc cải tổ sẽ bị bãi b�.\n"
-#~ "\n"
-#~ "\t"
-
-#~ msgid "could not parse '%s' (looking for '%s'"
-#~ msgstr "không thể phân tích “%s� (tìm kiếm cho “%s�"
-
-#~ msgid "push|fetch"
-#~ msgstr "push|fetch"
-
-#~ msgid "Dirty index: cannot merge (dirty: %s)"
-#~ msgstr "Bảng mục lục bẩn: không thể hòa trộn (bẩn: %s)"
-
-#~ msgid "(+/-)x"
-#~ msgstr "(+/-)x"
-
-#~ msgid "<command>"
-#~ msgstr "<lệnh>"
-
-#~ msgid "w[,i1[,i2]]"
-#~ msgstr "w[,i1[,i2]]"
-
-#~ msgid "Entering '$displaypath'"
-#~ msgstr "�ang vào “$displaypath�"
-
-#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
-#~ msgstr "Dừng lại tại “$displaypath�; script trả v� trạng thái khác không."
-
-#~ msgid "Everyday Git With 20 Commands Or So"
-#~ msgstr "Mỗi ngày h�c 20 lệnh Git hay hơn"
-
-#~ msgid "Could not open '%s' for writing"
-#~ msgstr "Không thể mở “%s� để ghi"
-
-#~ msgid ""
-#~ "unexpected 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "không cần dòng thứ nhất của ghi chú squash:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "dòng thứ nhất của ghi chú squash không hợp lệ:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "LỖI: trả v� chuỗi đư�ng dẫn không khớp cwd?"
-
-#~ msgid "Error in object"
-#~ msgstr "Lỗi trong đối tượng"
-
-#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
-#~ msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được EOF"
-
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "biểu thức đặc tả bộ l�c “%s� không hợp lệ"
-
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "Bản sao chép của miếng vá mà nó gặp lỗi thì được tìm thấy trong: %s"
-
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "đặc tả đư�ng dẫn và --all xung khắc nhau"
-
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Mô-đun-con “$name� ($url) được b� đăng ký cho đư�ng dẫn “$displaypath�"
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr "Các trư�ng To/Cc/Bcc không được phiên dịch, chúng bị b� qua\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ 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"
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "không thể cắt cụt “%s�"
-
-#~ msgid "could not close %s"
-#~ msgstr "không thể đóng %s"
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "�ã chép nhánh khuyết danh “%s� đi"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "không hợp lý khi tạo “HEAD� thủ công"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "“$term� không phải là th�i kỳ hợp lệ"
-
-#~ msgid ""
-#~ "error: unknown option for 'stash save': $option\n"
-#~ "       To provide a message, use git stash save -- '$option'"
-#~ msgstr ""
-#~ "lỗi: không hiểu tùy ch�n cho “stash save�: $option\n"
-#~ "     �ể có thể dùng l�i chú thích có chứa -- ở đầu,\n"
-#~ "     dùng git stash save -- \"$option\""
-
-#~ 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�"
-
-#~ 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 ""
-#~ "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 "%s, %"
-#~ msgid_plural "%s, %"
-#~ msgstr[0] "%s, %"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "trong %0.1f giây một cách tự động…"
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) gặp lỗi"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Lần chuyển giao khởi tạo trên "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "Miếng vá trống rỗng. Quá trình chia nh� miếng vá có lỗi?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Bạn vẫn có những đư�ng dẫn chưa được hòa trộn trong bảng mục lục của "
-#~ "mình.\n"
-#~ "Bạn đã quên sử dụng lệnh “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 ""
-#~ "Không thể cập nhật và chuyển thành nhánh “%s� cùng lúc\n"
-#~ "Bạn đã có ý định checkout “%s� cái mà không thể được phân giải như là lần "
-#~ "chuyển giao?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr ""
-#~ "Những đư�ng dẫn rõ ràng được chỉ ra không có tùy ch�n -i cũng không -o; "
-#~ "coi là --only những đư�ng dẫn"
-
-#~ msgid "default mode for recursion"
-#~ msgstr "chế độ mặc định cho đệ qui"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "lệnh con submodule--helper phải được g�i với một lệnh con"
-
-#~ msgid "tag: tagging "
-#~ msgstr "thẻ: đang đánh thẻ"
-
-#~ msgid "commit object"
-#~ msgstr "đối tượng lần chuyển giao"
-
-#~ msgid "blob object"
-#~ msgstr "đối tượng blob"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Ở đây không có gì bị loại trừ bởi: các mẫu (loại trừ).\n"
-#~ "Có lẽ bạn đã quên thêm hoặc là “:/� hoặc là “.�?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "không nhận ra định dạng: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= cần một đối số nguyên dương"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "tham chiếu “%s� không có %ld thành phần để mà :strip"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: đã ra đi]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: đứng sau %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: phía trước %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: trÆ°á»›c %d, sau %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** tham chiếu không hợp lệ ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "tên thẻ quá dài: %.*s…"
-
-#~ msgid "tag header too big."
-#~ msgstr "phần đầu thẻ quá lớn."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Nếu miếng vá được áp dụng sạch sẽ, hunk đã sửa sẽ ngay lập tức\n"
-#~ "được đánh dấu để loại b�"
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Dùng một ph�ng đoán dựa trên dòng trắng thử nghiệm để tăng cư�ng các diff"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Gi�i…  “tu bổ� cái cuối với bảng mục lục bẩn."
-
-#~ 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] ""
-#~ "các mô-đun-con sau đây (hay một trong số mô-đun-con bên trong của nó)\n"
-#~ "dùng một thư mục .git:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(dùng /\"rm -rf/\" nếu bạn thực sự muốn gỡ b� nó cùng với tất cả lịch sử "
-#~ "của chúng)"
-
-#~ msgid "Error wrapping up %s."
-#~ msgstr "Lỗi bao b�c %s."
-
-#~ msgid "Your local changes would be overwritten by cherry-pick."
-#~ msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick."
-
-#~ msgid "Cannot revert during another revert."
-#~ msgstr "Không thể hoàn nguyên trong khi có hoàn nguyên khác."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr ""
-#~ "Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Không thể mở %s"
-
-#~ msgid "Could not format %s."
-#~ msgstr "Không thể định dạng “%s�."
-
-#~ msgid "You need to set your committer info first"
-#~ msgstr "Bạn cần đặt thông tin v� ngư�i chuyển giao mã nguồn trước đã"
-
-#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
-#~ msgstr "sai giá trị bằng số của cấu hình “%s� cho “%s�: đơn vị sai"
-
-#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s� cho “%s� trong blob %s: đơn vị sai"
-
-#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s� cho “%s� trong tập tin %s: đơn vị "
-#~ "sai"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s� cho “%s� trong đầu vào tiêu chuẩn: "
-#~ "đơn vị không hợp lệ"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s� cho “%s� trong submodule-blob %s: "
-#~ "đơn vị không hợp lệ"
-
-#~ msgid ""
-#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s� cho “%s� trong dòng lệnh %s: đơn vị "
-#~ "không hợp lệ"
-
-#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
-#~ msgstr ""
-#~ "sai giá trị bằng số của cấu hình “%s� cho “%s� trong %s: đơn vị không hợp "
-#~ "lệ"
-
-#~ msgid "This is the 3rd commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 3:"
-
-#~ msgid "This is the 4th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 4:"
-
-#~ msgid "This is the 5th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 5:"
-
-#~ msgid "This is the 6th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 6:"
-
-#~ msgid "This is the 7th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 7:"
-
-#~ msgid "This is the 8th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 8:"
-
-#~ msgid "This is the 9th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 9:"
-
-#~ msgid "This is the 10th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 10:"
-
-#~ msgid "This is the ${n}th commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "This is the ${n}st commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "This is the ${n}nd commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "This is the ${n}rd commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ ${n}:"
-
-#~ msgid "The 2nd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 2 sẽ bị b� qua:"
-
-#~ msgid "The 3rd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 3 sẽ bị b� qua:"
-
-#~ msgid "The 4th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 4 sẽ bị b� qua:"
-
-#~ msgid "The 5th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 5 sẽ bị b� qua:"
-
-#~ msgid "The 6th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 6 sẽ bị b� qua:"
-
-#~ msgid "The 7th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 7 sẽ bị b� qua:"
-
-#~ msgid "The 8th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 8 sẽ bị b� qua:"
-
-#~ msgid "The 9th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 9 sẽ bị b� qua:"
-
-#~ msgid "The 10th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ 10 sẽ bị b� qua:"
-
-#~ msgid "The ${n}th commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị b� qua:"
-
-#~ msgid "The ${n}st commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị b� qua:"
-
-#~ msgid "The ${n}nd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị b� qua:"
-
-#~ msgid "The ${n}rd commit message will be skipped:"
-#~ msgstr "Chú thích cho lần chuyển giao thứ ${n} sẽ bị b� qua:"
-
-#~ msgid "could not run gpg."
-#~ msgstr "không thể chạy gpg."
-
-#~ msgid "gpg did not accept the data"
-#~ msgstr "gpg đã không chấp nhận dữ liệu"
-
-#~ msgid "unsupported object type in the tree"
-#~ msgstr "kiểu đối tượng không được hỗ trợ trong cây (tree)"
-
-#~ msgid "Fatal merge failure, shouldn't happen."
-#~ msgstr "Việc hòa trộn h�ng nghiêm tr�ng, không nên để xảy ra."
-
-#~ msgid "Unprocessed path??? %s"
-#~ msgstr "�ư�ng dẫn chưa được xử lý??? %s"
-
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "Không thể %s trong khi %s"
-
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng"
-
-#~ msgid "bug: unhandled unmerged status %x"
-#~ msgstr "lỗi: không thể tiếp nhận trạng thái chưa hòa trộn %x"
-
-#~ msgid "bug: unhandled diff status %c"
-#~ msgstr "lỗi: không thể tiếp nhận trạng thái lệnh diff %c"
-
-#~ msgid "could not write branch description template"
-#~ msgstr "không thể ghi mẫu mô tả nhánh"
-
-#~ msgid "corrupt index file"
-#~ msgstr "tập tin ghi bảng mục lục bị h�ng"
-
-#~ msgid "detach the HEAD at named commit"
-#~ msgstr "r�i b� HEAD tại lần chuyển giao danh nghĩa"
-
-#~ msgid "Checking connectivity... "
-#~ msgstr "�ang kiểm tra kết nối… "
-
-#~ msgid "  (unable to update local ref)"
-#~ msgstr "  (không thể cập nhật tham chiếu nội bộ)"
-
-#~ msgid "Initialized empty"
-#~ msgstr "Khởi tạo trống rỗng"
-
-#~ msgid " shared"
-#~ msgstr " đã chia sẻ"
-
-#~ 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"
-
-#~ msgid "Writing SQUASH_MSG"
-#~ msgstr "�ang ghi SQUASH_MSG"
-
-#~ msgid "Finishing SQUASH_MSG"
-#~ msgstr "Hoàn thành SQUASH_MSG"
-
-#~ msgid "   and with remote"
-#~ msgstr "   và với máy chủ"
-
-#~ msgid "removing '%s' failed"
-#~ msgstr "gặp lỗi khi xóa b� “%s�"
-
-#~ msgid ""
-#~ "If you want to reuse this local git directory instead of cloning again "
-#~ "from"
-#~ msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó"
-
-#~ msgid ""
-#~ "use the '--force' option. If the local git directory is not the correct "
-#~ "repo"
-#~ msgstr ""
-#~ "dùng tùy ch�n “--force�. Nếu thư mục git nội bộ không phải là repo (kho) "
-#~ "đúng"
-
-#~ msgid ""
-#~ "or you are unsure what this means choose another name with the '--name' "
-#~ "option."
-#~ msgstr ""
-#~ "hay bạn không chắc chắn đi�u đó có nghĩa gì ch�n tên khác với tùy ch�n “--"
-#~ "name�."
-
-#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
-#~ msgstr "Cây làm việc mô-đun-con “$displaypath� có chứa thư mục .git"
-
-#~ msgid ""
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "(dùng “rm -rf� nếu bạn thực sự muốn gỡ b� nó cùng với tất cả lịch sử của "
-#~ "chúng)"
-
-#~ msgid "'%s': %s"
-#~ msgstr "“%s�: %s"
-
-#~ msgid "    git branch -d %s\n"
-#~ msgstr "    git branch -d %s\n"
-
-#~ msgid "    git branch --set-upstream-to %s\n"
-#~ msgstr "    git branch --set-upstream-to %s\n"
-
-#~ msgid "cannot open %s: %s\n"
-#~ msgstr "không thể mở %s: %s\n"
-
-#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
-#~ msgstr ""
-#~ "Vui lòng đưa các thay đổi của bạn vào “.gitmodules� hay tạm cất chúng đi "
-#~ "để xử lý"
-
-#~ msgid "failed to remove: %s"
-#~ msgstr "gặp lỗi khi gỡ b�: %s"
-
-#~ msgid ""
-#~ "Submodule path '$displaypath' not initialized\n"
-#~ "Maybe you want to use 'update --init'?"
-#~ msgstr ""
-#~ "�ư�ng dẫn mô-đun-con “$displaypath� chưa được khởi tạo.\n"
-#~ "Có lẽ bạn muốn sử dụng lệnh “update --init�?"
-
-#~ msgid "Forward-port local commits to the updated upstream head"
-#~ 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 "improper format entered align:%s"
-#~ msgstr "định dạng không đúng chỗ căn chỉnh:%s"
-
-#~ msgid ""
-#~ "push.default is unset; its implicit value has changed in\n"
-#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
-#~ "and maintain the traditional behavior, use:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "To squelch this message and adopt the new behavior now, use:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "When push.default is set to 'matching', git will push local branches\n"
-#~ "to the remote branches that already exist with the same name.\n"
-#~ "\n"
-#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
-#~ "behavior, which only pushes the current branch to the corresponding\n"
-#~ "remote branch that 'git pull' uses to update the current branch.\n"
-#~ "\n"
-#~ "See 'git help config' and search for 'push.default' for further "
-#~ "information.\n"
-#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
-#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
-#~ msgstr ""
-#~ "biến push.default chưa được đặt; giá trị ngầm định của nó\n"
-#~ "đã được thay đổi trong Git 2.0 từ “matching� thành “simple�.\n"
-#~ "�ể không hiển thị nhắc nhở này và duy trì cách xử lý cũ, hãy chạy lệnh:\n"
-#~ "\n"
-#~ "  git config --global push.default matching\n"
-#~ "\n"
-#~ "�ể không hiển thị nhắc nhở này và áp dụng cách ứng xử mới, hãy chạy "
-#~ "lệnh:\n"
-#~ "\n"
-#~ "  git config --global push.default simple\n"
-#~ "\n"
-#~ "Khi push.default được đặt thành “matching�, git sẽ đẩy các nhánh nội bộ\n"
-#~ "lên các nhánh trên máy chủ, cái mà đã sẵn có và cùng tên.\n"
-#~ "\n"
-#~ "Trong 2.0, Git sẽ mặc định duy trì các ứng xử “simple�,\n"
-#~ "cái này chỉ đẩy những nhánh hiện hành lên các nhánh tương ứng\n"
-#~ "trên máy chủ cái mà lệnh “git pull� dùng để cập nhật nhánh hiện tại.\n"
-#~ "\n"
-#~ "Xem “git help config� và tìm đến “push.default� để có thêm thông tin.\n"
-#~ "(chế độ “simple� được bắt đầu sử dụng từ Git 1.7.11. Sử dụng chế độ tương "
-#~ "tá»±\n"
-#~ "“current� thay vì “simple� nếu bạn thỉnh thoảng phải sử dụng bản Git cũ)"
-
-#~ msgid "Could not append '%s'"
-#~ msgstr "Không thể nối thêm “%s�"
-
-#~ msgid "unable to look up current user in the passwd file: %s"
-#~ msgstr "không tìm thấy ngư�i dùng hiện tại trong tập tin passwd: %s"
-
-#~ msgid "no such user"
-#~ msgstr "không có ngư�i dùng như vậy"
-
-#~ msgid "Testing "
-#~ msgstr "�ang thử"
-
-#~ msgid "branch '%s' does not point at a commit"
-#~ msgstr "nhánh “%s� không chỉ đến một lần chuyển giao nào cả"
-
-#~ msgid "--dissociate given, but there is no --reference"
-#~ msgstr "đã đưa ra --dissociate, nhưng ở đây lại không có --reference"
-
-#~ msgid "show usage"
-#~ msgstr "hiển thị cách dùng"
-
-#~ msgid "insanely long template name %s"
-#~ msgstr "tên mẫu dài một cách điên rồ %s"
-
-#~ msgid "insanely long symlink %s"
-#~ msgstr "liên kết m�m dài một cách điên rồ %s"
-
-#~ msgid "insanely long template path %s"
-#~ msgstr "đư�ng dẫn mẫu “%s� dài một cách điên rồ"
-
-#~ msgid "unsupported sort specification '%s' in variable '%s'"
-#~ msgstr "không hỗ trợ đặc tả sắp xếp “%s� trong biến “%s�"
-
-#~ msgid "switch 'points-at' requires an object"
-#~ msgstr "chuyển đến “points-at� yêu cần một đối tượng"
-
-#~ msgid "--sort and -n are incompatible"
-#~ msgstr "--sort và -n xung khắc nhau"
-
-#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
-#~ msgstr ""
-#~ "Gitdir “$a� là bộ phận của đư�ng dẫn mô-đun-con “$b� hoặc \"vice versa\""
-
-#~ msgid "false|true|preserve"
-#~ msgstr "false|true|preserve"
-
-#~ msgid "BUG: reopen a lockfile that is still open"
-#~ msgstr "LỖI: mở lại tập tin khóa mà nó lại đang được mở"
-
-#~ msgid "BUG: reopen a lockfile that has been committed"
-#~ msgstr "LỖI: mở lại tập tin khóa mà nó đã được chuyển giao"
-
-#~ msgid "option %s does not accept negative form"
-#~ msgstr "tùy ch�n %s không chấp nhận dạng thức âm"
-
-#~ msgid "-b and -B are mutually exclusive"
-#~ msgstr "-b và -B loại từ lẫn nhau."
-
-#~ msgid "Patch format $patch_format is not supported."
-#~ msgstr "�ịnh dạng miếng vá $patch_format không được hỗ trợ."
-
-#~ msgid "Please make up your mind. --skip or --abort?"
-#~ msgstr "Xin hãy rõ ràng. --skip hay --abort?"
-
-#~ msgid ""
-#~ "Patch is empty.  Was it split wrong?\n"
-#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
-#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
-#~ msgstr ""
-#~ "Miếng vá trống rỗng.  Nó đã bị chia cắt sai phải không?\n"
-#~ "Nếu bạn thích b� qua miếng vá này, hãy chạy lệnh sau để thay thế "
-#~ "\"$cmdline --skip\".\n"
-#~ "�ể phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline "
-#~ "--abort\"."
-
-#~ msgid "Patch does not have a valid e-mail address."
-#~ msgstr "Miếng vá không có địa chỉ thư điện tử hợp lệ."
-
-#~ msgid "Applying: $FIRSTLINE"
-#~ msgstr "�ang áp dụng (miếng vá): $FIRSTLINE"
-
-#~ msgid "Patch failed at $msgnum $FIRSTLINE"
-#~ msgstr "Gặp lỗi khi vá tại $msgnum $FIRSTLINE"
-
-#~ msgid ""
-#~ "Pull is not possible because you have unmerged files.\n"
-#~ "Please, 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 ""
-#~ "Pull là không thể được bởi vì bạn có những tập tin chưa được hòa trộn.\n"
-#~ "Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh “git add/rm <tập-"
-#~ "tin>�\n"
-#~ "để phê chuẩn việc đánh dấu đây cần được giải quyết và tạo một lần chuyển "
-#~ "giao."
-
-#~ msgid "no branch specified"
-#~ msgstr "chưa chỉ ra tên của nhánh"
-
-#~ msgid "prune .git/worktrees"
-#~ msgstr "xén .git/worktrees"
-
-#~ msgid "The most commonly used git commands are:"
-#~ msgstr "Những lệnh git hay được dùng nhất là:"
-
-#~ msgid "No such branch: '%s'"
-#~ msgstr "Không có nhánh nào như thế: “%s�"
-
-#~ msgid "Could not create git link %s"
-#~ msgstr "Không thể tạo liên kết git “%s�"
-
-#~ msgid "Invalid gc.pruneexpire: '%s'"
-#~ msgstr "gc.pruneexpire không hợp lệ: “%s�"
-
-#~ msgid "(detached from %s)"
-#~ msgstr "(được tách r�i từ %s)"
-
-#~ msgid "No existing author found with '%s'"
-#~ msgstr "Không tìm thấy tác giả có sẵn với “%s�"
-
-#~ msgid "search also in ignored files"
-#~ msgstr "tìm cả trong các tập tin đã bị l� đi"
-
-#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
-#~ msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
-
-#~ msgid "no files added"
-#~ msgstr "chưa có tập tin nào được thêm vào"
-
-#~ msgid "slot"
-#~ msgstr "khe"
-
-#~ msgid "check"
-#~ msgstr "kiểm tra"
-
-#~ msgid "Failed to lock ref for update"
-#~ msgstr "Gặp lỗi khi khóa tham chiếu để cập nhật"
-
-#~ msgid "Failed to write ref"
-#~ msgstr "Gặp lỗi khi ghi tham chiếu"
-
-#~ msgid "commit has empty message"
-#~ msgstr "lần chuyển giao có ghi chú trống rỗng"
-
-#~ msgid "cannot lock HEAD ref"
-#~ msgstr "không thể khóa HEAD ref (tham chiếu)"
-
-#~ msgid "cannot update HEAD ref"
-#~ msgstr "không thể cập nhật ref (tham chiếu) HEAD"
-
-#~ msgid "Failed to chdir: %s"
-#~ msgstr "Gặp lỗi với lệnh chdir: %s"
-
-#~ msgid "%s: cannot lock the ref"
-#~ msgstr "%s: không thể khóa ref (tham chiếu)"
-
-#~ msgid "Failed to lock HEAD during fast_forward_to"
-#~ msgstr "Gặp lỗi khi khóa HEAD trong quá trình fast_forward_to"
-
-#~ msgid "key id"
-#~ msgstr "id của khóa"
-
-#~ msgid "Tracking not set up: name too long: %s"
-#~ msgstr "Việc theo dõi chưa được cài đặt: tên quá dài: %s"
-
-#~ msgid "bug"
-#~ msgstr "lá»—i"
-
-#~ msgid ", behind "
-#~ msgstr ", đằng sau "
-
-#~ msgid "could not find .gitmodules in index"
-#~ msgstr "không tìm thấy .gitmodules trong bảng mục lục"
-
-#~ msgid "reading updated .gitmodules failed"
-#~ msgstr "gặp lỗi khi đ�c cập nhật .gitmodules"
-
-#~ msgid "unable to stat updated .gitmodules"
-#~ msgstr "không thể lấy thống kê .gitmodules đã cập nhật"
-
-#~ msgid "unable to remove .gitmodules from index"
-#~ msgstr "không thể gỡ b� .gitmodules từ mục lục"
-
-#~ msgid "adding updated .gitmodules failed"
-#~ msgstr "gặp lỗi khi thêm .gitmodules đã cập nhật"
-
-#~ msgid ""
-#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
-#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
-#~ "anymore.\n"
-#~ "To add content for the whole tree, run:\n"
-#~ "\n"
-#~ "  git add %s :/\n"
-#~ "  (or git add %s :/)\n"
-#~ "\n"
-#~ "To restrict the command to the current directory, run:\n"
-#~ "\n"
-#~ "  git add %s .\n"
-#~ "  (or git add %s .)\n"
-#~ "\n"
-#~ "With the current Git version, the command is restricted to the current "
-#~ "directory.\n"
-#~ msgstr ""
-#~ "Cách ứng xử của lệnh “git add %s (hay %s)� khi không có tham số đư�ng dẫn "
-#~ "từ\n"
-#~ "thư-mục con của cây sẽ thay đổi kể từ Git 2.0 và không thể sử dụng như "
-#~ "thế nữa.\n"
-#~ "�ể thêm nội dung cho toàn bộ cây, chạy:\n"
-#~ "\n"
-#~ "  git add %s :/\n"
-#~ "  (hoặc git add %s :/)\n"
-#~ "\n"
-#~ "�ể hạn chế lệnh cho thư-mục hiện tại, chạy:\n"
-#~ "\n"
-#~ "  git add %s .\n"
-#~ "  (hoặc git add %s .)\n"
-#~ "\n"
-#~ "Với phiên bản hiện tại của Git, lệnh bị hạn chế cho thư-mục hiện tại.\n"
-
-#~ msgid ""
-#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
-#~ "whose behaviour will change in Git 2.0 with respect to paths you "
-#~ "removed.\n"
-#~ "Paths like '%s' that are\n"
-#~ "removed from your working tree are ignored with this version of Git.\n"
-#~ "\n"
-#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
-#~ "  ignores paths you removed from your working tree.\n"
-#~ "\n"
-#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
-#~ "\n"
-#~ "Run 'git status' to check the paths you removed from your working tree.\n"
-#~ msgstr ""
-#~ "Bạn chạy “git add� mà không có “-A (--all)� cũng không “--ignore-"
-#~ "removal�,\n"
-#~ "cách ứng xử của nó sẽ thay đổi kể từ Git 2.0: nó quan tâm đến các đư�ng "
-#~ "dẫn mà\n"
-#~ "bạn đã gỡ b�. Các đư�ng dẫn như là “%s� cái mà\n"
-#~ "bị gỡ b� từ cây làm việc của bạn thì bị b� qua với phiên bản này của "
-#~ "Git.\n"
-#~ "\n"
-#~ "* “git add --ignore-removal <pathspec>�, cái hiện tại là mặc định,\n"
-#~ "  b� qua các đư�ng dẫn bạn đã gỡ b� từ cây làm việc của bạn.\n"
-#~ "\n"
-#~ "* “git add --all <pathspec>� sẽ đồng th�i giúp bạn ghi lại việc d�i đi.\n"
-#~ "\n"
-#~ "Chạy “git status� để kiểm tra các đư�ng dẫn bạn đã gỡ b� từ cây làm việc "
-#~ "của bạn.\n"
-
-#~ msgid ""
-#~ "Auto packing the repository for optimum performance. You may also\n"
-#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
-#~ msgstr ""
-#~ "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#~ "chạy lệnh \"git gc\" một cách thủ công. Hãy xem \"git help gc\" để biết "
-#~ "thêm chi tiết.\n"
-
-#~ msgid ""
-#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
-#~ "counterpart. If you did not intend to push that branch, you may want to\n"
-#~ "specify branches to push or set the 'push.default' configuration "
-#~ "variable\n"
-#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
-#~ msgstr ""
-#~ "Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau "
-#~ "bá»™\n"
-#~ "phận tương ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có "
-#~ "lẽ muốn\n"
-#~ "chỉ định các nhánh để push hoặt là đặt nội dung cho biến cấu hình “push."
-#~ "default�\n"
-#~ "thành “simple�, “current� hoặc “upstream� để chỉ push nhánh hiện hành mà "
-#~ "thôi."
-
-#~ msgid "copied:     %s -> %s"
-#~ msgstr "đã sao chép:   %s -> %s"
-
-#~ msgid "deleted:    %s"
-#~ msgstr "đã xóa:        %s"
-
-#~ msgid "modified:   %s"
-#~ msgstr "đã sửa đổi:    %s"
-
-#~ msgid "renamed:    %s -> %s"
-#~ msgstr "đã đổi tên:    %s -> %s"
-
-#~ msgid "unmerged:   %s"
-#~ msgstr "chưa hòa trộn: %s"
-
-#~ msgid "input paths are terminated by a null character"
-#~ msgstr "các đư�ng dẫn được  ngăn cách bởi ký tự null"
-
-#~ msgid ""
-#~ "Aborting. Consider using either the --force or --include-untracked option."
-#~ msgstr ""
-#~ "Bãi b�. Cân nhắc dùng một trong hai tùy ch�n --force và --include-"
-#~ "untracked."
-
-#~ msgid "  (fix conflicts and then run \"git am --resolved\")"
-#~ msgstr "  (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")"
-
-#~ msgid "  (all conflicts fixed: run \"git commit\")"
-#~ msgstr "  (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")"
-
-#~ msgid "more than %d trees given: '%s'"
-#~ msgstr "đã chỉ ra nhi�u hơn %d cây (tree): “%s�"
-
-#~ msgid ""
-#~ "'%s' has changes staged in the index\n"
-#~ "(use --cached to keep the file, or -f to force removal)"
-#~ msgstr ""
-#~ "“%s� có các thay đổi được lưu trạng thái trong bảng mục lục\n"
-#~ "(dùng tùy ch�n --cached để giữ tập tin, hoặc -f để ép buộc gỡ b�)"
-
-#~ msgid "show commits where no parent comes before its children"
-#~ msgstr "hiển thị các lần chuyển giao nơi mà cha mẹ đến trước con của nó"
-
-#~ msgid "show the HEAD reference"
-#~ msgstr "hiển thị tham chiếu của HEAD"
-
-#~ msgid "Unable to fetch in submodule path '$prefix$sm_path'"
-#~ msgstr "Không thể lấy v� trong đư�ng dẫn mô-đun-con “$prefix$sm_path�"
-
-#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
-#~ msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$prefix$sm_path�"
-
-#~ msgid "It took %.2f seconds to enumerate untracked files.  'status -uno'"
-#~ msgstr "Cần %.2f giây để đếm các tập tin chưa được theo dõi.  “status -uno�"
-
-#~ msgid "may speed it up, but you have to be careful not to forget to add"
-#~ msgstr ""
-#~ "có thể làm nó nhanh lên, nhưng bạn phải cẩn tr�ng đừng quên thêm nó vào"
-
-#~ msgid "new files yourself (see 'git help status')."
-#~ msgstr "tập tin mới của chính bạn (xem “git help status�.."
-
-#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
-#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>… ]"
-
-#~ msgid "use any ref in .git/refs"
-#~ msgstr "sử dụng bất kỳ ref nào trong .git/refs"
-
-#~ msgid "use any tag in .git/refs/tags"
-#~ msgstr "sử dụng bất kỳ thẻ nào trong .git/refs/tags"
-
-#~ msgid "failed to close pipe to 'show' for object '%s'"
-#~ msgstr "gặp lỗi khi đóng đư�ng ống cho lệnh “show� cho đối tượng “%s�"
-
-#~ msgid "You do not have a valid HEAD"
-#~ msgstr "Bạn không có HEAD nào hợp lệ"
-
-#~ msgid "oops"
-#~ msgstr "ôi?"
-
-#~ msgid "Not removing %s\n"
-#~ msgstr "Không xóa %s\n"
-
-#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
-#~ msgstr "git remote set-head <tên> (-a | -d | <nhánh>])"
-
-#~ msgid " %d file changed"
-#~ msgid_plural " %d files changed"
-#~ msgstr[0] " %d tập tin thay đổi"
-
-#~ msgid ", %d insertion(+)"
-#~ msgid_plural ", %d insertions(+)"
-#~ msgstr[0] ", %d thêm(+)"
-
-#~ msgid ", %d deletion(-)"
-#~ msgid_plural ", %d deletions(-)"
-#~ msgstr[0] ", %d xóa(-)"
-
-#~ msgid " (use \"git add\" to track)"
-#~ msgstr " (dùng \"git add\" để theo dõi dấu vết)"
-
-#~ msgid "--detach cannot be used with -b/-B/--orphan"
-#~ msgstr "--detach không thể được sử dụng với tùy ch�n -b/-B/--orphan"
-
-#~ msgid "--orphan and -b|-B are mutually exclusive"
-#~ msgstr "Tùy ch�n --orphan và -b|-B loại từ lẫn nhau"
-
-#~ msgid "git checkout: -f and -m are incompatible"
-#~ msgstr "git checkout: hai tùy ch�n -f và -m xung khắc nhau"
-
-#~ msgid ""
-#~ "git checkout: updating paths is incompatible with switching branches."
-#~ msgstr ""
-#~ "git checkout: việc cập nhật các đư�ng dẫn là xung khắc với việc chuyển "
-#~ "đổi các nhánh."
-
-#~ msgid "diff setup failed"
-#~ msgstr "cài đặt diff gặp lỗi"
-
-#~ msgid "merge-recursive: disk full?"
-#~ msgstr "merge-recursive: đĩa bị đầy?"
-
-#~ msgid "diff_setup_done failed"
-#~ msgstr "diff_setup_done gặp lỗi"
-
-#~ msgid "%s: has been deleted/renamed"
-#~ msgstr "%s: đã được xóa/thay-tên"
-
-#~ msgid "'%s': not a documentation directory."
-#~ msgstr "�%s�: không phải là một thư mục tài liệu."
-
-#~ msgid "--"
-#~ msgstr "--"
-
-#~ msgid "Could not extract email from committer identity."
-#~ msgstr ""
-#~ "Không thể rút trích địa chỉ thư điện tử từ định danh ngư�i chuyển giao"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 60ffa45f7a..484f2d8aaf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -44,6 +44,7 @@
 #   commit message                   |  �交说明
 #   commit object                    |  �交对象
 #   commit-ish (also committish)     |  �交�
+#   cone                             |  锥形（稀�检出模型）；锥（稀�检出）
 #   conflict                         |  冲�
 #   core Git                         |  核心 Git 工具
 #   cover letter                     |  附函
@@ -53,6 +54,7 @@
 #   directory                        |  目录
 #   dirty                            |  �（的工作区）
 #   dumb HTTP protocol               |  哑 HTTP �议
+#   enlistment                       |  登记（在 scalar 中使用）
 #   evil merge                       |  ��并（�并引入了父�交没有的修改）
 #   fast-forward                     |  å¿«è¿›
 #   fetch                            |  获�
@@ -136,14 +138,14 @@
 #   upstream                         |  上游
 #   upstream branch                  |  上游分支
 #   working tree                     |  工作区
-# Fangyi Zhou <me@fangyi.io>, 2021.
+# Fangyi Zhou <me@fangyi.io>, 2021-2022.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-10 12:16+0000\n"
+"POT-Creation-Date: 2022-01-17 08:34+0800\n"
+"PO-Revision-Date: 2022-01-11 18:18+0000\n"
 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -158,8 +160,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "�能读�索引"
@@ -188,7 +190,7 @@ msgstr "æ›´æ–°"
 msgid "could not stage '%s'"
 msgstr "�能暂存 '%s'"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "�能写入索引"
 
@@ -204,8 +206,8 @@ msgstr[1] "更新了 %d 个路径\n"
 msgid "note: %s is untracked now.\n"
 msgstr "说明：%s 现已�为未跟踪的。\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry �作失败"
@@ -246,21 +248,21 @@ msgstr[1] "增加了 %d 个路径\n"
 msgid "ignoring unmerged: %s"
 msgstr "忽略未�入的：%s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "�有二进制文件被修改。\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "没有修改。\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "补�更新"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "检视 diff"
 
@@ -328,11 +330,11 @@ msgstr "选择一个编��目"
 msgid "(empty) select nothing"
 msgstr "（空）�选择任何内容"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "请选择"
 
@@ -344,13 +346,13 @@ msgstr "缓存"
 msgid "unstaged"
 msgstr "未缓存"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "路径"
@@ -359,27 +361,27 @@ msgstr "路径"
 msgid "could not refresh index"
 msgstr "�能刷新索引"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "��。\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暂存模��更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暂存该� [y,n,q,a,d%s,?]? "
@@ -404,22 +406,22 @@ msgstr ""
 "a - 暂存该�和本文件中��的全部�\n"
 "d - �暂存该�和本文件中��的全部�\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "贮�模��更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "贮�删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "贮�添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "贮�该� [y,n,q,a,d%s,?]? "
@@ -444,22 +446,22 @@ msgstr ""
 "a - 贮�该�和本文件中��的全部�\n"
 "d - �贮�该�和本文件中��的全部�\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "�消暂存模��更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "�消暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "�消暂存添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "�消暂存该� [y,n,q,a,d%s,?]? "
@@ -484,22 +486,22 @@ msgstr ""
 "a - �消暂存该�和本文件中��的全部�\n"
 "d - ���消暂存该�和本文件中��的全部�\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "将模��更应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "将删除�作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "将添加�作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "将该�应用到索引 [y,n,q,a,d%s,?]? "
@@ -524,26 +526,26 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃模��更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃该� [y,n,q,a,d%s,?]? "
@@ -568,22 +570,22 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃模��更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃该� [y,n,q,a,d%s,?]? "
@@ -602,22 +604,22 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将模��更应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除�作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将添加�作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将该�应用到索引和工作区 [y,n,q,a,d%s,?]? "
@@ -671,7 +673,7 @@ msgstr "�能解�彩色差异信�"
 #: add-patch.c:453
 #, c-format
 msgid "failed to run '%s'"
-msgstr "�行 '%s' 失败"
+msgstr "无法�行 '%s'"
 
 #: add-patch.c:612
 msgid "mismatched output from interactive.diffFilter"
@@ -752,7 +754,7 @@ msgstr "'git apply --cached' 失败"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的编辑��能被应用。�新编辑（选择 \"no\" 丢弃�） [y/n]? "
@@ -761,11 +763,11 @@ msgstr "您的编辑å�—ä¸�能被应用。é‡�新编辑（选择 \"no\" 丢弃ï¼�ï
 msgid "The selected hunks do not apply to the index!"
 msgstr "选中的��能应用到索引�"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "无论如何都�应用到工作区么？"
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
@@ -803,11 +805,11 @@ msgstr "没有下一个�"
 msgid "No other hunks to goto"
 msgstr "没有其它�供跳转的�"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳转到哪个�（<回车> 查看更多）？ "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "跳转到哪个�？"
 
@@ -827,7 +829,7 @@ msgstr[1] "对�起，�有 %d 个�用�。"
 msgid "No other hunks to search"
 msgstr "没有其它�供查找的�"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "使用正则表达��索？"
 
@@ -908,7 +910,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲�而退出。"
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结�您的�并（存在 MERGE_HEAD）。"
 
@@ -1001,21 +1003,33 @@ msgstr "未能识别的空白字符选项 '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3way �能�时使用。"
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way 在一个仓库之外"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index 在一个仓库之外"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached 在一个仓库之外"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "选项 '%s' 和 '%s' �能�时使用"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' 在仓库之外"
 
 #: apply.c:800
 #, c-format
@@ -1218,8 +1232,8 @@ msgstr "打补�失败：%s:%ld"
 msgid "cannot checkout %s"
 msgstr "�能检出 %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读� %s"
@@ -1229,380 +1243,378 @@ msgstr "无法读� %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读��于符�链接中的 '%s'"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已�被�命�/删除"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在于索引中"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�匹�"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "仓库缺�执行三方�并所必需的数�对象。"
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "执行三方�并...\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读� '%s' 的当�内容"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "无法执行三方�并...\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补�到 '%s' 存在冲�。\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�功应用补�到 '%s'。\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "回�到直接应用...\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "移除补��留下了文件内容"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已�存在于索引中"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已�存在于工作区中"
 
-#: apply.c:3998
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模�（%1$o）和旧模�（%3$o）�匹�"
 
-#: apply.c:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影�的文件 '%s' �于符�链接中"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补�未应用"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在检查补� %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "�模组 %s 的 sha1 信�缺失或无效"
 
-#: apply.c:4141
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模��更，但它�在当� HEAD 中"
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信�缺失或无效（%s）。"
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "�能在临时索引中添加 %s"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "�能把临时索引写入到 %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能从索引中移除 %s"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模组 %s ��的补�"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能为新建文件 %s 创建�端存储"
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存�目"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
-msgstr "写入 '%s' 失败"
+msgstr "无法写入 '%s'"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能写文件 '%s' �� %o"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功应用补� %s。"
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4581
+#: apply.c:4583
 #, 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:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件�为 %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "�能打开 %s"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段�功应用。"
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒�第 #%d 个片段。"
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补� '%s'。"
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "未能识别的输入"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "输入中没有�法的补� （使用 \"--allow-empty\" ��许）"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "无法读�索引文件"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "�能打开补� '%s'：%s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 个空白字符误用"
 msgstr[1] "抑制下�有 %d 个空白字符误用"
 
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字符误用。"
 msgstr[1] "%d 行新增了空白字符误用。"
 
-#: apply.c:4973
+#: apply.c:4977
 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "��应用与给出路径�匹�的�更"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径�匹�的�更"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "æ•°å­—"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数�的�导斜线"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "忽略补�中的添加的文件"
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�应用补�，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�进制数显示添加和删除的行数"
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�应用补�，而是显示输入的概�"
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�应用补�，而是查看补�是��应用"
 
-#: apply.c:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补��以应用到当�索引"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "应用补�而�修改工作区"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作区之外文件的补�"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补�（与 --stat/--summary/--check 选项�时使用）"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "�试三路�并，如果失败则回�至正常补�模�"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信�"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "确�至少匹� <n> 行上下文"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "动作"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的�更"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "��应用补�"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒�的补�片段�存在对应的 *.rej 文件中"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "�许��的补�片段"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "冗长输出"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�许�正确的文件末尾�行符"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任补�片段的头信�中的行�"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件��添加 <根目录>"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "对空的补��返回错误"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1613,16 +1625,16 @@ msgstr "�能打开数�对象 %s"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "�支�的文件模�：0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "无法�动 '%s' 过滤器"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "无法�定��述符"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' 过滤器报告了错误"
@@ -1665,19 +1677,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr "�能读� %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "�能读� '%s'"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径规格 '%s' 未匹�任何文件"
@@ -1719,7 +1725,7 @@ msgstr "格�"
 msgid "archive format"
 msgstr "归档格�"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "�缀"
 
@@ -1729,9 +1735,9 @@ msgstr "为归档中�个路径�加上�缀"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "文件"
@@ -1761,7 +1767,7 @@ msgid "list supported archive formats"
 msgstr "列出支�的归档格�"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "仓库"
 
@@ -1769,7 +1775,7 @@ msgstr "仓库"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）��归档文件"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "命令"
@@ -1782,18 +1788,20 @@ msgstr "远程 git-upload-archive 命令的路径"
 msgid "Unexpected option --remote"
 msgstr "未知�数 --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "选项 --exec �能和 --remote �时使用"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "选项 '%s' 需� '%s'"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "未知�数 --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "选项 --add-file 和 --remote �能�时使用"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1901,7 +1909,7 @@ msgstr "需�一个 %s 版本"
 msgid "could not create file '%s'"
 msgstr "�能创建文件 '%s'"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能读�文件 '%s'"
@@ -1953,10 +1961,10 @@ msgstr "�能将 --contents 和最终的�交对象�共用"
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1977,97 +1985,86 @@ msgstr "在 %2$s 中无此路径 %1$s"
 msgid "cannot read blob %s for path %s"
 msgstr "�能为路径 %2$s 读�数�对象 %1$s"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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"
-"在修�错误�，您�以�试修改远程跟踪分支，通过执行命令\n"
-"\"git branch --set-upstream-to=%s%s%s\" 。"
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "在请求�基时无法继承上游多个引用的跟踪设置"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未设置分支 %s 作为它自己的上游。"
+msgid "not setting branch '%s' as its own upstream"
+msgstr "没有将分支 '%s' 设置为它自己的上游"
 
-#: branch.c:93
+#: branch.c:144
 #, 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 '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用�基�跟踪 '%s'。"
 
-#: branch.c:94
+#: branch.c:145
 #, 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 '%s'."
+msgstr "分支 '%s' 设置为跟踪 '%s'。"
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用�基�跟踪本地分支 '%s'。"
+msgid "branch '%s' set up to track:"
+msgstr "分支 '%s' 设置为跟踪："
 
-#: branch.c:99
-#, c-format
-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'。"
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "无法写入上游分支�置"
 
-#: branch.c:105
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"在修�错误�，您�以通过执行以下命令��试修改远程跟踪分支："
 
-#: branch.c:109
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "分支 '%s' 设置为使用�基�跟踪本地引用 '%s'。"
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "�求从 '%s' 继承跟踪信�，但是没有设置远程"
 
-#: branch.c:110
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
-
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "无法写入上游分支�置"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "�求从 '%s' 继承跟踪信�，但是没有设置�并�置"
 
-#: branch.c:156
+#: branch.c:252
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
+msgid "not tracking: ambiguous information for ref %s"
 msgstr "未跟踪：引用 %s 有歧义"
 
-#: branch.c:189
+#: branch.c:287
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' �是一个有效的分支�称。"
+msgid "'%s' is not a valid branch name"
+msgstr "'%s' �是一个有效的分支�称"
 
-#: branch.c:208
+#: branch.c:307
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "一个分支� '%s' 已�存在。"
+msgid "a branch named '%s' already exists"
+msgstr "一个�为 '%s' 的分支已�存在"
 
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "无法强制更新当�分支。"
+#: branch.c:313
+#, c-format
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'"
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "无法设置跟踪信�；起始点 '%s' �是一个分支。"
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "无法设置跟踪信�；起始点 '%s' �是一个分支"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "请求的上游分支 '%s' �存在"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -2085,27 +2082,28 @@ msgstr ""
 "如果您正计划推�一个能与对应远程分支建立跟踪的新的本地分支，\n"
 "您�能需�使用 \"git push -u\" 推�分支并�置和上游的关�。"
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "�是一个有效的对象�：'%s'。"
+msgid "not a valid object name: '%s'"
+msgstr "�是一个有效的对象�：'%s'"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧义的对象�：'%s'。"
+msgid "ambiguous object name: '%s'"
+msgstr "歧义的对象�：'%s'"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "无效的分支点：'%s'。"
+msgid "not a valid branch point: '%s'"
+msgstr "无效的分支点：'%s'"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已�检出到 '%s'"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作区 %s 的 HEAD 指�没有被更新"
@@ -2130,7 +2128,7 @@ msgstr "'%s' ��是一个 v2 或 v3 版本的归档包文件"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2189,7 +2187,7 @@ msgstr "�支�的归档包版本 %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "�能写入，归档包版本 %d �支�算法 %s"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的�数：%s"
@@ -2226,7 +2224,7 @@ msgstr "�现��的�ID %<PRIx32>"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "最终�有�零 ID %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
@@ -2276,207 +2274,207 @@ msgstr "无效的�交图形链：行 '%s' �是一个哈希值"
 msgid "unable to find all commit-graph files"
 msgstr "无法找到所有�交图形文件"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "无效的�交�置。�交图形�能已��"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "无法找到�交 %s"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "�交图需�溢出世代数�，但是没有"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "无法获得对象 %s 类型"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "正在加载�交图中的已知�交"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "正在扩展�交图中的�达�交"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除�交图中的�交标记"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "正在计算�交图拓扑级别"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "正在计算�交图世代数字"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "计算�交�更路径的布隆过滤器"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "正在收集引用的�交"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "正在 %d 个包中查找�交图的�交"
 msgstr[1] "正在 %d 个包中查找�交图的�交"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "添加包 %s 出错"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "为 %s 打开索引出错"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包对象中查找�交图的�交"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "正在查找�交图中�外的边"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "无法写入正确数�的基础图形 ID"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "�能为 %s 创建先导目录"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "无法创建临时图层"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "无法为 '%s' 调整共享��"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "正在用 %d 步写出�交图"
 msgstr[1] "正在用 %d 步写出�交图"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "无法打开�交图形链文件"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "无法�命�基础�交图形文件"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "无法�命�临时�交图形文件"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "正在扫��并�交"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "正在�并�交图形"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr "正�试写�交图，但是 'core.commitGraph' 被�用"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "�交太多�能画图"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "�交图文件的校验�错误，�能已���"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "�交图形的对象 ID 顺��正确：%s 然� %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "�交图形有�正确的扇出值：fanout[%d] = %u != %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "无法从�交图形中解��交 %s"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "正在校验�交图中的�交"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "无法从�交图形的对象库中解��交 %s"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "�交图形中的�交 %s 的根树对象 ID 是 %s != %s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�交 %s 的�交图形父�交列表太长了"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的�交图形父�交是 %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�交 %s 的�交图形父�交列表过早终止"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr "�交图形中�交 %s 的世代�是零，但其它地方�零"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr "�交图形中�交 %s 的世代��零，但其它地方是零"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "�交图形中的�交 %s 的世代�是 %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "�交图形中�交 %s 的�交日期是 %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "�能解� %s"
@@ -2506,27 +2504,27 @@ msgstr ""
 "设置 \"git config advice.graftFileDeprecated false\"\n"
 "�关闭本消�"
 
-#: commit.c:1239
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 没有 GPG 签�。"
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2593,7 +2591,7 @@ msgstr "键�没有包�一个�节�称：%s"
 msgid "key does not contain variable name: %s"
 msgstr "键�没有包����：%s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键�：%s"
@@ -2744,144 +2742,144 @@ msgstr "core.commentChar 应该是一个字符"
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模�：%s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s 的�值格�错误"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s 的�值格�错误：%s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必须是其中之一：nothing�matching�simple�upstream 或 current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "无法从数�对象 '%s' 加载�置"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "引用 '%s' 没有指�一个数�对象"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "�能解��置对象 '%s'"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
-msgstr "解� %s 失败"
+msgstr "无法解� %s"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "无法解�命令行中的�置"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读��置文件时�到未知错误"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解�命令行�置中的 '%s'"
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行�现错误的�置�� '%1$s'"
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "无效的�节�称 '%s'"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个�值"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
-msgstr "写入新的�置文件 %s 失败"
+msgstr "无法写入新的�置文件 %s"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "�能�定�置文件 %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "打开 %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "无效模�：%s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "无效的�置文件 %s"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "�能 mmap '%s'%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "对 %s 调用 chmod 失败"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "�能写入�置文件 %s"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能设置 '%s' 为 '%s'"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "�能�消设置 '%s'"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "无效的�节�称：%s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s 的�值缺失"
@@ -3057,7 +3055,7 @@ msgstr "已阻止奇怪的路径� '%s'"
 msgid "unable to fork"
 msgstr "无法 fork"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "正在检查连通性"
 
@@ -3071,7 +3069,7 @@ msgstr "写入 rev-list 失败"
 
 #: connected.c:151
 msgid "failed to close rev-list's stdin"
-msgstr "关闭 rev-list 的标准输入失败"
+msgstr "无法关闭 rev-list 的标准输入"
 
 #: convert.c:183
 #, c-format
@@ -3353,18 +3351,18 @@ msgid ""
 msgstr "�是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
 
 #  译者：注����导空格
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注����导空格
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �数 '%s'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3372,7 +3370,7 @@ msgstr ""
 "移动的颜色设置必须是 'no'�'default'�'blocks'�'zebra'�'dimmed-zebra' 或 "
 "'plain'"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3381,18 +3379,18 @@ msgstr ""
 "未知的 color-moved-ws 模� '%s'，�能的�值有 'ignore-space-change'�'ignore-"
 "space-at-eol'�'ignore-all-space'�'allow-indentation-change'"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr "color-moved-ws：allow-indentation-change �能与其它空白字符模�共用"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�置�� 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3401,46 +3399,48 @@ msgstr ""
 "�现�置�� 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，�止在 %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'�'%s'�'%s' 和 '%s' �能�时使用"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G�-S 和 --find-object 是互斥的"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "选项 '%s'�'%s' 和 '%s' �能�时使用"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "选项 '%1$s'�'%2$s' �能�时使用，与 '%4$s' 一起使用 '%3$s'"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr "--pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "选项 '%1$s'�'%2$s' �能�时使用，与 '%4$s' 和 '%5$s' 一起使用 '%3$s'"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确�求�跟一个路径规格"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "无效的 --stat 值：%s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s 期望一个数字值"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3449,200 +3449,200 @@ msgstr ""
 "无法解� --dirstat/-X 选项的�数：\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的�更类 '%1$c'"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之�未知的值"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "�能解� '%s'"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格�"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一个字符，得到 '%s'"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "�的 --color-moved �数：%s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的无效模� '%s' "
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm 选项有 \"myers\"�\"minimal\"�\"patience\" 和 \"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的�数无效"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "选项 -I 的正则表达�无效：'%s'"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "无法解� --submodule 选项的�数：'%s'"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "�的 --word-diff �数：%s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "差异输出格�化选项"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "生�补�"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "�显示差异输出"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "生�� <n> 行上下文的差异"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "生�原始格�的差异"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' �义"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' �义"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "机器�好的 --stat"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "�输出 --stat 的最�一行"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<�数1,�数2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "输出�个�目录相对�更的分布"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative �义"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的�义�"
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果�更中引入冲�定界符或空白错误，给出警告"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精简摘�，例如创建��命�和模��更"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "�显示�更文件的文件�"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "�显示�更文件的文件�和状�"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<宽度>[,<文件�宽度>[,<次数>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "生�差异统计（diffstat）"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<宽度>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "使用给定的长度生�差异统计"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "使用给定的文件�长度生�差异统计"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "使用给定的图形长度生�差异统计"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<次数>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "生�有�行数的差异统计"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "生�差异统计的简�摘�"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "输出一个�以应用的二进制差异"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行显示完整的��对象�称"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "显示带颜色的差异"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<类型>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "对于差异中的上下文�旧的和新的行，加亮显示错误的空白字符"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3650,311 +3650,311 @@ msgstr ""
 "在 --raw 或者 --numstat 中，�对路径字符转�并使用 NUL 字符�为输出字段的分隔"
 "符"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<�缀>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "显示给定的��缀�代 \"a/\""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "显示给定的目标�缀�代 \"b/\""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "输出的�一行附加�缀"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "�显示任何�和目标�缀"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "显示指定行数的差异�间的上下文"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<字符>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一个字符�代 '+' �表示新的一行"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一个字符�代 '-' �表示旧的一行"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一个字符�代 ' ' �表示一行上下文"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "差异�命�选项"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "将完全�写的�更打破为�对的删除和创建"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "检测�命�"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "�略删除�作的差异输出"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "检测拷�"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的文件�为�现拷�的�"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "�用�命�探测"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "使用空的数�对象�为�命�的�"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "继续列出文件�命�以外的历�记录"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果�命�/拷�目标超过给定的�制，�止�命�/拷�检测"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "差异算法选项"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "生�尽�能�的差异"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "行比较时忽略空白字符"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字符的�更"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字符�更"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的回车符（CR）"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的�更"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<正则>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "忽略所有行都和正则表达�匹�的�更"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "���转�差异边界以便阅读"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 算法生�差异"
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 算法生�差异"
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<算法>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "选择一个差异算法"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<文本>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 算法生�差异"
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<模�>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "显示��差异，使用 <模�> 分隔�更的��"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "使用 <正则表达�> 确定何为一个�"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "移动的代�行用��方��色"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字符"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "其它差异选项"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "当从�目录�行，排除目录之外的�更并显示相对路径"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "把所有文件当�文本处�"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "交�两个输入，�转差异"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差异时退出�为 1，�则为 0"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "�用本程�的所有输出"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "�许执行一个外置的差异助手"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr "当比较二进制文件时，�行外部的文本转�过滤器"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<何时>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生�差异时，忽略�模组的更改"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<格�>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "指定�模组的差异如何显示"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "��索引中 'git add -N' �目"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "将索引中 'git add -N' �目当�真实的"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<字符串>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "查找改�了指定字符串出现次数的差异"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "查找改�指定正则匹�出现次数的差异"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "显示使用 -S 或 -G 的�更集的所有�更"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "将 -S 的 <string> 当�扩展的 POSIX 正则表达�"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "控制输出中的文件显示顺�"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<路径>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "先显示指定路径的�更"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "跳过指定路径的输出"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<对象 ID>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "查找改�指定对象出现次数的差异"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "通过差异类型选择文件"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<文件>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "输出到一个指定的文件"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr "由于文件太多，跳过详尽的�命�检查。"
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr "由于文件太多，�在修改的路径中找到了拷�。"
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3963,7 +3963,7 @@ msgstr "您å�¯èƒ½æƒ³è¦�å°†å�˜é‡� %s 设置为至少 %d 并å†�次执行此命令ã
 #: diffcore-order.c:24
 #, c-format
 msgid "failed to read orderfile '%s'"
-msgstr "读�排�文件 '%s' 失败"
+msgstr "无法读�排�文件 '%s'"
 
 #: diffcore-rename.c:1564
 msgid "Performing inexact rename detection"
@@ -3994,29 +3994,29 @@ msgstr "未识别的��模�：'%s'"
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的 sparse-checkout 文件�能有问题：��的模� '%s'"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
-msgstr "�止 cone 模�匹�"
+msgstr "�用锥形模�匹�"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "�能将 %s 用作排除文件"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "�能打开目录 '%s'"
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核�称和信�"
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr "缓存未跟踪文件在本系统或�置中被�用"
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -4024,36 +4024,36 @@ msgstr ""
 "无法猜到目录�。\n"
 "请在命令行指定一个目录"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "仓库 %s 中的索引文件��"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能为 %s 创建目录"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能从 '%s' �移 git 目录到 '%s'"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "�示：等待您的编辑器关闭文件...%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "过滤内容"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "�能对文件 '%s' 调用 stat"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "错误的 git �字空间路径 \"%s\""
@@ -4063,278 +4063,274 @@ msgstr "错误的 git �字空间路径 \"%s\""
 msgid "too many args to run %s"
 msgstr "执行 %s 的�数太多"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在浅克隆列表之�期望一个 flush 包"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，�得到 flush 包"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，�得到 '%s'"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "无法写到远程"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需� multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信�：%s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信�：%s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未�现 shallow：%s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效�交 %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完�"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已�有 %s（%s）"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "�议错误：�的包头"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack：无效的 index-pack 输出"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "�务器版本 %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "�务器支� %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "�务器�支�浅客户端"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "�务器�支� --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "�务器�支� --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "�务器�支� --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "�务器�支�这个仓库的对象格�"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "没有共�的�交"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "�仓库是浅克隆，拒�克隆。"
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获�失败。"
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "�匹�的算法：客户端 %s，�务端 %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "�务器�支�算法 '%s'"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "�务器�支�浅克隆请求"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "�务器支� filter"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "无法将请求写到远程"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "读�节标题 '%s' 出错"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "预期 '%s'，得到 '%s'"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "�外的确认行：'%s'"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "处� ack 出错：%d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "预期在 'ready' 之��� packfile"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在没有 'ready' �应该��其它�节"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "处�浅克隆信�出错：%d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "预期 wanted-ref，得到 '%s'"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "�外的 wanted-ref：'%s'"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "处��获�的引用出错：%d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack：预期�应结�包"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "没有匹�的远程分支"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "远程没有��所有必需的对象"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "�自远程的�外的 'ready'"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "�务器��许请求未公开的对象 %s"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "�能创建临时文件"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离�签�写入 '%s'"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
 msgstr "ssh 签�验�需� gpg.ssh.allowedSignersFile 被设置且存在"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4342,61 +4338,61 @@ msgstr ""
 "ssh 签�验�需� ssh-keygen -Y find-principals/verify \n"
 "（openssh 8.2p1+ 版本�用）"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "设置了 ssh 签��销文件但无法找到：%s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "�的/�兼容的签� '%s‘"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "无法得到密钥 '%s' 的 ssh 指纹"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr "需��置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand �功，但没有返回密钥：%s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
-msgstr "gpg 数�签�失败"
+msgstr "gpg 无法为数�签�"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "ssh 签�需�设置 user.signingkey"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "无法将 ssh 签�密钥写入 '%s'"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "无法将 ssh 签�密钥缓冲区写入 '%s'"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
 msgstr "ssh 签�需� ssh-keygen -Y sign （openssh 8.2p1+ 版本�用）"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "无法从 '%s' 读入 ssh 签�数�"
@@ -4406,7 +4402,7 @@ msgstr "无法从 '%s' 读入 ssh 签�数�"
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4414,18 +4410,18 @@ msgstr ""
 "给定的模�包� NULL 字符（通过 -f <文件> �数）。�有 PCRE v2 下的 -P 支�此"
 "功能"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读� %s"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
-msgstr "对 '%s' 调用 stat 失败"
+msgstr "无法对 '%s' 调用 stat"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读��完整"
@@ -4546,8 +4542,8 @@ msgstr "�定您想�的是 '%s' 并继续。"
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "�而代之�行 '%s' ？ (y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "�而代之�行 '%s' [y/N]？"
 
 #: help.c:654
 #, c-format
@@ -4767,7 +4763,7 @@ msgstr "在 ls-refs �数�应该有一个 flush 包"
 msgid "quoted CRLF detected"
 msgstr "检测到被引用的 CRLF"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "'%2$s' 的错误动作 '%1$s'"
@@ -4988,7 +4984,7 @@ msgstr "�模组"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲�（%s）：�并冲�于 %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4997,7 +4993,7 @@ msgstr ""
 "冲�（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
 "在树中被�留。"
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5007,7 +5003,7 @@ msgstr "注�：%s �是最新的，并且与�检出的版本冲�。旧副
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "无法收集树 %s�%s�%s 的�并信�"
@@ -5021,7 +5017,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "已�是最新的。"
 
@@ -5042,7 +5038,7 @@ msgstr "add_cacheinfo 无法刷新路径 '%s'，�并终止。"
 #: merge-recursive.c:881
 #, c-format
 msgid "failed to create path '%s'%s"
-msgstr "创建路径 '%s'%s 失败"
+msgstr "无法创建路径 '%s'%s"
 
 #: merge-recursive.c:892
 #, c-format
@@ -5071,12 +5067,12 @@ msgstr "%s '%s' 应为数�对象"
 #: merge-recursive.c:986
 #, c-format
 msgid "failed to open '%s': %s"
-msgstr "打开 '%s' 失败：%s"
+msgstr "无法打开 '%s'：%s"
 
 #: merge-recursive.c:997
 #, c-format
 msgid "failed to symlink '%s': %s"
-msgstr "创建符�链接 '%s' 失败：%s"
+msgstr "无法创建符�链接 '%s'：%s"
 
 #: merge-recursive.c:1002
 #, c-format
@@ -5296,17 +5292,17 @@ msgstr "�并未返回�交"
 msgid "Could not parse object '%s'"
 msgstr "�能解�对象 '%s'"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "�能写入索引。"
 
 #: merge.c:41
 msgid "failed to read the cache"
-msgstr "读�缓存失败"
+msgstr "无法读�缓存"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
@@ -5315,211 +5311,211 @@ msgstr "无法写新的索引文件"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "多包索引的对象ID扇出表大�错误"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "多包索引文件 %s 太�"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "多包索引签� 0x%08x 和签� 0x%08x �匹�"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index 版本 %d �能被识别"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "多包索引哈希版本 %u 和版本 %u �匹�"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "多包索引缺少必需的包��"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "多包索引缺少必需的对象 ID 扇出�"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "多包索引缺少必需的对象 ID 查询�"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "多包索引缺少必需的对象�移�"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "多包索引包�无�：'%s' 在 '%s' 之�"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "错的 pack-int-id：%u（共有 %u 个包）"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "多包索引存储一个64��移，但是 off_t 太�"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
-msgstr "添加包文件 '%s' 失败"
+msgstr "无法添加包文件 '%s'"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
-msgstr "打开包索引 '%s' 失败"
+msgstr "无法打开包索引 '%s'"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
-msgstr "在包文件中定�对象 %d 失败"
+msgstr "无法在包文件中定�对象 %d"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "无法存储��索引文件"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
-msgstr "�能解�行： %s"
+msgstr "�能解�行：%s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "格�错误的行：%s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr "忽略已存在的多包索引，校验��匹�"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "�能载入包"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "�能打开 %s 的索引"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "添加包文件到多包索引"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "未知的首选包：'%s'"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "�能选择没有对象的首选包 %s"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "没有看到�丢弃的包文件 %s"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "首选包 '%s' 已过期"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "没有�索引的包文件。"
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "无法写入多包�图"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "无法写入多包索引"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
-msgstr "删除 %s 失败"
+msgstr "无法删除 %s"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
-msgstr "清��于 %s 的多包索引失败"
+msgstr "无法清��于 %s 的多包索引"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "多包索引文件存在，但无法解�"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "�正确的校验�"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "正在查找引用的包文件"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "对象 ID 扇出无�：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx �包� oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "校验多包索引中的 OID 顺�"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "对象 ID 查询无�：oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "通过包文件为对象排�"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "校验对象�移"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "为 oid[%d] = %s 加载包�目失败"
+msgstr "无法为 oid[%d] = %s 加载包�目"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
-msgstr "为包文件 %s 加载包索引失败"
+msgstr "无法为包文件 %s 加载包索引"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s 错误的对象�移：%<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "正在对引用对象计数"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "正在查找和删除未引用的包文件"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "�能开始 pack-objects"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "�能结� pack-objects"
 
@@ -5577,257 +5573,257 @@ msgstr "拒�� %s（在 refs/notes/ 之外）写入注解"
 msgid "Bad %s value: '%s'"
 msgstr "�的 %s 值：'%s'"
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "对象目录 %s �存在，检查 .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "无法规范化备用对象路径：%s"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s：忽略备用对象库，嵌套太深"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "无法规范化对象目录: %s"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "无法 fdopen 替��文件"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "无法读�替代文件"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "无法将新的替代文件移动到�"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' �存在"
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "�考仓库 '%s' �是一个本地仓库。"
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "�考仓库 '%s' 是一个浅克隆"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "�考仓库 '%s' 已被移�"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "无法找到和 %s 匹�的对象目录"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "解�备用引用时无效的行：%s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "�试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap 失败%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "对象文件 %s 为空"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "��的�散对象 '%s'"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "�散对象 '%s' ��有垃圾数�"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "无法解� %s 头部"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "无效的对象类型"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "无法解开 %s 头部"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "%s 的头部太长，超出了 %d 字节"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
-msgstr "读�对象 %s 失败"
+msgstr "无法读�对象 %s"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "找�到 %2$s 的替代 %1$s"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "�散对象 %s（�存在 %s）已��"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "打包对象 %s（�存在 %s）已��"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "无法写文件 %s"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "无法为 '%s' 设置��"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "文件写错误"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "关闭�散对象文件时出错"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "���足，无法在仓库对象库 %s 中添加对象"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "无法创建临时文件"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "�能写�散对象文件"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "�能压缩新对象 %s（%d）"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的�稳定对象�数��糊涂了"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上调用 utime() 失败"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "�能读�对象 %s"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "��的�交"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "��的标签"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "索引 %s 时读�错误"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "索引 %s 时读入�完整"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
-msgstr "%s：�入数�库失败"
+msgstr "%s：无法�入数�库"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s：�支�的文件类型"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s �是一个有效的对象"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s �是一个有效的 '%s' 对象"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "�能打开 %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s 的哈希值�匹�（预期 %s）"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "�能 mmap %s"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "无法解压缩 %s 的头部"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "无法解� %s 的头部"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "无法解压缩 %s 的内容"
@@ -5953,25 +5949,25 @@ msgstr "�能解�对象：%s"
 msgid "hash mismatch %s"
 msgstr "哈希值与 %s �匹�"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "多包�图缺少必需的��索引"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index：无法打开包"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "无法得到 %s 的大�"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "在包 %2$s �移 %3$<PRIuMAX> 中无法找到 %1$s"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "无法得到 %s 的�盘使用�"
@@ -6020,45 +6016,50 @@ msgstr "无法设置 %s 为�读"
 msgid "could not write '%s' promisor file"
 msgstr "无法写入 '%s' 承诺者文件"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在包文件结�之�（��的 .idx？）"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "包文件 %s �能被映射%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
 
-#: packfile.c:1927
+#: packfile.c:1928
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "�移�越过了 %s 的包索引的结尾（被截断的索引？）"
 
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "选项 `%s' 期望一个数字值"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "格�错误的到期时间：'%s'"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "选项 `%s' 期望 \"always\"�\"auto\" 或 \"never\""
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "格�错误的对象� '%s'"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -6094,36 +6095,36 @@ msgstr "%s 期望一个�负整数和一个�选的 k/m/g �缀"
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "有歧义的选项：%s（�以是 --%s%s 或 --%s%s）"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "您的��是 `--%s`（有两个短线）？"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "--%s 的别�"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知选项 `%s'"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "未知开关 `%c'"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "字符串中未知的� ascii 字符选项：`%s'"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -6131,7 +6132,7 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
@@ -6155,18 +6156,18 @@ msgstr "  或：%s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-æ•°å­—"
 
@@ -6292,17 +6293,17 @@ msgstr "读�错误"
 msgid "the remote end hung up unexpectedly"
 msgstr "远端�外挂断了"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "�议错误：错误的行长度字符串：%.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "�议错误：错误的行长度 %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
@@ -6353,7 +6354,7 @@ msgstr "�能�动 `log`"
 msgid "could not read `log` output"
 msgstr "�能读� `log` 的输出"
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "�能解��交 '%s'"
@@ -6372,61 +6373,57 @@ msgstr "无法解� git 头 '%.*s'"
 
 #: range-diff.c:304
 msgid "failed to generate diff"
-msgstr "生� diff 失败"
-
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
+msgstr "无法生� diff"
 
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "�能解� '%s' 的日志"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "将�会添加文件别� '%s'（'%s' 已�存在于索引中）"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "�能在对象数�库中创建空的数�对象"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s：�能添加常规文件�符�链接或 git 目录"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' 没有检出一个�交"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "无法索引文件 '%s'"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "无法在索引中添加 '%s'"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "无法对 %s 执行 stat"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' 看起�既是文件�是目录"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "刷新索引"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6435,7 +6432,7 @@ msgstr ""
 "设置了 index.version，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6444,144 +6441,144 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "�的签� 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "�的索引版本 %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "�的索引文件 sha1 签�"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "索引使用�被支�的 %.4s 扩展"
 
 # 	
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "忽略 %.4s 扩展"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "未知的索引�目格� 0x%08x"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "索引中�近路径 '%s' 有错误的�称字段"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "索引中有未排�的暂存�目"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "�并文件 '%s' 有多个暂存�目"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' 的未排�暂存�目"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "索引文件��"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "无法创建 load_cache_entries 线程：%s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "无法加入 load_cache_entries 线程：%s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s：打开索引文件失败"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s：�能对打开的索引执行 stat �作"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s：索引文件比预期的�"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s：无法映射索引文件%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "无法创建 load_index_extensions 线程：%s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "无法加入 load_index_extensions 线程：%s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "无法刷新共享索引 '%s'"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "��的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "�能关闭 '%s'"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "无法转�为稀�索引"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能打开 git 目录：%s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "�能修� '%s' 的���"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s：�能�到暂存区 #0"
@@ -6694,8 +6691,8 @@ msgstr ""
 "然而，如果您删除全部内容，�基�作将会终止。\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6734,9 +6731,9 @@ msgstr ""
 #: rebase.c:29
 #, c-format
 msgid "%s: 'preserve' superseded by 'merges'"
-msgstr "%s： 'preserve' 被 'merges' �代"
+msgstr "%s：'preserve' 被 'merges' �代"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "丢失"
 
@@ -6775,7 +6772,8 @@ msgstr "期望整数值 refname:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整数值 refname:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "未能识别的 %%(%s) �数：%s"
@@ -6785,11 +6783,6 @@ msgstr "未能识别的 %%(%s) �数：%s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) �带�数"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "未能识别的 %%(objectsize) �数：%s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6800,11 +6793,6 @@ msgstr "%%(deltabase) �带�数"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) �带�数"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "未能识别的 %%(subject) �数：%s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6820,26 +6808,11 @@ msgstr "未知的 %%(trailers) �数：%s"
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一个正数 contents:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能识别的 %%(contents) �数：%s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "未能识别的 %%(raw) �数：%s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "未能识别 %%(%2$s) 中的�数 '%1$s'"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6860,21 +6833,11 @@ msgstr "未能识别的�置：%s"
 msgid "unrecognized width:%s"
 msgstr "未能识别的宽度：%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "未能识别的 %%(align) �数：%s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需�一个正数的宽度"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "未能识别的 %%(if) �数：%s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6896,15 +6859,10 @@ msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "�是 git 仓库，但是字段 '%.*s' 需�访问对象数�"
 
-#: ref-filter.c:844
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(if) 元素而没有 %%(then) 元素"
-
-#: ref-filter.c:910
-#, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(then) 元素而没有 %%(if) 元素"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "格�：在没有 %%(%2$s) 元素的情况下使用了 %%(%1$s) 元素"
 
 #: ref-filter.c:912
 #, c-format
@@ -6916,16 +6874,6 @@ msgstr "格�：%%(then) 元素用了多次"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格�：%%(then) 元素用在了 %%(else) 之�"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(else) 元素而没有 %%(if) 元素"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(else) 元素而没有 %%(then) 元素"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -7000,22 +6948,22 @@ msgstr "格�错误的对象 '%s'"
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误�称 %s 的引用"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略��的引用 %s"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "格�错误的对象� %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "选项 `%s' 必须指�一个�交"
@@ -7059,71 +7007,71 @@ msgstr "无法获� `%s`"
 msgid "invalid branch name: %s = %s"
 msgstr "无效的分支�：%s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "忽略悬空符�引用 %s"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日志在 %s 之�有缺�"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日志�外终止于 %s "
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日志为空"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒�更新有错误�称 '%s' 的引用"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "对引用 '%s' 执行 update_ref 失败：%s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "��许对引用 '%s' 多次更新"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔离环境中�止更新引用"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "引用更新被钩�中止"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，无法创建 '%s'"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "无法�时处� '%s' 和 '%s'"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "无法删除引用 %s"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
@@ -7133,50 +7081,50 @@ msgstr "无法删除引用：%s"
 msgid "invalid refspec '%s'"
 msgstr "无效的引用规格：'%s'"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "�置的远程短�称�能以 '/' 开始：%s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "�供了一个以上的 receivepack，使用第一个"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "�供了一个以上的 uploadpack，使用第一个"
 
-#: remote.c:590
+#: remote.c:699
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�能�时获� %s 和 %s 至 %s"
 
-#: remote.c:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而� %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s �时跟踪 %s 和 %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "模�的键 '%s' 没有 '*'"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "模�的值 '%s' 没有 '*'"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "�引用规格 %s 没有匹�"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "�引用规格 %s 匹�超过一个"
@@ -7185,7 +7133,7 @@ msgstr "�引用规格 %s 匹�超过一个"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7207,7 +7155,7 @@ msgstr ""
 "\n"
 "都�行，所以我们已放弃。您必须给出完整的引用。"
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7217,7 +7165,7 @@ msgstr ""
 "引用规格的 <src> 是一个�交对象。您是想创建一个新的分支而�\n"
 "'%s:refs/heads/%s' 推�么？"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7227,7 +7175,7 @@ msgstr ""
 "引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而�\n"
 "'%s:refs/tags/%s' 推�么？"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7237,7 +7185,7 @@ msgstr ""
 "引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而�\n"
 "'%s:refs/tags/%s' 推�么？"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7247,114 +7195,114 @@ msgstr ""
 "引用规格的 <src> 是一个数�对象。您是想为这个数�对象创建标签而�\n"
 "'%s:refs/tags/%s' 推�么？"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s 无法被解�为分支"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "无法删除 '%s'：远程引用�存在"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "目标引用规格 %s 匹�超过一个"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "目标引用 %s 接收超过一个�"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指�一个分支"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1757
+#: remote.c:1867
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推�目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置�推�的远程�务器"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "� '%s' 推�引用规格未包� '%s'"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推�无目标（push.default 是 'nothing'）"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解� 'simple' 推�至一个�独的目标"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "无法找到远程引用 %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* 在本地忽略�笑的引用 '%s'"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已��存在。\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" �修�）\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "您的分支和 '%s' 指���的�交。\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  （使用 \"%s\" 查看详情）\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支领先 '%s' 共 %d 个�交。\n"
 msgstr[1] "您的分支领先 '%s' 共 %d 个�交。\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" ��布您的本地�交）\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7363,11 +7311,11 @@ msgstr[0] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 msgstr[1] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 
 #  译者：注����导空格
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" �更新您的本地分支）\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7383,11 +7331,11 @@ msgstr[1] ""
 "并且分别有 %d 和 %d 处��的�交。\n"
 
 #  译者：注����导空格
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" ��并远程分支）\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "无法解�期望的对象� '%s'"
@@ -7420,10 +7368,10 @@ msgstr "无法写入 rerere 记录"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "写入 '%s' (%s) 时出错"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
-msgstr "刷新 '%s' 失败"
+msgstr "无法刷新 '%s'"
 
 #: rerere.c:487 rerere.c:1023
 #, c-format
@@ -7465,8 +7413,8 @@ msgstr "�能删除 stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "为 '%s' 记录 preimage"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "�能创建目录 '%s'"
@@ -7474,7 +7422,7 @@ msgstr "�能创建目录 '%s'"
 #: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
-msgstr "更新 '%s' 中的冲�状�失败"
+msgstr "无法更新 '%s' 中的冲�状�"
 
 #: rerere.c:1052 rerere.c:1059
 #, c-format
@@ -7504,37 +7452,29 @@ msgstr "�能打开 rr-cache 目录"
 msgid "could not determine HEAD revision"
 msgstr "�能确定 HEAD 版本"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "无法找到 %s 指�的树"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input 和 --no-walk �兼容"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "��支� --unpacked=<packfile>"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk 和 --unsorted-input �兼容"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "您的当�分支好�被��"
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当�分支 '%s' 尚无任何�交"
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚�支� -p 和 -s 之外的差异格�"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "�能创建 async 线程：%s"
@@ -7555,7 +7495,7 @@ msgstr "远程解包失败：%s"
 
 #: send-pack.c:378
 msgid "failed to sign the push certificate"
-msgstr "为推��书签�失败"
+msgstr "无法为推��书签�"
 
 #: send-pack.c:435
 msgid "send-pack: unable to fork off fetch subprocess"
@@ -7597,8 +7537,8 @@ msgstr "无效的�交信�清�模� '%s'"
 msgid "could not delete '%s'"
 msgstr "无法删除 '%s'"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "无法删除 '%s'"
@@ -7656,13 +7596,13 @@ msgstr ""
 "\"git revert --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
 "执行 \"git revert\" 之�的状�，执行 \"git revert --abort\"。"
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能�定 '%s'"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "�能写入 '%s'"
@@ -7672,12 +7612,18 @@ msgstr "�能写入 '%s'"
 msgid "could not write eol to '%s'"
 msgstr "�能将�行符写入 '%s'"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "无法完� '%s'"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "�能读� '%s'"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7692,7 +7638,7 @@ msgstr "�交您的修改或贮���继续。"
 msgid "%s: fast-forward"
 msgstr "%s：快进"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清�模� %s"
@@ -7723,8 +7669,8 @@ msgstr "在 '%.*s' 中没有 key"
 msgid "unable to dequote value of '%s'"
 msgstr "无法为 '%s' 的值去引�"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读�"
@@ -7787,11 +7733,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 钩�失败"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7815,7 +7761,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7838,349 +7784,350 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的�交"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "�能解�新创建的�交"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "创建�交�，�能解� HEAD"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr "（根�交）"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s �是一个�交�"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "�能解��交作者"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入树对象"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�能从 '%s' 读��交说明"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "无效的作者身份 '%s'"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "��的作者：缺失日期信�"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
-msgstr "写�交对象失败"
+msgstr "无法写�交对象"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "�能更新 %s"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "�能解��交 %s"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "�能解�父�交 %s"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "这是第一个�交说明："
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是�交说明 #%d："
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "第一个�交说明将被跳过："
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "�交说明 #%d 将被跳过："
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个�交的组�。"
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "�能写 '%s'"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "需�一个 HEAD �修�"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "�能读� HEAD 的�交说明"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能读� %s 的�交说明"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完��并。"
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "�能修�根�交"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一个�并�交但未�供 -m 选项。"
 
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 没有第 %d 个父�交"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能将 '%s' �命�为 '%s'"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能还原 %s... %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能应用 %s... %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "丢弃 %s %s -- 补�内容已在上游\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读�索引"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s �接��数：'%s'"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的�数"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "无法解� '%s'"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父�交的情况下�能 '%s'"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "�能读� '%s'。"
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "正在�消一个进行中的拣选"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "正在�消一个进行中的还原"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' �修改。"
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清�：'%s'"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "没有解��交。"
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在回退中执行拣选。"
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在拣选中执行回退。"
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "��用的 squash-onto"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格�错误的选项清�：'%s'"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "一个还原�作已在进行"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "�试 \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "拣选�作已在进行"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "�试 \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能创建�列目录 '%s'"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "�能�定 HEAD"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原�作并未进行"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能从尚未建立的分支终止"
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "�能打开 '%s'"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能读� '%s'：%s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "�外的文件结�"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�存拣选�交�的 HEAD 文件 '%s' ��"
 
-#: sequencer.c:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移动了 HEAD。未能回退，检查您的 HEAD�"
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "没有正在进行的还原"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "没有正在进行的拣选"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "无法跳过这个�交"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "没有�跳过的"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8189,16 +8136,16 @@ msgstr ""
 "您已��交了么？\n"
 "试试 \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "无法拷� '%s' 至 '%s'"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8217,27 +8164,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "�能应用 %s... %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�能�并 %.*s"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能拷� '%s' 至 '%s'"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "正在执行：%s\n"
 
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8252,11 +8199,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8273,90 +8220,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "�法的标签�称：'%.*s'"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "写伪根�交"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "写入 squash-onto"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "无法解� '%s'"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "没有当�版本�能�并"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "无法解� '%.*s'"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "无�用�并：'%.*s'"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "章鱼�并�能在一个新的根�交上执行"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�能获� '%s' 的�交说明"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "甚至�能�试�并 '%.*s'"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "�并：无法写入新索引文件"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "无法自动贮�"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "�外的贮��应：'%s'"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "�能为 '%s' 创建目录"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "创建了自动贮�：%s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "无法硬性�置（reset --hard）"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已应用自动贮�。\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "�能存储 %s"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8367,29 +8314,29 @@ msgstr ""
 "您的修改在贮�区中很安全。\n"
 "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "应用自动贮�导致冲�。"
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "自动贮�已�存在；正在创建一个新的贮��目。"
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "�能分离头指针"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "�止在 HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "�止在 %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8409,58 +8356,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "正在�基（%d/%d）%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "�能读� orig-head"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "�能读� 'onto'"
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 为 %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "�功�基并更新 %s。\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�基：您有未暂存的�更。"
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "�能修补�存在的�交"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8469,68 +8416,68 @@ msgstr ""
 "\n"
 "您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "�能写入文件：'%s'"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能拣选一个%s"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "�能作为�始�交回退"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "跳过了先�已应用的�交 %s"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr "使用 --reapply-cherry-picks �包括跳过的�交"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能处�的选项"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script：准备版本时错误"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "无事��"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "无法跳过�必�的拣选"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "脚本已��新编排。"
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "'%s' 在�于 '%s' 的仓库之外"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8539,7 +8486,7 @@ msgstr ""
 "%s：工作区中无此路径。\n"
 "使用命令 'git <命令> -- <路径>...' �指定本地�存在的路径。"
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8550,12 +8497,12 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "选项 '%s' 必须在其他�选项�数之�"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8566,100 +8513,100 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr "无法使用无效�置�创建工作区"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "该�作必须在一个工作区中�行"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，�得到 %d"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "�现未知的仓库扩展："
 msgstr[1] "�现未知的仓库扩展："
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "仓库的版本是 0，但是�现仅用于 v1 的扩展："
 msgstr[1] "仓库的版本是 0，但是�现仅用于 v1 的扩展："
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "文件太大，无法作为 .git 文件：'%s'"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "读� %s 出错"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "无效的 gitfile 格�：%s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中没有路径：%s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "�是 git 仓库：%s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "�是 git 仓库：'%s'"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "�能切�目录到 '%s'"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
-msgstr "获� '%*s%s%s' 状�（stat）失败"
+msgstr "无法获� '%*s%s%s' 状�（stat）"
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "�能读�当�工作目录"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "�是 git 仓库（或者任何父目录）：%s"
 
-#: setup.c:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8668,7 +8615,7 @@ msgstr ""
 "�是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
 "�止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8677,15 +8624,15 @@ msgstr ""
 "�数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
 "文件属主必须始终拥有读写��。"
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "fork 失败"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid 失败"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "索引�目是一个目录，但�是稀�的 (%08x)"
@@ -8742,13 +8689,13 @@ msgid_plural "%u bytes/s"
 msgstr[0] "%u 字节/秒"
 msgstr[1] "%u 字节/秒"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "�能编辑 '%s'"
@@ -8834,7 +8781,7 @@ msgstr "无法在�模组 %s 中执行 'git rev-list <�交> --not --remotes -
 msgid "process for submodule '%s' failed"
 msgstr "处��模组 '%s' 失败"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解�为有效引用。"
 
@@ -9077,7 +9024,7 @@ msgstr "�议�支�设置远程�务路径"
 msgid "invalid remote service path"
 msgstr "无效的远程�务路径"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "�议�支�该�作"
 
@@ -9296,7 +9243,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "正在终止。"
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "�能推�全部需�的�模组"
 
@@ -9316,7 +9263,7 @@ msgstr "树对象�目中空的文件�"
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9325,7 +9272,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s请在切�分支��交或贮�您的修改。"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9334,7 +9281,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9343,7 +9290,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s请在�并��交或贮�您的修改。"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9352,7 +9299,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9361,7 +9308,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s请在 %s 之��交或贮�您的修改。"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9370,7 +9317,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9379,7 +9326,16 @@ msgstr ""
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒�删除当�工作目录：\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9388,7 +9344,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s请在切�分支之�移动或删除。"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9397,7 +9353,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9406,7 +9362,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s请在�并�移动或删除。"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9415,7 +9371,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9424,7 +9380,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9433,7 +9389,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9443,7 +9399,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s请在切�分支�移动或删除。"
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9453,7 +9409,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9462,7 +9418,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s请在�并�移动或删除。"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9471,7 +9427,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9480,7 +9436,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9489,12 +9445,12 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "�目 '%s' 和 '%s' ��。无法�并。"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9503,7 +9459,7 @@ msgstr ""
 "无法更新�模组：\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9513,7 +9469,7 @@ msgstr ""
 "尽管存在稀�检出模�，以下路径�是最新，因而�留：\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9522,7 +9478,7 @@ msgstr ""
 "尽管存在稀�检出模�，以下路径处于未�并状�，因而�留：\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9532,23 +9488,23 @@ msgstr ""
 "尽管存在稀�检出模�，以下路径已�存在，因而未更新：\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "正在终止\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr "在修�上述路径之�，您�能�执行 `git sparse-checkout reapply`。\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "正在更新文件"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9557,16 +9513,16 @@ msgstr ""
 "以下路径�生碰撞（如：在�区分大�写的文件系统上的区分大�写的路径），\n"
 "并且碰撞组中�有一个文件存在工作区中：\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "正在更新索引标志"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "工作树和未跟踪�交具有���目：%s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "在 fetch �数之�应该有一个 flush 包"
 
@@ -9603,99 +9559,99 @@ msgstr "无效的 '..' 路径片段"
 msgid "Fetching objects"
 msgstr "正在获�对象"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
-msgstr "读� '%s' 失败"
+msgstr "无法读� '%s'"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作区的 '%s' �是仓库目录"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "文件 '%s' �包�工作区的�对路径"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' �存在"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' �是一个 .git 文件，错误� %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 没有指回到 '%s'"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "�是一个目录"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git �是一个文件"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git 文件��"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git 文件�正确"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "�是一个有效的路径"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "无法定�仓库，.git �是一个文件"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "无法定�仓库，.git 文件没有指�一个仓库"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "无法定�仓库，.git 文件��"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "gitdir ��读"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "gitdir �正确"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "�是一个有效的目录"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "gitdir 文件�存在"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "无法读� gitdir 文件（%s）"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "读�过短（期望 %<PRIuMAX> 字节，读� %<PRIuMAX>）"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "无效的 gitdir 文件"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir 文件指�一个�存在的�置"
 
@@ -9758,11 +9714,11 @@ msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "��交的�更："
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备�交的�更："
 
@@ -9868,22 +9824,22 @@ msgstr "修改的内容, "
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, 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:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "�模组已修改但尚未更新："
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模组�更："
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9891,7 +9847,7 @@ msgstr ""
 "��改动或删除上�的一行。\n"
 "其下所有内容都将被忽略。"
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9902,77 +9858,83 @@ msgstr ""
 "花了 %.2f 秒�计算出分支的领先/��范围。\n"
 "为��，您�以使用 '--no-ahead-behind'。\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "您有尚未�并的路径。"
 
 #  译者：注����导空格
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲�并�行 \"git commit\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止�并）"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲�已解决但您�处于�并中。"
 
 #  译者：注����导空格
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结��并）"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am �作过程中。"
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "当�的补�为空。"
 
 #  译者：注����导空格
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲�，然��行 \"git am --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr "  （使用 \"git am --allow-empty\" 将这个补�记录为空�交）"
+
+#  译者：注����导空格
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" ��原有分支）"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "最�一�命令已完�（%d �命令被执行）："
 msgstr[1] "最�的命令已完�（%d �命令被执行）："
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多��文件 %s）"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -9980,206 +9942,206 @@ msgstr[0] "接下��执行的命令（剩余 %d �命令）："
 msgstr[1] "接下��执行的命令（剩余 %d �命令）："
 
 #  译者：注����导空格
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" �查看和编辑）"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作。"
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "您在执行�基�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲�，然��行 \"git rebase --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注����导空格
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作时拆分�交。"
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行�基�作时拆分�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录�交干净�，�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作时编辑�交。"
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行�基�作时编辑�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当��交）"
 
 #  译者：注����导空格
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满��执行 \"git rebase --continue\"）"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "拣选�作正在进行中。"
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲�并�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  （执行 \"git cherry-pick --continue\" 以继续）"
 
 #  译者：注����导空格
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  （使用 \"git cherry-pick --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以�消拣选�作）"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "还原�作正在行中。"
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行�转�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲�并执行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  （执行 \"git revert --continue\" 以继续）"
 
 #  译者：注����导空格
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲�已解决：执行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  （使用 \"git revert --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以�消�转�交�作）"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找�作。"
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "您处于一个稀�检出中。"
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "您处于稀�检出状�，包� %d%% 的跟踪文件"
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "�于分支 "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "交互��基�作正在进行中；至 "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "�基�作正在进行中；至 "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "当��在任何分支上。"
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "尚无�交"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10189,112 +10151,112 @@ msgstr ""
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能�高速度，\n"
 "但您需��心��忘了添加新文件（�� 'git help status'）。"
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u �数显示未跟踪的文件）"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入�交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "�交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交为空，但是存在尚未跟踪的文件\n"
 
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件��交（创建/拷�文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件��交\n"
 
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件��交（使用 -u 显示未跟踪的文件）\n"
 
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件��交，干净的工作区\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "尚无�交在 "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "��"
 
 #  译者：注����尾空格
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "�� "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "�能%s：您有未暂存的�更。"
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "�外，您的索引中包�未�交的�更。"
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的�更。"
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "无法�� IPC 命令"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "无法读� IPC �应"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "无法�动 accept_thread '%s'"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "无法�动 '%s' 的 worker[0]"
@@ -10302,7 +10264,7 @@ msgstr "无法�动 '%s' 的 worker[0]"
 #: compat/precompose_utf8.c:58 builtin/clone.c:347
 #, c-format
 msgid "failed to unlink '%s'"
-msgstr "删除 '%s' 失败"
+msgstr "无法删除 '%s'"
 
 #: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
@@ -10331,107 +10293,113 @@ msgstr "删除 '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之�尚未被暂存的�更："
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "�能读�索引"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "�能生�补�"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "编辑补�失败"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "空补�。异常终止。"
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�能应用 '%s'"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根�您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "冗长输出"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "交互�拣选"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "交互�挑选数��"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "编辑当�差异并应用"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "�许添加忽略的文件"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗� -u）�新归一�行符"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "�记录，该路径���添加"
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改�的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相�）"
 
-#: builtin/add.c:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "�添加，�刷新索引"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错�能添加的文件"
 
-#: builtin/add.c:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模�下文件（�使�存在）是�被忽略"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
-msgstr "�许更新稀�检出 cone 以外的�目"
+msgstr "�许更新稀�检出锥以外的�目"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的�执行�"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入�仓库时给予警告"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "`git stash -p` 的�端"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10459,12 +10427,12 @@ msgstr ""
 "\n"
 "�� \"git help submodule\" 获�更多信�。"
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入� git 仓库：%s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10474,51 +10442,27 @@ msgstr ""
 "�行下�的命令�关闭本消�\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 与 --interactive/--patch �兼容"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 与 --interactive/--patch �兼容"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 与 --edit �兼容"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u 选项互斥"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "选项 --ignore-missing �能和 --dry-run �时使用"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "�数 --chmod �值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 与路径表达��数�兼容"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul 需� --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "'%s' 和路径规格�数�能�时使用"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10528,105 +10472,111 @@ msgstr ""
 "�行下�的命令�关闭本消�\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "--empty 的值无效：%s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "�能解�作者脚本"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩�删除"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�法的输入行：'%s'。"
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷�注解到 '%s' 时失败"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解�补� '%s'"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一个 StGIT 补�队列被应用"
 
-#: builtin/am.c:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "无效的时区�移值"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "补�格�探测失败。"
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
-msgstr "创建目录 '%s' 失败"
+msgstr "无法创建目录 '%s'"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
-msgstr "拆分补�失败。"
+msgstr "无法拆分补�。"
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�跳过这一补�，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr "若�把空补�记录为空�交，执行 \"%s --allow-empty\"。"
+
+#: builtin/am.c:1161
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若��原至原始分支并�止补��作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "补�使用 format=flowed 格���，行尾的空格�能会丢失。"
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "补�为空。"
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在�交 %s 中缺失作者行"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引��建一个（三方�并的）基础目录树..."
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10634,24 +10584,24 @@ msgstr ""
 "您是�曾手动编辑过您的补�？\n"
 "无法应用补�到索引中的数�对象上。"
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基础版本上打补��进行三方�并..."
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "无法�并�更。"
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "正应用到一个空历�上"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s �存在。"
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "�交内容为："
 
@@ -10659,39 +10609,57 @@ msgstr "�交内容为："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/�[n]/编辑[e]/查看补�[v]/应用所有[a]："
 
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�索引：�能应用补�（�文件：%s）"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "跳过：%.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "创建空�交：%.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "补�为空。"
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "没有�更 —— 补�已�应用过。"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补�失败于 %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补�"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "没有�更 —— 记录为空�交。"
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10701,7 +10669,7 @@ msgstr ""
 "如果没有什么�添加到暂存区的，则很�能是其它�交已�引入了相�的�更。\n"
 "您也许想�跳过这个补�。"
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10712,175 +10680,183 @@ msgstr ""
 "您应该对已�冲�解决的�一个文件执行 'git add' �标记已�完�。 \n"
 "您�以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�能解�对象 '%s'。"
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
-msgstr "清空索引失败"
+msgstr "无法清空索引"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 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:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "无效的 --show-current-patch 值：%s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s 和 --show-current-patch=%s �兼容"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "选项 '%s=%s' 和 '%s=%s' �能�时使用"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "以交互�方��行"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "�的�数 —— 无作用"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�许使用三方�并。"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "�默模�"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在�交说明中添加 Signed-off-by 尾注"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -k �数"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -b �数"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -m �数"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格�，� git-mailsplit 传递 --keep-cr �数"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "�� git-mailsplit 传递 --keep-cr �数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "丢弃�切线�的所有内容"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "传递给 git-mailinfo"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "格�"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "补�的格�"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "打补�失败时显示的错误信�"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲�解决�继续应用补�"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "和 --continue �义"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "跳过当�补�"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "��原始分支并终止打补��作"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "终止补��作但�� HEAD ��"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "显示正在应用的补�"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "把空补�记录为空�交"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "将作者日期作为�交日期"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "用当�时间作为作者日期"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签��交"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "如何处�空补�"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -10888,16 +10864,16 @@ msgstr ""
 "�数 -b/--binary 已�很长时间��任何实质�作了，并且将被移除。\n"
 "请���使用它了。"
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
-msgstr "读�索引失败"
+msgstr "无法读�索引"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�基目录 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10906,11 +10882,11 @@ msgstr ""
 "�现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决�作未进行，我们�会继续。"
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "交互�模�需�命令行上�供补�"
 
@@ -11360,11 +11336,11 @@ msgstr "�把根�交作为边界（默认：关闭）"
 msgid "show work cost statistics"
 msgstr "显示工作消耗统计"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
@@ -11413,7 +11389,7 @@ msgstr "显示作者的邮箱而�是�字（默认：关闭）"
 msgid "ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "版本"
 
@@ -11465,7 +11441,7 @@ msgstr "范围"
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "�处�在 <开始>,<结�> 范围内的行，或者函数：<函数�>"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress �能和 --incremental 或机器内部格�一起使用"
 
@@ -11477,18 +11453,18 @@ msgstr "--progress �能和 --incremental 或机器内部格�一起使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月�"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "文件 %s �有 %lu 行"
 msgstr[1] "文件 %s �有 %lu 行"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "追踪代�行"
 
@@ -11521,7 +11497,7 @@ msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<选项>] [-r | -a] [--format]"
 
 #  译者：��原�行格�，在输出时 %s 的替代内容会让字符串�长
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11531,7 +11507,7 @@ msgstr ""
 "         '%s'，但未�并到 HEAD。"
 
 #  译者：��原�行格�，在输出时 %s 的替代内容会让字符串�长
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11540,12 +11516,12 @@ msgstr ""
 "并未删除分支 '%s'， 虽然它已��并到 HEAD，\n"
 "         然而�尚未被�并到分支 '%s' 。"
 
-#: builtin/branch.c:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "无法查询 '%s' 指�的�交对象"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11554,7 +11530,7 @@ msgstr ""
 "分支 '%s' 没有完全�并。\n"
 "如果您确认�删除它，执行 'git branch -D %s'。"
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "更新�置文件失败"
 
@@ -11566,99 +11542,99 @@ msgstr "�能将 -a 和 -d �时使用"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指�的�交对象"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到远程跟踪分支 '%s'。"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未�现。"
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "�能解�格�化字符串"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "�能解� HEAD �交"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指� refs/heads/ 之外"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被�基到 %s"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "无法拷�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:516
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr "无法�命�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支�：'%s'"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "分支�命�失败"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "分支拷�失败"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已为错误命�的分支 '%s' 创建了一个副本"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已将错误命�的分支 '%s' �命�"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�命�为 %s，但 HEAD 没有更新�"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被�命�，但更新�置文件失败"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已拷�，但更新�置文件失败"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11669,209 +11645,205 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被过滤。\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若�数出现两次则显示上游分支"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "�显示信�"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "设置跟踪模�（�� git-pull(1)）"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "设置分支跟踪�置"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "��使用"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "改�上游信�"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "�消上游信�的设置"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "�打�包�该�交的分支"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "�打��包�该�交的分支"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪�本地分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "删除完全�并的分支"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（�使没有�并）"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "移动/�命�一个分支，以�它的引用日志"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/�命�一个分支，�使目标已存在"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "拷�一个分支和它的引用日志"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "拷�一个分支，�使目标已存在"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "显示当�分支�"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "标记分支的�述"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建�移动/�命��删除"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "�打�已��并的分支"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "�打�尚未�并的分支"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "以列的方�显示分支"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "�打�指�该对象的分支"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "排�和过滤属于大�写��感"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "输出格�"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有�于 /refs/heads 之下�"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose �兼容"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "必须�供分支�"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分离头指针�供�述"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "�能为一个以上的分支编辑�述"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无�交。"
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "为拷��作�供了太多的分支�"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "为�命��作�供了太多的�数"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "为设置新上游�供了太多的�数"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, 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:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "为�消上游设置�作�供了太多的�数"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法�消 HEAD 的上游设置因为它没有指�一个分支"
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信�"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -11879,7 +11851,7 @@ msgstr ""
 "'git branch' 的 -a 和 -r 选项�带一个分支�。\n"
 "您是�想�使用：-a|-r --list <模�>？"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12146,8 +12118,8 @@ msgstr "从标准输入读出文件�"
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "�显示进度报告"
 
@@ -12205,10 +12177,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<选项>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "字符串"
 
@@ -12272,98 +12244,93 @@ msgstr "git switch [<选项>] [<分支>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必需的版本"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必需的版本"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法�并"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加�并结果"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "�新创建了 %d 个�并冲�"
 msgstr[1] "�新创建了 %d 个�并冲�"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "从 %2$s 更新了 %1$d 个路径"
 msgstr[1] "从 %2$s 更新了 %1$d 个路径"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "从索引区更新了 %d 个路径"
 msgstr[1] "从索引区更新了 %d 个路径"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' �能在更新路径时使用"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' �能和 %s �时使用"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�时更新路径并切�到分支'%s'。"
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都没有指定"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' 或 '%s' �能和 %s 一起使用"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未�并"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12372,51 +12339,51 @@ msgstr ""
 "�能继续，下列文件有暂存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能对 '%s' 执行 reflog �作：%s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD 目��于"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "�能更新 HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�置分支 '%s'\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已��于 '%s'\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�并�置分支 '%s'\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  译者：注����导空格
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 个。\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12437,7 +12404,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12464,19 +12431,19 @@ msgstr[1] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "在版本�历时�到内部错误"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "您�于一个尚未�始化的分支"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12485,7 +12452,7 @@ msgstr ""
 "'%s' 既�以是一个本地文件，也�以是一个跟踪分支。\n"
 "请使用 --（和�选的 --no-guess）�消除歧义"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12504,51 +12471,51 @@ msgstr ""
 "如果您总是喜欢使用模糊的简短分支� <�称>，而�喜欢如 'origin' 的远程\n"
 "�称，�以在�置中设置 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 匹�多个（%d 个）远程跟踪分支"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "�期望一个引用"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应�有一个引用，�给出了 %d 个"
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一个树：%s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一个分支，得到标签 '%s'"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一个分支，得到远程分支 '%s'"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一个分支，得到 '%s'"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一个分支，得到�交 '%s'"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12556,7 +12523,7 @@ msgstr ""
 "�能在�并时切�分支\n"
 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12564,7 +12531,7 @@ msgstr ""
 "�能在一个 am 会�期间切�分支\n"
 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12572,7 +12539,7 @@ msgstr ""
 "�能在�基时切�分支\n"
 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12580,7 +12547,7 @@ msgstr ""
 "�能在拣选时切�分支\n"
 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12588,208 +12555,196 @@ msgstr ""
 "�能在还原时切�分支\n"
 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "您在执行二分查找时切�分支"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "路径�能和切�分支�时使用"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' �能和切�分支�时使用"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' �能和 '%s' �时使用"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' �带 <起始点>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一个��交 '%s'"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "缺少分支或�交�数"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方�并"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "冲�输出风格（merge 或 diff3）"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "冲�输出风格（merge�diff3 或 zdiff3）"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的�交分离"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "为新的分支设置上游信�"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "设置跟踪模�（�� git-pull(1)）"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "新的没有父�交的分支"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�检查指定的引用是�被其他工作区所�用"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "对尚未�并的文件检出我们的版本"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "对尚未�并的文件检出他们的版本"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径��稀�检出的�制"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c�-%c 和 --orphan 是互斥的"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "选项 '-%c'�'-%c' 和 ‘%s' �能�时使用"
 
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p 和 --overlay 互斥"
-
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track 需�一个分支�"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支�，�试 -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "无法解� %s"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' �是一个�交，�能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach �能接收路径�数 '%s'"
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 与 --detach �兼容"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 与 --patch �兼容"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout：在从索引检出时，--ours/--theirs�--force 和 --merge �兼容。"
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "您必须指定一个���的路径"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "创建/�置并检出一个分支"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜测 'git checkout <无此分支>'（默认）"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "使用�加模�（默认）"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "创建并切�一个新分支"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "创建/�置并切�一个分支"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜测 'git switch <无此分支>'"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "丢弃本地修改"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "�检出哪一个树"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "��索引"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "��工作区（默认）"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "忽略未�并�目"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "使用�加模�"
 
@@ -12824,7 +12779,15 @@ msgstr "将忽略仓库 %s\n"
 msgid "could not lstat %s\n"
 msgstr "�能对 %s 调用 lstat\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "拒�删除当�工作目录\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "将拒�删除当�工作目录\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12837,7 +12800,7 @@ msgstr ""
 "foo        - 通过唯一�缀选择一个选项\n"
 "           - （空）什么也�选择\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12858,33 +12821,33 @@ msgstr ""
 "*          - 选择所有选项\n"
 "           - （空）结�选择\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除�目>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹�的�目"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "选择�删除的�目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12902,66 +12865,66 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在�示符下选择的帮助"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下�目："
 msgstr[1] "将删除如下�目："
 
-#: builtin/clean.c:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "没有�清�的文件，退出。"
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "�打�删除文件的�称"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "交互�清除"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "模�"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模�> 到忽略规则"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "�删除忽略的文件"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 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:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 默认为 true 且未�供 -i�-n 或 -f 选项，拒�执行清�动作"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X �能�时使用"
 
@@ -13017,19 +12980,20 @@ msgstr "模�目录"
 msgid "directory from which templates will be used"
 msgstr "模�目录将被使用"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "�考仓库"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时�考 --reference 指�的本地仓库"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "�称"
@@ -13046,7 +13010,7 @@ msgstr "检出 <分支> 而�是远程 HEAD"
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "深度"
@@ -13055,7 +13019,7 @@ msgstr "深度"
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "时间"
@@ -13064,17 +13028,17 @@ msgstr "时间"
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历�，除了特定版本"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "�克隆一个分支�HEAD 或 --branch"
 
@@ -13102,22 +13066,22 @@ msgstr "key=value"
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置�置信�"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "传输选项"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "�使用 IPv4 地�"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 地�"
@@ -13148,12 +13112,12 @@ msgstr "无法在 '%s' 上�动迭代器"
 #: builtin/clone.c:353
 #, c-format
 msgid "failed to create link '%s'"
-msgstr "创建链接 '%s' 失败"
+msgstr "无法创建链接 '%s'"
 
 #: builtin/clone.c:357
 #, c-format
 msgid "failed to copy file to '%s'"
-msgstr "拷�文件至 '%s' 失败"
+msgstr "无法拷�文件至 '%s'"
 
 #: builtin/clone.c:362
 #, c-format
@@ -13209,29 +13173,25 @@ msgstr "无法执行 repack �清�"
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "太多�数。"
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库�克隆。"
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s 选项�兼容。"
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir 选项�兼容。"
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "选项 '%s' 和 '%s %s' �能�时使用"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' �存在"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一个正数"
@@ -13251,8 +13211,8 @@ msgstr "仓库路径 '%s' 已�存在，并且�是一个空目录。"
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已�存在。"
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "�能为 '%s' 创建先导目录"
@@ -13369,7 +13329,7 @@ msgstr ""
 ">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
 "[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "目录"
 
@@ -13449,7 +13409,7 @@ msgstr "�能�时使用 --reachable�--stdin-commits 或 --stdin-packs"
 msgid "Collecting commits from input"
 msgstr "正从标准输入收集�交"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "未识别的�命令：%s"
@@ -13467,7 +13427,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "忽略��的父�交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "�是一个有效的对象� %s"
@@ -13490,13 +13450,13 @@ msgstr "父�交"
 msgid "id of a parent commit object"
 msgstr "父�交对象 ID"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "�交说明"
 
@@ -13504,7 +13464,7 @@ msgstr "�交说明"
 msgid "read commit log message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG �交签�"
@@ -13515,7 +13475,7 @@ msgstr "必须精确地�供一个树"
 
 #: builtin/commit-tree.c:138
 msgid "git commit-tree: failed to read"
-msgstr "git commit-tree：读�失败"
+msgstr "git commit-tree：无法读�"
 
 #: builtin/commit.c:42
 msgid "git commit [<options>] [--] <pathspec>..."
@@ -13579,11 +13539,7 @@ msgstr ""
 
 #: builtin/commit.c:325
 msgid "failed to unpack HEAD tree object"
-msgstr "解包 HEAD 树对象失败"
-
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a 在一起没有�义"
+msgstr "无法解包 HEAD 树对象"
 
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
@@ -13670,8 +13626,8 @@ msgstr "�能读�日志文件 '%s'"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "�能将 -m 和 --fixup 组�使用：%s"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "选项 '%s' 和 '%s:%s' �能�时使用"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -13776,7 +13732,7 @@ msgstr "无法将尾注传递给 --trailers"
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项�供�交说明。\n"
@@ -13791,14 +13747,10 @@ msgstr "--author '%s' �是 '姓� <邮箱>' 格�，且未能在现有作者
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模� '%s'"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
-msgstr "无效的未追踪文件�数 '%s'"
-
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z 选项�兼容"
+msgstr "无效的未跟踪文件�数 '%s'"
 
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
@@ -13810,311 +13762,309 @@ msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "�能将 --fixup 的改写说明选项和路径 '%s' 组�使用"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和路径 '%s' �能�时使用"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "改写说明选项 '%s' 和 '%s' �能�时使用"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�时使用 --reset-author 和 --author 没有�义"
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "您没有�修补的�交。"
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个�并过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正处于一个�基过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup �能�时使用"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "选项 -m �能和 -c/-C/-F �时使用。"
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author �能和 -C�-c 或 --amend �时使用。"
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "�能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知选项：--fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路径  '%s ...' 和 -a 选项�时使用没有�义"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "以简�的格�显示状�"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "显示分支信�"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "显示贮�区信�"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "计算完整的领先/��值"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "机器�读的输出"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "以长格�显示状�（默认）"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字符结尾"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "模�"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模��的�选�数：all�normal�no。（默认：all）"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 "显示已忽略的文件，�选模�：traditional�matching�no。（默认：traditional）"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模组的更改，“何时�的�选�数：all�dirty�untracked。（默认：all）"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "以列的方�显示未跟踪的文件"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "�检测�命�"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "检测�命�，�以设置索引相似度"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�支�已忽略和未跟踪文件�数的组�"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "�交�功��显示概述信�"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "在�交说明模�里显示差异"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "�交说明选项"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "�交时覆盖作者"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "�交时覆盖日期"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "�交"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "�用并编辑指定�交的�交说明"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交说明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]�交"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用自动挤压格�的�交说明对指定的�交进行修正�修补或改写说明"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用自动挤压格�的�交说明用以挤压至指定的�交"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该�交的作者改为我（和 -C/-c/--amend �数共用）"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "尾注"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "添加自定义尾注"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "添加 Signed-off-by 尾注"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "使用指定的模�文件"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "强制编辑�交"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "在�交说明模�里包�状�信�"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "�交内容选项"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "�交所有改动的文件"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待�交"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "交互�添加文件"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "交互�添加�更"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "��交指定的文件"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩�"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "显示将��交的内容"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩�"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "�许一个空�交"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "�许空的�交说明"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "�能读� MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能读��交说明：%s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止�交因为�交说明为空。\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止�交；您未更改�自模版的�交说明。\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "因�交说明的正文为空而终止�交。\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14314,7 +14264,7 @@ msgstr "无效键�模�：%s"
 #: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
-msgstr "格�化默认�置值失败：%s"
+msgstr "无法格�化默认�置值：%s"
 
 #: builtin/config.c:441
 #, c-format
@@ -14613,7 +14563,7 @@ msgstr "�考虑匹� <模�> 的标签"
 msgid "do not consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的�交�作为�备"
 
@@ -14629,25 +14579,14 @@ msgstr "对于�工作区，追加 <标记>（默认：\"-dirty\"）"
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于��的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 与 --abbrev=0 �兼容"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "没有�现�称，无法�述任何东西。"
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 与�交��兼容"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken 与�交��兼容"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin 和 --merge-base 是互斥的"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "选项 '%s' 和�交��能�时使用"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14668,26 +14607,26 @@ msgstr "无效选项：%s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s：无�并基线"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "�是 git 仓库"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "�供了无效对象 '%s'。"
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "�供了超过两个数�对象：'%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处�的对象 '%s'。"
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s：多��并基线，使用 %s"
@@ -14696,22 +14635,22 @@ msgstr "%s...%s：多��并基线，使用 %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<�交> [<�交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读�符�链接文件 %s"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读�符�链接 %2$s 指�的对象 %1$s"
 
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14719,88 +14658,80 @@ msgstr ""
 "�支�在目录比较模�（'-d' 和 '--dir-diff'）中采用组�差异格�（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下�。"
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "您�能想�清�或者��它们。"
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "失败：%d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "�动差异比较工具之���示"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模�中使用符�链接"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示�以用在 `--tool` �数�的差异工具列表"
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "当执行的 diff 工具返回�零退出�时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "传递给 `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool �求工作区或者 --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index �兼容"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui�--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> �数�供 <工具>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 
@@ -14836,123 +14767,115 @@ msgstr "选项 `--default' å’Œ `--type=ulong` 期望一个无符å�·é•¿æ•´åž‹ï¼Œä
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "错误：除�指定 --mark-tags，�则无法导出嵌套标签。"
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map �值�能为空"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之�显示进度"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "选择如何处�签�标签"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指�被过滤对象时该标签的处�方�"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "选择使用备用编�处��交说明"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "如果文件存在，从该文件导入标记"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "当标签缺少标记人字段时，�装�供一个"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "�次�交都输出整个树"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能�终止�"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "跳过数�对象的输出"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "匿�输出"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿�输出中将 <from> 转�为 <to>"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "引用父对象 ID �在 fast-export �中"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "显示数�对象/�交的原始对象 ID"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "对带有标记 ID 的标签�标记"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "--anonymize-map 而没有 --anonymize 没有�义"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "�能�时传递�数 --import-marks 和 --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "�模组 '%s' 缺少 from 标记"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "�模组 '%s' 缺少 to 标记"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "预期 'mark' 命令，得到 %s"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "预期 'to' 命令，得到 %s"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "�模组�写选项的预期格�为 name:filename"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "�带 --allow-unsafe-features 的输入中�止使用功能 '%s'"
@@ -14962,254 +14885,258 @@ msgstr "�带 --allow-unsafe-features 的输入中�止使用功能 '%s'"
 msgid "Lockfile created but not reported: %s"
 msgstr "Lockfile 已创建但未报告：%s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel �能为负数"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓�"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "为 git pull/fetch 设置上游"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而�是覆盖它"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "使用原�事务更新引用"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "强制覆盖本地引用"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓�"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "抓�所有的标签和关�对象"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "�抓�任何标签(--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "�模组获�的并�数"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已��存在的分支的跟踪分支"
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除远程�存在的本地标签，并且替��更标签"
 
 #  译者：�选值，�能翻译
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "控制�模组的递归抓�"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "将获�到的引用写入 FETCH_HEAD 文件"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "��下载包"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "�许更新 HEAD 引用"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历�"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间�深化浅克隆的历�"
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "转�为一个完整的仓库"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "在�模组路径输出的��加上此目录"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获��模组的缺�值（比�置文件优先级低）"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "接�更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "指定获��作的引用映射"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "报告我们�拥有从该对象开始�达的对象"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr "�获�包文件；而是打��商的祖先�交"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "获��执行 'maintenance --auto'"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "在所有更新分支上检查强制更新"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "抓��写�交图"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "从标准输入获�引用规格"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
 msgstr "无法�现远程 HEAD 引用"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "�置�� fetch.output 包�无效值 %s"
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未�现"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[已拒�]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "当�分支下�能执行获��作"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "已在�一个工作树中检出"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "�能更新本地引用"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "会破�现有的标签"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "�快进"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"获��作通常显示哪些分支�生了强制更新，但该检查已被�用。\n"
+"获��作通常显示哪些分支�生了强制更新，但该检查已被�用；\n"
 "��新�用，请使用 '--show-forced-updates' 选项或�行\n"
-"'git config fetch.showForcedUpdates true'。"
+"'git config fetch.showForcedUpdates true'"
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"花了 %.2f 秒�检查强制更新。您�以使用 '--no-show-forced-updates'\n"
-"或�行 'git config fetch.showForcedUpdates false' 以��此项检查。\n"
+"花了 %.2f 秒�检查强制更新；您�以使用 '--no-show-forced-updates'\n"
+"或�行 'git config fetch.showForcedUpdates false' 以��此项检查\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未��所有必需的对象\n"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "拒� %s 因为浅克隆的根��许被更新"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "�自 %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15219,150 +15146,149 @@ msgstr ""
 " 'git remote prune %s' �删除旧的�有冲�的分支"
 
 #  译者：注����导空格
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将�为悬空状�）"
 
 #  译者：注����导空格
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�为悬空状�）"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒�获�到�纯仓库的当�分支 %s"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "拒�获�于 '%2$s' 检出的分支 '%1$s'"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
+msgid "option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "对象 '%s' �存在"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "检测到多分支，和 --set-upstream �兼容"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr "无法在�指�任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。"
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "没有为一个远程跟踪分支设置上游"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "没有为一个远程标签设置上游"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "未知的分支类型"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
-"未�现�分支。\n"
-"您需�使用 --set-upstream 选项指定一个分支。"
+"未�现�分支；\n"
+"您需�使用 --set-upstream 选项指定一个分支"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获� %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
 msgstr "�能获� %s"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "无法获� '%s'（退出�：%d）\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定远程仓库。请通过一个 URL 或远程仓库�指定，用以获�新�交。"
+"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:1945
-msgid "You need to specify a tag name."
-msgstr "您需�指定一个标签�称。"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "您需�指定一个标签�称"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only 需�一个或多个 --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
 msgstr "--deepen �支�负数深度"
 
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow �能�时使用"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，�数 --unshallow 没有�义"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能带一个仓库�数"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何�义"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
+msgid "no such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
 msgstr "获�组并指定引用规格没有�义"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "在使用 --negotiate-only 时必须�供远程仓库"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "�议�支� --negotiate-only，退出。"
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "�议�支� --negotiate-only，退出"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr "��以将 --filter 用于在 extensions.partialclone 中�置的远程仓库"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic 仅在从一个远程仓库获�的时候�用"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin 仅在从一个远程仓库获�的时候�用"
 
@@ -15371,23 +15297,27 @@ 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:18
+#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "��交说明中最多�制指定�目（�并而�的�交）的简短说明"
 
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "�数 --log 的别�（已弃用）"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为�交说明的开始"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "使用 <�称> 而�是真正的目标分支"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "从文件中读�"
 
@@ -15407,47 +15337,47 @@ msgstr "git for-each-ref [--merged [<�交>]] [--no-merged [<�交>]]"
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<�交>]] [--no-contains [<�交>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "引用��符适用于 shells"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "引用��符适用于 perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "引用��符适用于 python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用��符适用于 Tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "�显示 <n> 个匹�的引用"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "�照格�中的颜色输出"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "�打�指�给定对象的引用"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "�打�已��并的引用"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "�打�没有�并的引用"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "�打�包�该�交的引用"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "�打��包�该�交的引用"
 
@@ -15586,7 +15516,7 @@ msgstr "注�：无默认引用"
 #: builtin/fsck.c:621
 #, c-format
 msgid "%s: hash-path mismatch, found at: %s"
-msgstr "%s： 哈希路径�匹�，在 %s 被找到"
+msgstr "%s：哈希路径�匹�，�现于 %s"
 
 #: builtin/fsck.c:624
 #, c-format
@@ -15596,126 +15526,126 @@ msgstr "%s：对象��或丢失：%s"
 #: builtin/fsck.c:628
 #, c-format
 msgid "%s: object is of unknown type '%s': %s"
-msgstr "%s： 对象有未知的类型 '%s': %s"
+msgstr "%s：对象有未知的类型 '%s': %s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：�能解�对象：%s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "�的 sha1 文件：%s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "正在检查 %s 链接"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指�奇怪的东西（%s）"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分离头指针的指��存在"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注�：%s 指�一个尚未诞生的分支（%s）"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "正在检查缓存树"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中无效的 sha1 指针"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中�树对象"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "显示��达的对象"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "显示悬空的对象"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "�用更严格的检查"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "将悬空对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "显示�达对象的详细�称"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "正在检查对象"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：对象缺失"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "无效的�数：期望 sha1，得到 '%s'"
@@ -15734,17 +15664,12 @@ msgstr "对 %s 调用 fstat 失败：%s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "无法解� '%s' 值 '%s'"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "�能读� '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -15758,259 +15683,259 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "清除未引用的对象"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "更彻底（增加�行时间）"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "�用自动垃圾回收模�"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc �使�外一个 gc 正在执行"
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "除了最大的包之外，对所有其它包文件�新打包"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
-msgstr "解� gc.logexpiry 的值 %s 失败"
+msgstr "无法解� gc.logexpiry 的值 %s"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
-msgstr "解�清除期�值 %s 失败"
+msgstr "无法解�清除期�值 %s"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在��执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护�� \"git help gc\"。\n"
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, 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:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多��达的�散对象，�行 'git prune' 删除它们。"
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "--no-schedule �被�许"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "无法识别的 --schedule �数 '%s'"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "无法写入�交图"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "无法预先获�远程仓库"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "无法�动 'git pack-objects' 进程"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "无法完� 'git pack-objects' 进程"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "无法写入多包索引"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失败"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失败"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "跳过增��新打包任务，因为 core.multiPackIndex 被�用"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "�文件 '%s' 已存在，跳过维护"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "任务 '%s' 失败"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' �是一个有效的任务"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "任务 '%s' �能被多次选择"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "基于仓库状���行任务"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "频率"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "基于频率�行任务"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "�通过标准错误报告进度或其它信�"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "任务"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "�行一个特定的任务"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "无法�行 'git config'"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "无法扩展路径 '%s'"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "无法�动 launchctl"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "无法为 '%s' 创建目录"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "无法引导�务 %s"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "无法创建临时 XML 文件"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "无法�动计划任务"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "无法执行 'crontab -l'，您的系统�能�支� 'cron'"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "无法�行 'crontab'，您的系统�能�支� 'cron'"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "无法打开 'crontab' 的标准输入"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "'crontab' 终止"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "无法�动 systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "无法�行 systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
-msgstr "删除 '%s' 失败"
+msgstr "无法删除 '%s'"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "无法识别的 --scheduler �数 '%s'"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "systemd 和 crontab 的定时器都��用"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "%s 调度器��用"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "�外一个进程正�行于��维护"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<调度器>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "调度器"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "触� git maintenance 执行的调度器"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "无法将仓库添加到全局�置"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <�命令> [<选项>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "无效�命令：%s"
@@ -16378,25 +16303,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格� '%s'"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "无法�动 emacsclient。"
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "无法解� emacsclient 版本。"
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
-msgstr "执行 '%s' 失败"
+msgstr "无法执行 '%s'"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16405,7 +16330,7 @@ msgstr ""
 "'%s'：�支�的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16414,39 +16339,39 @@ msgstr ""
 "'%s': 支�的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处�此请求"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处�此请求"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的别�"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "�的 alias.%s 字符串：%s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "这个选项�带其他�数"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' 获�更多信�"
 
@@ -16577,7 +16502,7 @@ msgstr "%s 的所有�对象并�都�达"
 
 #: builtin/index-pack.c:925 builtin/index-pack.c:972
 msgid "failed to apply delta"
-msgstr "应用 delta 失败"
+msgstr "无法应用 delta"
 
 #: builtin/index-pack.c:1156
 msgid "Receiving objects"
@@ -16713,18 +16638,10 @@ msgstr "错误选项 %s"
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的哈希算法 '%s'"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin �能和 --stdin �时使用"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需� git 仓库"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format �能和 --stdin �时使用"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有�供包文件��数"
@@ -16850,10 +16767,6 @@ msgstr "hash"
 msgid "specify the hash algorithm to use"
 msgstr "指定�使用的哈希算法"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 是互斥的"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -16983,85 +16896,85 @@ msgstr "跟踪 <文件> 中 <开始>,<结æ�Ÿ> 范围内的行或函数 :<函数å
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<范围>:<文件> �能和路径表达�共用"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ��的文件"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "�能读�对象 %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：从�述生�附函的模�无效"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "无法打开补�文件 %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "�需�一个范围"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "�是一个范围"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "附函需�邮件地�格�"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "无法创建附函文件"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "未知�交 %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "无法将 '%s' 解�为一个有效引用"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "�能找到准确的�并基线"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -17071,405 +16984,393 @@ msgstr ""
 "git branch --set-upstream-to �跟踪一个远程分支。或者您�以通过\n"
 "�数 --base=<基线�交> 手动指定一个基线�交"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "无法找到准确的�并基线"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线�交应该是版本列表的祖先"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "基线�交�应该出现在版本列表中"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "无法得到补� id"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "无法推断当�系列的 range-diff 起始"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "使用 '%s' 作为当�系列的 range-diff �"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一个补�"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多个补�"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "打�补�到标准输出"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "生�一�附函"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "使用简�的数字�列作为输出文件�"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "�缀"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <�缀> 代替 '.patch'"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补�以 <n> 开始编�，而�是1"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "�制-计数"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "标记补�系列是第几次�制"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "输出文件�的最大长度"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "从分支�述获�附函的模�"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基于一个分支�述生�部分附函"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "�删除/添加 [PATCH]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "�输出二进制差异"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信�中输出全为零的哈希值"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的补�"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补�格�而�默认的（补�+状�）"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "邮件��"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "邮件地�"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "添加抄�"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地�设置为 <标识>（如若��供，则用�交者 ID �为地�）"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�邮件作为对 <邮件标识> 的回�"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "附件方�添加补�"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "内�显示补�"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "�用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "签�"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "添加一个签�"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "基线�交"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补�列表添加�置树信�"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "从文件添加一个签�"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "��打�补�文件�"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "在生�补�时显示进度"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "在附函或�个补�中显示和 <版本> 的差异"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或�个补�中显示和 <引用规格> 的差异"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "创建��的百分比"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�无效的身份标识：%s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only 无�义"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status 无�义"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check 无�义"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout�--output 和 --output-directory 是互斥的"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需� --cover-letter 或�一补�"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "版本间差异："
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "对 v%d 的版本差异："
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需� --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需� --cover-letter 或�一补�"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "范围差异："
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "对 v%d 的范围差异："
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读�签�文件 '%s'"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "生�补�"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<�制>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "�能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "用 NUL 字符分隔路径"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状�"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用�写字�表示 '�设未改�的' 文件"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用�写字�表示 'fsmonitor clean' 文件"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象�称"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需�删除的文件"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "�显示“其他�目录的�称"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "显示文件�行符格�"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "�显示空目录"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "显示未�并的文件"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信�"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "跳过和模�匹�的文件"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "从 <文件> 读�排除模�"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读��外的�个目录的排除模�"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "在�模组中递归"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都�在索引区，视为错误"
 
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "树对象"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "�装自从 <树对象> 之�删除的路径�然存在"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "显示调试数�"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "抑制���目"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "在稀�索引存在时显示稀�目录"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -17663,26 +17564,30 @@ msgid "use a diff3 based merge"
 msgstr "使用基于 diff3 的�并"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "使用基于狂热 diff3（zealous diff3）的�并"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "如果冲�，使用我们的版本"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "如果冲�，使用他们的版本"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "如果冲�，使用��版本"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "如果冲�，使用指定长度的标记"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "��警告冲�"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "为 文件1/�始文件/文件2 设置标签"
 
@@ -17721,178 +17626,182 @@ msgstr "�并 %s 和 %s\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<�交>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需�一个值"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "选项 `%s' 需�一个值"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�并策略 '%s'。\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自定义策略有："
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在�并的最��显示差异统计"
 
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "在�并的最�显示差异统计"
 
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �义）"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在�并�交信�中添加（最多 <n> �）精简�交记录"
 
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个�独的�交而�是�一次�并"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�并�功，执行一次�交（默认）"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "在�交�编辑�交说明"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "�许快进（默认）"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快进就放弃�并"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "ç­–ç•¥"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "�使用的�并策略"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "所选的�并策略的选项"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�并的�交说明（针对�快进��并）"
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "使用 <�称> 而�是真正的目标"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "放弃当�正在进行的�并"
 
 #
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是�留索引和工作区"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "继续当�正在进行的�并"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "�许�并�相关的历�"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "绕过 pre-merge-commit 和 commit-msg 钩�"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "�能�行贮�。"
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "贮�失败"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一个有效对象：%s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "读�树失败"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "已�是最新的。（无�挤压）"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "挤压�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无�并信� -- 未更新 HEAD\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指�一个�交"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "未处�两个头�并之外的任何�作。"
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "未知的策略选项：-X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "�能写 %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能从 '%s' 读�"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未�交�并，使用 'git commit' 完�此次�并。\n"
 
-#: builtin/merge.c:829
+#: builtin/merge.c:831
 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"
@@ -17902,83 +17811,83 @@ msgstr ""
 "�并到主题分支。\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "空的�交说明会终止�交。\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr "以 '%c' 开始的行将被忽略，而空的�交说明将终止�交。\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "空�交信�。"
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动�并失败，修正冲�然��交修正的结果。\n"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "没有当�分支。"
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "当�分支没有对应的远程仓库。"
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "当�分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有�自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在�的�值 '%1$s'"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�并：%s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "�能�并"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort �带�数"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有�终止的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit �带�数"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue �带�数"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17986,7 +17895,7 @@ msgstr ""
 "您尚未结�您的�并（存在 MERGE_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17994,84 +17903,76 @@ msgstr ""
 "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您�能将 --squash 和 --no-ff 组�使用。"
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "您�能将 --squash 和 --commit 组�使用。"
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的压缩�交"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快进��交没有�义"
 
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�并"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能将一个�交�并到空分支上"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "拒��并无关的历�"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�试�常�的索引内�并...\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状�...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�试�并策略 %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有�并策略处�此�并。\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �并失败。\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "使用 %s 策略以准备手工解决。\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动�并进展顺利，按�求在�交��止\n"
@@ -18113,7 +18014,7 @@ msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
 msgid "tag on stdin did not refer to a valid object"
 msgstr "标准输入上的标签未指�一个有效的对象"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "无法写标签文件"
 
@@ -18177,7 +18078,7 @@ msgstr "写入�包括给定索引的多包索引"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "用于选择�图�交的引用快照"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18274,52 +18175,52 @@ msgstr "%s，�=%s，目标=%s"
 msgid "Renaming %s to %s\n"
 msgstr "�命� %s 至 %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�命� '%s' 失败"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <�交>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<选项>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "�打�基于引用的�称（�对象�）"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "�使用标签�命��交"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "�使用和 <模�> 相匹�的引用"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模�> 相匹�的引用"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr "列出�以从所有引用访问的�交"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "从标准输入读�"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "�许打� `未定义` 的�称（默认）"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "��解�输入中的标签（内部使用）"
 
@@ -18436,25 +18337,25 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "为下�的对象写/编辑说明："
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "�能为对象 '%s' 开始 'show'"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "�能读� 'show' 的输出"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "无法为对象 '%s' 完� 'show'"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "请通过 -m 或 -F 选项为注解�供内容"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "�能写注解对象"
 
@@ -18463,7 +18364,7 @@ msgstr "�能写注解对象"
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能打开或读� '%s'"
@@ -18478,7 +18379,7 @@ msgstr "无法解� '%s' 为一个有效引用。"
 #: builtin/notes.c:263
 #, c-format
 msgid "failed to read object '%s'."
-msgstr "读�对象 '%s' 失败。"
+msgstr "无法读�对象 '%s'。"
 
 #: builtin/notes.c:266
 #, c-format
@@ -18493,7 +18394,7 @@ msgstr "格�错误的输入行：'%s'。"
 #: builtin/notes.c:322
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
-msgstr "从 '%s' 拷�注解到 '%s' 时失败"
+msgstr "无法把注解从 '%s' 拷�到 '%s'"
 
 #. TRANSLATORS: the first %s will be replaced by a git
 #. notes command: 'add', 'merge', 'remove', etc.
@@ -18505,8 +18406,8 @@ msgstr "拒�� %2$s（在 refs/notes/ 之外）%1$s注解"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "太多�数"
 
@@ -18551,7 +18452,7 @@ msgstr "ä¸�能添加注解。å�‘现对象 %s 已存在注解。使用 '-f' 覆ç›
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "删除对象 %s 的注解\n"
@@ -18591,19 +18492,19 @@ msgstr ""
 
 #: builtin/notes.c:696
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
-msgstr "删除引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
 
 #: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_REF"
-msgstr "删除引用 NOTES_MERGE_REF 失败"
+msgstr "无法删除引用 NOTES_MERGE_REF"
 
 #: builtin/notes.c:700
 msgid "failed to remove 'git notes merge' worktree"
-msgstr "删除 'git notes merge' 工作区失败"
+msgstr "无法删除 'git notes merge' 工作区"
 
 #: builtin/notes.c:720
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
-msgstr "读�引用 NOTES_MERGE_PARTIAL 失败"
+msgstr "无法读�引用 NOTES_MERGE_PARTIAL"
 
 #: builtin/notes.c:722
 msgid "could not find commit from NOTES_MERGE_PARTIAL."
@@ -18615,7 +18516,7 @@ msgstr "无法从 NOTES_MERGE_PARTIAL 中解��交。"
 
 #: builtin/notes.c:737
 msgid "failed to resolve NOTES_MERGE_REF"
-msgstr "解� NOTES_MERGE_REF 失败"
+msgstr "无法解� NOTES_MERGE_REF"
 
 #: builtin/notes.c:740
 msgid "failed to finalize notes merge"
@@ -18669,17 +18570,17 @@ msgstr "必须指定一个注解引用��并"
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "�于 %2$s 的一个到 %1$s 中的注解�并正在执行中"
 
-#: builtin/notes.c:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "无法存储链接到当�的注解引用（%s）"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18689,41 +18590,41 @@ msgstr ""
 "自动�并说明失败。修改 %s 中的冲�并且使用命令 'git notes merge --commit' �"
 "交结果，或者使用命令 'git notes merge --abort' 终止�并。\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解� '%s' 为一个有效引用。"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "对象 %s 没有注解\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "�试删除�存在的注解�是一个错误"
 
-#: builtin/notes.c:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "从标准输入读�对象�称"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "�删除，�显示"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "报告清除的注解"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "注解引用"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知�命令：%s"
@@ -18782,11 +18683,11 @@ msgstr "写入对象中"
 #: builtin/pack-objects.c:1235 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
-msgstr "对 %s 调用 stat 失败"
+msgstr "无法对 %s 调用 stat"
 
 #: builtin/pack-objects.c:1268
 msgid "failed to write bitmap index"
-msgstr "写入�图索引失败"
+msgstr "无法写入�图索引"
 
 #: builtin/pack-objects.c:1294
 #, c-format
@@ -19112,10 +19013,6 @@ msgstr "最�的包文件大�是 1 MiB"
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin �能用于创建一个�索引包"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable �兼容"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "�能在没有 --stdout 的情况下使用 --filter"
@@ -19132,7 +19029,7 @@ msgstr "�能�时使用内部版本列表和 --stdin-packs"
 msgid "Enumerating objects"
 msgstr "枚举对象中"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19174,19 +19071,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "�制�历 promisor 包以外的对象"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "�能在��仓库中执行清��作"
 
@@ -19219,7 +19116,7 @@ msgstr "�许快进�"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "控制 pre-merge-commit 和 commit-msg 钩�的使用"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "在�作��执行自动贮�和弹出贮�"
 
@@ -19289,6 +19186,7 @@ msgid "<remote>"
 msgstr "<远程>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<分支>"
 
@@ -19319,13 +19217,13 @@ msgstr "无法访问�交 %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为�基�作忽略 --verify-signatures"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19338,7 +19236,7 @@ msgstr ""
 "您有�离的分支，需�指定如何调和它们。您�以在执行下一次\n"
 "pull �作之�执行下�一�命令�抑制本消�：\n"
 "\n"
-"  git config pull.rebase false  # �并（缺�策略）\n"
+"  git config pull.rebase false  # �并\n"
 "  git config pull.rebase true   # �基\n"
 "  git config pull.ff only       # ä»…å¿«è¿›\n"
 "\n"
@@ -19346,19 +19244,19 @@ msgstr ""
 "缺�的�置项。您也�以在�次执行 pull 命令时添加 --rebase�--no-rebase，\n"
 "或者 --ff-only �数覆盖缺�设置。\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，�更添加至索引。"
 
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "�基�拉�"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "请�交或贮�它们。"
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19368,7 +19266,7 @@ msgstr ""
 "fetch 更新了当�的分支。快进您的工作区\n"
 "至�交 %s。"
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19385,23 +19283,23 @@ msgstr ""
 "$ git reset --hard\n"
 "��之�的状�。"
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支�并到空分支。"
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法�基到多个分支。"
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "无法快进到多个分支。"
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "需�指定如何调和�离的分支。"
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地�模组中有修改，无法�基"
 
@@ -19562,9 +19460,9 @@ msgstr "推�到 %s\n"
 #: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
-msgstr "推�一些引用到 '%s' 失败"
+msgstr "无法推�一些引用到 '%s'"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "仓库"
 
@@ -19637,10 +19535,6 @@ msgstr "用 GPG 为推�签�"
 msgid "request atomic transaction on remote side"
 msgstr "需�远端支�原�事务"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 与 --all�--mirror � --tags �兼容"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有�义"
@@ -19671,26 +19565,14 @@ msgstr ""
 "\n"
 "    git push <�称>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags �兼容"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all �能和引用规格�时使用"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags �兼容"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror �能和引用规格�时使用"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror �兼容"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "推�选项�能有�行符"
@@ -20105,18 +19987,6 @@ msgstr "看起� 'git am' 正在执行中。无法�基。"
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges 被 --rebase-merges 代替。"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "�能将 '--keep-base' 和 '--onto' 组�使用"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "�能将 '--keep-base' 和 '--root' 组�使用"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "�能将 '--root' 和 '--fork-point' 组�使用"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "没有正在进行的�基？"
@@ -20179,8 +20049,8 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需� --merge 或 --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "�能组�使用应用选项和�并选项"
+msgid "apply options and merge options cannot be used together"
+msgstr "应用选项和�并选项�能�时使用"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20221,7 +20091,7 @@ msgid "no such branch/commit '%s'"
 msgstr "无此分支/�交 '%s'"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
@@ -20289,7 +20159,7 @@ msgstr "快进 %s 到 %s。\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -20315,7 +20185,7 @@ msgstr ""
 "若��蔽此信�且��默认行为，设置 'receive.denyCurrentBranch'\n"
 "�置��为 'refuse'。"
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -20334,13 +20204,13 @@ msgstr ""
 "\n"
 "若��蔽此信�，您�以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "您必须指定一个目录。"
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "您必须指定一个目录"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20364,41 +20234,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <引用>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' �是一个有效的时间戳"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "正在标记�达对象..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s 指��存在�"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "未指定�删除的引用日志"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "�是一个引用日志：%s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "没有 '%s' 的引用日志"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "无效的引用格�：%s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -20488,6 +20358,11 @@ msgstr "git remote update [<选项>] [<组> | <远程>]..."
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "�能获� %s"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -20933,148 +20808,140 @@ msgstr ""
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "无法开始 pack-objects ��新打包 promisor 对象"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack：期望�自 pack-objects 的完整�六进制对象 ID。"
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "无法完� pack-objects ��新打包 promisor 对象"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "�能打开 %s 的索引"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "包 %s 太大，�在几何级数中考虑"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "包 %s 太大导致数字溢出"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "无法打开临时文件 %s 进行写入"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "�能关闭引用快照临时文件"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相�，并将��达的对象设为�散对象"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，�行 git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-delta"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-object"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "��行 git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --local"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --delta-islands"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，��将早于给定时间的对象过期"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，�新对��达对象打包"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "用于增�压缩的窗�值"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上�的相似，但�制内存大�而��目数"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "�制最大增�深度"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "�制最大线程数"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "�个包文件的最大尺寸"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象�新打包"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "��对该包文件�新打包"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "使用因� <n> 查找几何级数"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "写入结果包的多包索引"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "�能删除��仓库中的打包文件"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A �兼容"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 和 -A�-a �兼容"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "没有新的�打包。"
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "缺少需�的文件：%s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "�能删除：%s"
@@ -21157,98 +21024,92 @@ msgstr "cat-file 报告失败"
 msgid "unable to open %s for reading"
 msgstr "无法为读�打开 %s"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "无法�动 mktree"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "无法从 mktree 读�"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree 报告失败"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree 没有返回一个对象�"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "无法对 %s 执行 fstat"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "无法�数�库写入对象"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "�是一个有效的对象�：'%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "无法得到 %s 的对象类型"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "编辑对象文件失败"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "新对象和旧对象相�：'%s'"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "无法将 %s 解�为一个�交"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "�交 '%s' 中�有��的�并标签"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "�交 '%s' 中�有格�错误的�并标签"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始�交 '%s' 包�已�丢弃的�并标签 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "原始�交 '%s' 中有一个 gpg 签�"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在替�的�交中签�将被移除�"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "�能为 '%s' 写替��交"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "对 '%s' 移�没有必�"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "新�交和旧的一样：'%s'"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21257,71 +21118,71 @@ msgstr ""
 "�能转�下列移�：\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "列出替�的引用"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "删除替�的引用"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "编辑现存的对象"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "修改一个�交的父�交"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "转�现存的移�文件"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "如果存在则替�引用"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "��为 --edit �作美观显示内容"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "使用此格�"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "�列出时�能使用 --format"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "�有写一个替�时 -f �有�义"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw �有和 --edit 共用�有�义"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d 需�至少一个�数"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "错误的�数个数"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e 需�且仅需�一个�数"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g 需�至少一个�数"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file �带�数"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "�能为 -l �供一个模�"
 
@@ -21342,132 +21203,124 @@ msgstr "没有路径的 'git rerere forget' 已�过时"
 msgid "unable to generate diff for '%s'"
 msgstr "无法为 '%s' 生�差异"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<�交>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<树对象>] [--] <路径表达�>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<树对象>] [--] [<路径表达�>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "混�"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "软性"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "�并"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "��"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指�的树。"
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指�的树。"
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在�于 %s"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�并过程中�能�%s�置�作。"
 
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "安�模�，�报告错误"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "�置 HEAD 和索引"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "��置 HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "�置 HEAD�索引和工作区"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "�置 HEAD 但�存本地�更"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为��添加"
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解�为一个有效的版本。"
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解�为一个有效的树对象。"
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 与 --{hard�mixed�soft} 选项�兼容"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能带路径进行%s�置。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能对纯仓库进行%s�置"
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N �能和 --mixed �时使用"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "�置��消暂存的�更："
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21479,19 +21332,15 @@ msgstr ""
 "�置�，枚举未暂存�更花费了 %.2f 秒。 您�以使用 '--quiet' ��此情况。\n"
 "将�置�� reset.quiet 设置为 true �使其�为默认值。\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "�能写入新的索引文件。"
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "�能�时使用 --exclude-promisor-objects 和 --missing 选项"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "对象过滤需� --objects"
@@ -21501,8 +21350,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�显示注解"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "标记计数和 --objects �兼容"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "标记计数和 '%s' �能�时使用"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21937,11 +21787,6 @@ msgstr "<n>[,<base>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "显示从起始点开始的 <n> �最近的引用日志记录"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all�--remotes�--independent 或 --merge-base �兼容"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "未�供分支，且 HEAD 无效"
@@ -21962,19 +21807,19 @@ msgstr[1] "一次�能显示 %d 个�目。"
 msgid "no such ref %s"
 msgstr "无此引用 %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "�能处� %d 个以上的版本。"
 msgstr[1] "�能处� %d 个以上的版本。"
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' �是一个有效的引用。"
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "�能找到�交 %s（%s）"
@@ -22039,86 +21884,112 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "这个工作区�是稀�的"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "本工作区�是稀�模�（稀�检出文件�能�存在）"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
-msgstr "目录 '%s' 包括了未跟踪文件，但�在稀�检出 cone 中"
+msgstr "目录 '%s' 包括了未跟踪文件，但�在稀�检出锥中"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "无法删除目录 '%s'"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "无法为稀�检出文件创建目录"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "无法�级仓库格�以�用 worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "无法设置 extensions.worktreeConfig"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "无法修改 sparse-index �置"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
-msgstr "�始化稀�检出为 cone 模�"
+msgstr "�始化稀�检出为锥形模�"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "切�稀�索引的使用"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "无法修改 sparse-index �置"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "无法打开 '%s'"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "无法规范化路径 %s"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <模�>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "无法为 C 语言风格的字符串 '%s' 去引�"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "无法加载现存的稀�检出模�"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "已有的稀�检出模��使用锥形模�"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <模�>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "从标准输入读�模�"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "没有�以添加到的稀�检出"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | <模�"
+">)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "必须在稀�检出中�应用稀�模�"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "刷新工作目录时出错"
 
@@ -22144,22 +22015,26 @@ msgstr "git stash branch <分支�> [<stash>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <消�>]\n"
-"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"          [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
 "          [--] [<路径规格>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<消�>]"
 
 #: builtin/stash.c:55
@@ -22252,140 +22127,156 @@ msgstr "正在�并 %s 和 %s"
 msgid "Index was not unstashed."
 msgstr "索引未从贮�中��。"
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "无法从贮��目中��未跟踪文件"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "�试�建索引"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "丢弃了 %s（%s）"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：无法丢弃贮��目"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' �是一个贮�引用"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮��目被�留以备您�次需�。"
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "无法解�树"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "无法解包目录树"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "在贮�中包�未跟踪文件"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "仅显示贮�中的未跟踪文件"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "无法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "贮�说明"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需�一个 <�交> �数"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "没有暂存的修改"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "没有选择�更"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立�始�交"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "无法�存当�索引状�"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "无法�存未跟踪文件"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "无法�存当�工作区状�"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "无法�存当�暂存状�"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "�能记录工作区状�"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "�能�时使用�数 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "�能�时使用�数 --staged 和 --include-untracked 或 --all"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "您是�忘了执行 'git add'？"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "没有��存的本地修改"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "无法�始化贮�"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "无法�存当�状�"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "�存工作目录和索引状� %s"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区�更"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "��索引"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "�贮�暂存的�更"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "以补�模�贮�"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "�默模�"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "贮�中包�未跟踪文件"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "包�忽略的文件"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22409,7 +22300,7 @@ msgstr "跳过和移除所有的注释行"
 msgid "prepend comment character and space to each line"
 msgstr "为�一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用�称，�得到 %s"
@@ -22430,7 +22321,7 @@ msgid ""
 "authoritative upstream."
 msgstr "无法找到�置 '%s'。�定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
@@ -22522,9 +22413,9 @@ msgstr "无法解��模组 '%s' 的 HEAD 引用"
 #: builtin/submodule--helper.c:838 builtin/submodule--helper.c:1423
 #, c-format
 msgid "failed to recurse into submodule '%s'"
-msgstr "递归�模组 '%s' 失败"
+msgstr "无法递归进入�模组 '%s'"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "抑制�模组状�输出"
 
@@ -22591,10 +22482,6 @@ msgstr "git submodule--helper summary [<选项>] [<�交>] [--] [<路径>]"
 msgid "could not fetch a revision for HEAD"
 msgstr "�能为 HEAD 获�一个版本"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 是互斥的"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -22623,61 +22510,61 @@ msgstr "抑制�模组 URL �步的输出"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"�模组工作区 '%s' 包�一个 .git 目录（如果您确需删除它�其全部历�，使用 'rm "
-"-rf' 命令）"
+"�模组工作区 '%s' 包�一个 .git 目录。这将会用 absorbgitdirs �命令替��一"
+"个 .git 文件。"
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "�模组工作区 '%s' 包�本地修改；使用 '-f' 丢弃它们"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目录 '%s'\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "无法移除�模组工作区 '%s'\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "�能创建空的�模组目录 %s"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "�模组 '%s'（%s）未对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "删除�模组工作区，�使包�本地修改"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "将所有�模组�消注册"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想�对所有�模组执行�消�始化，请使用 '--all'"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -22689,67 +22576,67 @@ msgstr ""
 "Git �使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而�\n"
 "'--reference' �克隆。"
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "�模组 '%s' �能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能识别 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�能识别 submodule.alternateLocation 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "拒�在�一个�模组的 git 目录中创建/使用 '%s'"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "无法克隆 '%s' 到�模组路径 '%s'"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "目录�空：'%s'"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的�模组目录"
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模组将�克隆的路径"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "新�模组的�称"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "克隆�模组的 url 地�"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "��许克隆到一个�空目录"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22758,269 +22645,265 @@ msgstr ""
 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
 "[--name <�字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "�模组路径 '%2$s' 的更新模� '%1$s' 无效"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "为�模组路径 '%2$s' �置的更新模� '%1$s' 无效"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�模组路径 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想�执行 'update --init'？"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未�并的�模组 %s"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过�模组 '%s'"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划�试"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次�试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "无法在�模组路径 '%2$s' 中检出 '%1$s'"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "无法在�模组路径 '%2$s' 中�基 '%1$s'"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "无法在�模组路径 '%2$s' 中�并 '%1$s'"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "在�模组路径 '%3$s' 中执行 '%1$s %2$s' 失败"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "�模组路径 '%s'：检出 '%s'\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "�模组路径 '%s'：�基至 '%s'\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "�模组路径 '%s'：�并入 '%s'\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "�模组路径 '%s'：'%s %s'\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr "无法在�模组路径 '%s' 中获�；�试直接获� %s："
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
 "of that commit failed."
 msgstr "获�了�模组路径 '%s'，但是它没有包� %s。直接获�该�交失败。"
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作区中的路径，递归嵌套�模组"
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase�merge�checkout 或 none"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "并�任务"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "�始克隆是�应该�守推�的浅克隆选项"
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "��输出克隆进度"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "update �数�值错误"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr "抑制�基或�并更新的输出"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "强制检出更新"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "��从远程地�获�新对象"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr "当仓库是新的克隆时，覆盖更新模�"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "浅获�的深度"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "上层项目期待的 SHA1"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "�模�头指针的 SHA1"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<选项>] <路径>"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "无法获得�模组 '%s' 的仓库�柄"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "在�模组中递归"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "检查写入 .gitmodules 文件是�安全"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "�消 .gitmodules 文件中的设置"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <�称> [<值>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <�称>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "请确认 .gitmodules 文件在工作区里"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "抑制设置�模组 URL 的输出"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <路径> <新地�>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "设置默认跟踪分支为 master"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "设置默认跟踪分支"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <路径>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <分支> <路径>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "需� --branch 或 --default"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 和 --default 是互斥的"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "�索引中添加�于 '%s' 的已存在的仓库\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "'%s' 已存在并且�是一个有效的 git 仓库"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "�现一个本地 git 目录 '%s' �其远程仓库：\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -23035,83 +22918,83 @@ msgstr ""
 "使用 '--force' 选项。如果本地 git 目录�是正确的仓库，或者如果您�确定这里\n"
 "的�义，使用 '--name' 选项指定�外的�称。"
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "为�模组 '%s' �新激活本地 git 目录\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "无法检出�模组 '%s'"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "无法添加�模组 '%s'"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "无法注册�模组 '%s'"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "'%s' 已�存在于索引中"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "'%s' 已�存在于索引中且�是一个�模组"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "�添加为�模组的仓库的分支"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "�许添加一个被忽略的�模组路径"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "�打�错误消�"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "从引用仓库中借用对象"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr "将�模组的�称设置为给定的字符串，而�默认为其路径"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "�能在工作区的顶级目录中使用相对路径"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "仓库 URL：'%s' 必须是�对路径或以 ./|../ 起始"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "'%s' �是一个有效的�模组�称"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s �支� --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一个有效的 submodule--helper �命令"
@@ -23208,11 +23091,11 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被�留，如果您愿�也�以删除它们。\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "无法签署标签"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23225,15 +23108,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "�的对象类型。"
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被�留在 %s\n"
@@ -23314,45 +23197,22 @@ msgstr "�打�尚未�并的标签"
 msgid "print only tags of the object"
 msgstr "�打�指�该对象的标签"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n �兼容"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "-n 选项��许用在列表显示模�"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains 选项��许用在列表显示模�"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains 选项��许用在列表显示模�"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at 选项��许用在列表显示模�"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged 选项��许用在列表显示模�"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "��许一个 -F 或 -m 选项。"
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "'%s' 选项��许用在列表显示模�"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一个有效的标签�称。"
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -23364,17 +23224,17 @@ msgstr "展开对象中"
 #: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
-msgstr "创建目录 %s 失败"
+msgstr "无法创建目录 %s"
 
 #: builtin/update-index.c:106
 #, c-format
 msgid "failed to delete file %s"
-msgstr "删除文件 %s 失败"
+msgstr "无法删除文件 %s"
 
 #: builtin/update-index.c:113 builtin/update-index.c:219
 #, c-format
 msgid "failed to delete directory %s"
-msgstr "删除目录 %s 失败"
+msgstr "无法删除目录 %s"
 
 #: builtin/update-index.c:138
 #, c-format
@@ -23771,130 +23631,118 @@ msgstr "�能创建目录 '%s'"
 msgid "initializing"
 msgstr "�始化"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "准备工作区（新分支 '%s'）"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "准备工作区（�置分支 '%s'，之�为 %s）"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "准备工作区（检出 '%s'）"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "准备工作区（分离头指针 %s）"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，�使已�被检出到其它工作区"
 
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "创建或�置一个分支"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "生�新的工作区"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "�定新工作区"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "�定原因"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "设置跟踪模�（�� git-branch(1)）"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "�试为新分支�匹�一个远程跟踪分支"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b�-B 和 --detach 是互斥的"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason 需� --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "由 --lock 添加"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "�能在创建新分支时使用选项 --[no-]track "
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "显示扩展的注释和原因（如果有）"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "�早于 <时间> 的工作区添添加“�修剪�注释"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' �是一个工作区"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加�或解�"
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被�定，原因：%s"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被�定"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被�定"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "�能移动或删除包��模组的工作区"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "强制移动，�使工作区是�的或已�定"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一个主工作区"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "无法从 '%s' 算出目标�称"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23903,7 +23751,7 @@ msgstr ""
 "无法移动一个�定的工作区，�定原因：%s\n"
 "使用 'move -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23911,36 +23759,36 @@ msgstr ""
 "无法移动一个�定的工作区，\n"
 "使用 'move -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "验�失败，无法移动工作区：%s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
-msgstr "移动 '%s' 到 '%s' 失败"
+msgstr "无法移动 '%s' 到 '%s'"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
-msgstr "在 '%s' 中执行 'git status' 失败"
+msgstr "无法在 '%s' 中执行 'git status'"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包�修改或未跟踪的文件，使用 --force 删除"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
-msgstr "在 '%s' 中执行 'git status' 失败，退出� %d"
+msgstr "无法在 '%s' 中执行 'git status'，退出� %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "强制删除，�使工作区是�的或已�定"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23949,7 +23797,7 @@ msgstr ""
 "无法删除一个�定的工作区，�定原因：%s\n"
 "使用 'remove -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23957,17 +23805,17 @@ msgstr ""
 "无法删除一个�定的工作区，\n"
 "使用 'remove -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "验�失败，无法删除工作区：%s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修�：%s：%s"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "错误：%s：%s"
@@ -24018,21 +23866,16 @@ msgstr ""
 "帮助。\n"
 "有关系统的概述，查看 'git help git'。"
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "没有为 --git-dir �供目录\n"
+msgid "no directory given for '%s' option\n"
+msgstr "没有为 '%s' 选项�供目录\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "没有为 --namespace �供命�空间\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "没有为 --work-tree �供目录\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -24048,11 +23891,6 @@ msgstr "应为 -c �供一个�置字符串\n"
 msgid "no config key given for --config-env\n"
 msgstr "没有为 --config-env �供�置�称\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "没有为 -C �供目录\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -24082,29 +23920,29 @@ msgstr "%s 的空别�"
 msgid "recursive alias: %s"
 msgstr "递归的别�：%s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "在标准输出写入失败"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "到标准输出的未知写入错误"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "标准输出关闭失败"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "检测到别�循环：'%s'的扩展未终止：%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "�能作为内置命令处� %s"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -24113,33 +23951,25 @@ msgstr ""
 "用法：%s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "展开别�命令 '%s' 失败，'%s' �是一个 git 命令\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
-msgstr "�行命令 '%s' 失败：%s\n"
+msgstr "无法�行命令 '%s'：%s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "--packfile 的�数必须是有效的哈希值（得到 '%s'）"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "�是 git 仓库"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile 需� --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args �能和 --packfile 一起使用"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "未处�的选项"
@@ -24417,6 +24247,175 @@ msgstr "remote-curl：�试没有本地仓库下获�"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl：未知的�自 git 的命令 '%s'"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "需�一个工作目录"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "无法找到登记根"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "无法切�到 '%s'"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "无法�置 %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "无法�置 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "Scalar 登记需�一个工作树"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "远程 HEAD �是一个分支：'%.*s'"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr "无法从远程获�默认分支�称；使用本地默认值"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "无法获�默认分支�称"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "无法�消注册仓库"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "无法删除登记目录"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "克隆��检出的分支"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "在克隆时，创建完整的工作目录"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "�下载�检出的分支的元信�"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "无法从 '%s' 猜测工作区�称"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "目录 '%s' 已存在"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "无法获� '%s' 的默认分支"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "无法在 '%s' 中�置远程"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "无法�置 '%s'"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "部分克隆失败；�试完整克隆"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "无法�置完整克隆"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` �带�数"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<登记>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "�新�置所有注册的登记"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <登记>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或者 <登记>，而�是两个一起"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "在 '%s' 的 git 仓库已消失"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <任务> [<登记>]\n"
+"任务：\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "没有此任务：'%s'"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<登记>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <登记>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "拒�删除当�工作目录"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "包括 Git 的版本"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "包括 Git 的构建选项"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <命令> [<选项>]\n"
+"\n"
+"命令：\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "编译器信���用\n"
@@ -24441,36 +24440,36 @@ msgstr "到期时间"
 msgid "no-op (backward compatibility)"
 msgstr "空�作（��兼容）"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "更加详细"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "更加安�"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "用 <n> �数字显示对象�"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除�交说明里的空格和#注释"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "从文件读�路径表达�"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "使用 --pathspec-from-file，路径表达�用空字符分隔"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "key"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "排�的字段�"
 
@@ -24539,17 +24538,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "显示�系人的规范�称和电�邮件"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "确�引用�称格�正确"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "切�分支或��工作区文件"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "从索引拷�文件到工作区"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "确�引用�称格�正确"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "查找尚未应用到上游的�交"
@@ -24743,413 +24742,413 @@ msgid "Add or parse structured information in commit messages"
 msgstr "添加或解��交说明中的结构化信�"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git 仓库�览器"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "显示�交日志"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "显示索引和工作区中文件的信�"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "显示一个远程仓库的引用"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "显示一个树对象的内容"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "从�个电�邮件中��补�和作者身份"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "简�的 UNIX mbox 邮箱切分程�"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "�行任务以优化仓库数�"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "�并两个或更多开�历�"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "为了�并查找尽�能好的公共祖先�交"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "�行一个三路文件�并"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "对于需��并的文件执行�并"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "与 git-merge-index 一起使用的标准�导程�"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "在�动索引的情况下显示三路�并"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "�行�并冲�解决工具以解决�并冲�"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "显示三路�并而�动索引"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "写入和校验多包索引"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "创建一个有�外验�的标签对象"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "基于 ls-tree 的格�化文本创建一个树对象"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "写入和校验多包索引"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移动或�命�一个文件�目录或符�链接"
 
 # 查找给定版本的符��称
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "查找给定版本的符��称"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "添加或检查对象注释"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "导入和�交到 Perforce 仓库中"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "创建对象的存档包"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "查找冗余的包文件"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "打包头和标签以实现高效的仓库访问"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "计算一个补�的唯一 ID"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "删除对象库中所有��达对象"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "删除已�在包文件中的多余对象"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "获�并整��外的仓库或一个本地分支"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "更新远程引用和相关的对象"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "将一个 quilt 补�集应用到当�分支。"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "比较两个�交范围（如一个分支的两个版本）"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "将树信�读�到索引"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "在�一个分支上�新应用�交"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "接收推�到仓库中的对象"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "管� reflog 信�"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "管�已跟踪仓库"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "打包仓库中未打包对象"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "创建�列出�删除对象替�引用"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "生�待定更改的摘�"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "�用冲��并的解决方案记录"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "�置当� HEAD 到指定状�"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "��工作区文件"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "回退一些现存�交"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "按时间顺�列出�交对象"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "选出并处��数"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "回退一些现存�交"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "从工作区和索引中删除文件"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "通过电�邮件��一组补�"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "使用 Git �议推�对象到�一个仓库"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "为 shell 脚本准备的 Git 国际化设置代�"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "常用的 Git shell 脚本设置代�"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "��许 Git SSH 访问的��登录shell"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "'git log' 输出摘�"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "显示��类型的对象"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "显示分支和�交"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "显示打包归档索引"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "显示本地仓库中的引用"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "为 shell 脚本准备的 Git 国际化设置代�"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "常用的 Git shell 脚本设置代�"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "�始化�修改稀�检出"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "将文件内容添加到暂存区"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "贮��工作区中的修改"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "将文件内容添加到索引"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "显示工作区状�"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "删除�必�的空白字符"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "�始化�更新或检查�模组"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subersion 仓库和 Git 之间的���作"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "切�分支"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "读��修改和删除符�引用"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "创建�列出�删除或校验一个 GPG 签�的标签对象"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "用 blob 数�对象的内容创建一个临时文件"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "从打包文件中解压缩对象"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "将工作区的文件内容注册到索引"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "安全地更新存储于引用中的对象�称"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "更新辅助信�文件以帮助哑�议�务"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "将存档��回 git-archive"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "将对象压缩包��回 git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "显示一个Git逻辑��"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "检查 GPG �交签�"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "校验打包的Git存仓文件"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "检查标签的 GPG 签�"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web 界�（Git 仓库的 web �端）"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "显示�一个�交引入的差异日志"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "管�多个工作区"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "从当�索引创建一个树对象"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Git 命令行界�和约定"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "��开�人员的 Git 核心教程"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "为 Git �供用户�和�令"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "适� CVS 用户的 Git 帮助"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "调整差异输出"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "�一天 Git 的一组有用的最�命令集�"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "关于使用 Git 的常�问题"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Git �汇表"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Git 使用的钩�"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未跟踪文件"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Git 仓库�览器"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "映射作者/�交者的�称和/或邮件地�"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "定义�模组属性"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Git �字空间"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "与远程仓库交互的助手程�"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Git 仓库布局"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "将一个仓库安装到�外一个仓库中"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "Git 入门教程"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
-msgstr "一个 Git 教程：第二部分"
+msgstr "Git 入门教程：第二部分"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "一个 Git 教程"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web 界�（Git 仓库的 web �端）"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -25220,39 +25219,39 @@ msgstr "无法递归进�模组路径 '$displaypath'"
 msgid "usage: $dashless $USAGE"
 msgstr "用法：$dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "�能切�目录到 $cdup，工作区的顶级目录"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "致命错误：$program_name �能在没有工作区的情况下使用"
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "�能�写分支：您有未暂存的�更。"
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "�能 $action：您有未暂存的�更。"
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "�能 $action：您的索引中包�未�交的�更。"
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包�未�交的�更。"
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需�在工作区的顶级目录中�行这个命令。"
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "�能确定 git 目录的�对路径"
 
@@ -25304,7 +25303,7 @@ msgstr "如果补�能干净地应用，编辑�将立�标记为丢弃。"
 #: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
-msgstr "为写入打开�编辑文件失败：%s"
+msgstr "无法为写入打开�编辑文件：%s"
 
 #: git-add--interactive.perl:1121
 #, perl-format
@@ -25324,7 +25323,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "无法读��编辑文件：%s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25338,7 +25337,7 @@ msgstr ""
 "a - 暂存该�和本文件中��的全部�\n"
 "d - �暂存该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25352,7 +25351,7 @@ msgstr ""
 "a - 贮�该�和本文件中��的全部�\n"
 "d - �贮�该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25366,7 +25365,7 @@ msgstr ""
 "a - �暂存该�和本文件中��的全部�\n"
 "d - ���暂存该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25380,7 +25379,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25394,7 +25393,7 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25408,7 +25407,7 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25422,7 +25421,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25436,7 +25435,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25458,90 +25457,90 @@ msgstr ""
 "e - 手动编辑当��\n"
 "? - 显示帮助\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "选中的��能应用到索引�\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未�入的：%s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "将模��更应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除�作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "将添加�作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "将该�应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "没有其它�供跳转的�\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "无效数字：'%s'\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "对�起，�有 %d 个�用�。\n"
 msgstr[1] "对�起，�有 %d 个�用�。\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "没有其它�供查找的�\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "错误的正则表达� %s：%s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "没有和给定模�相匹�的�\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "没有�一个�\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "没有下一个�\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "对�起，�能拆分这个�\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "拆分为 %d �。\n"
 msgstr[1] "拆分为 %d �。\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "对�起，�能编辑这个�\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -25558,56 +25557,56 @@ msgstr ""
 "diff          - 显示 HEAD 和索引间差异\n"
 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "缺失 --"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模�：%s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "无效的�数 %s，期望是 --"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本地时间和 GMT 有�到一分钟间隔\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间�移�大于等于 24 �时\n"
 
-#: git-send-email.perl:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命错误：命令 '%s' 已终止，退出代�为 %d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器�正常退出，终止所有�作"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包�您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�编辑的邮件。\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项�兼容\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25617,47 +25616,47 @@ msgstr ""
 "git-send-email 通过 sendemail.* 选项进行设置，注�字� 'e'。\n"
 "设置 sendemail.forbidSendmailVariables 为 false ��用这项检查。\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�能在仓库之外�行 git format-patch\n"
 
-#: git-send-email.perl:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr "`batch-size` 和 `relogin` 必须�时定义（通过命令行或者�置选项）\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：�支�带引�的 sendmail 别�：%s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：�支� `/file` 或 `|pipe` �定�：%s\n"
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25672,12 +25671,12 @@ msgstr ""
 "    * 如果�义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果�义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25687,17 +25686,17 @@ msgstr ""
 "未指定补�文件�\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "为写入打开 %s 失败: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25710,37 +25709,37 @@ msgstr ""
 "\n"
 "如果您�想��摘�，清除内容。\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘�邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认�使用 <%s> [y/N]？"
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
 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:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�声明 8bit 为什么样的编�格� [UTF-8]？"
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25752,20 +25751,20 @@ msgstr ""
 "\t%s\n"
 "包�模版标题 '*** SUBJECT HERE ***'。如果确实想���，使用�数 --force。\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将���给�？"
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命错误：别� '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：�能从 %s 中��一个有效的邮件地�\n"
@@ -25773,16 +25772,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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处�这个地�？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" �存在"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -25807,112 +25806,112 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "��这�邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "���求的邮件回�"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP �务器未被正确定义。"
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "�务器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败�%s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地�始化 SMTP。检查�置并使用 --smtp-debug。"
 
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法�� %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习�� %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正�� %s\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "演习�功。日志说：\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能执行 '%s'"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管�至 '%s'"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形���信�"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "无效的传�编�"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -25923,12 +25922,12 @@ msgstr ""
 "%s\n"
 "警告：补�未能��\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "�能打开 %s：%s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -25937,547 +25936,13 @@ msgstr ""
 "致命错误：%s:%d 超过 998 字符\n"
 "警告：补�未能��\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, 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:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的��� %s？[y|N]："
-
-#, c-format
-#~ msgid ""
-#~ "The following pathspecs didn't match any eligible path, but they do match "
-#~ "index\n"
-#~ "entries outside the current sparse checkout:\n"
-#~ msgstr ""
-#~ "以下路径规格�匹�任何适�的路径，但它们和当�稀�检出之外的索引�目匹"
-#~ "�：\n"
-
-#~ msgid ""
-#~ "Disable or modify the sparsity rules if you intend to update such entries."
-#~ msgstr "如果您打算更新此类�目，请�用或修改稀�规则。"
-
-#, c-format
-#~ msgid "could not set GIT_DIR to '%s'"
-#~ msgstr "�能设置 GIT_DIR 为 '%s'"
-
-#, c-format
-#~ msgid "unable to unpack %s header with --allow-unknown-type"
-#~ msgstr "无法用 --allow-unknown-type �数解开 %s 头信�"
-
-#, c-format
-#~ msgid "unable to parse %s header with --allow-unknown-type"
-#~ msgstr "无法用 --allow-unknown-type �数解� %s 头信�"
-
-#~ msgid "open /dev/null failed"
-#~ msgstr "�能打开 /dev/null"
-
-#~ 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 ""
-#~ "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
-#~ "对修正�的文件�标记，然�用 'git commit' �交"
-
-#~ msgid "open /dev/null or dup failed"
-#~ msgstr "�能打开或者�制 /dev/null"
-
-#~ msgid "attempting to use sparse-index without cone mode"
-#~ msgstr "�试在没有 cone 模�下使用稀�索引"
-
-#~ msgid "unable to update cache-tree, staying full"
-#~ msgstr "�能更新缓存树，��完整"
-
-#, c-format
-#~ msgid "Could not open '%s' for writing."
-#~ msgstr "无法为写入打开 '%s'。"
-
-#, c-format
-#~ msgid "could not create archive file '%s'"
-#~ msgstr "�能创建归档文件 '%s'"
-
-#~ msgid ""
-#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-#~ msgstr "git bisect--helper --bisect-next-check <好-术语> <�-术语> [<术语>]"
-
-#~ msgid "--bisect-next-check requires 2 or 3 arguments"
-#~ msgstr "--bisect-next-check 需� 2 或 3 个�数"
-
-#, c-format
-#~ msgid "couldn't create a new file at '%s'"
-#~ msgstr "�能在 '%s' 创建新文件"
-
-#, c-format
-#~ msgid "git commit-tree: failed to open '%s'"
-#~ msgstr "git commit-tree：无法打开 '%s'"
-
-#, c-format
-#~ msgid "cannot open packfile '%s'"
-#~ msgstr "无法打开包文件 '%s'"
-
-#~ msgid "cannot store pack file"
-#~ msgstr "无法存储包文件"
-
-#~ msgid "cannot store index file"
-#~ msgstr "无法存储索引文件"
-
-#~ msgid "exclude patterns are read from <file>"
-#~ msgstr "从 <文件> 中读�排除模�"
-
-#, c-format
-#~ msgid "Unknown option for merge-recursive: -X%s"
-#~ msgstr "merge-recursive 的未知选项：-X%s"
-
-#, c-format
-#~ msgid "unusable todo list: '%s'"
-#~ msgstr "��用的待办列表：'%s'"
-
-#~ msgid "git rebase--interactive [<options>]"
-#~ msgstr "git rebase--interactive [<选项>]"
-
-#~ msgid "rebase merge commits"
-#~ msgstr "对�并�交�基"
-
-#~ msgid "keep original branch points of cousins"
-#~ msgstr "��兄弟�交的原始分支点"
-
-#~ msgid "move commits that begin with squash!/fixup!"
-#~ msgstr "移动以 squash!/fixup! 开头的�交"
-
-#~ msgid "sign commits"
-#~ msgstr "签��交"
-
-#~ msgid "continue rebase"
-#~ msgstr "继续�基"
-
-#~ msgid "skip commit"
-#~ msgstr "跳过�交"
-
-#~ msgid "edit the todo list"
-#~ msgstr "�基待办列表"
-
-#~ msgid "show the current patch"
-#~ msgstr "显示当�补�"
-
-#~ msgid "shorten commit ids in the todo list"
-#~ msgstr "缩短待办列表中的�交�"
-
-#~ msgid "expand commit ids in the todo list"
-#~ msgstr "扩展待办列表中的�交�"
-
-#~ msgid "check the todo list"
-#~ msgstr "检查待办列表"
-
-#~ msgid "rearrange fixup/squash lines"
-#~ msgstr "�新排列 fixup/squash 行"
-
-#~ msgid "insert exec commands in todo list"
-#~ msgstr "在待办列表中�入 exec 执行命令"
-
-#~ msgid "onto"
-#~ msgstr "onto"
-
-#~ msgid "restrict-revision"
-#~ msgstr "restrict-revision"
-
-#~ msgid "restrict revision"
-#~ msgstr "�制版本"
-
-#~ msgid "squash-onto"
-#~ msgstr "squash-onto"
-
-#~ msgid "squash onto"
-#~ msgstr "squash onto"
-
-#~ msgid "the upstream commit"
-#~ msgstr "上游�交"
-
-#~ msgid "head-name"
-#~ msgstr "head-name"
-
-#~ msgid "head name"
-#~ msgstr "head �称"
-
-#~ msgid "rebase strategy"
-#~ msgstr "�基策略"
-
-#~ msgid "strategy-opts"
-#~ msgstr "strategy-opts"
-
-#~ msgid "strategy options"
-#~ msgstr "策略选项"
-
-#~ msgid "switch-to"
-#~ msgstr "切�到"
-
-#~ msgid "the branch or commit to checkout"
-#~ msgstr "�检出的分支或�交"
-
-#~ msgid "onto-name"
-#~ msgstr "onto-name"
-
-#~ msgid "onto name"
-#~ msgstr "onto name"
-
-#~ msgid "cmd"
-#~ msgstr "cmd"
-
-#~ msgid "the command to run"
-#~ msgstr "�执行的命令"
-
-#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-#~ msgstr "�使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-
-#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "�能将 '--preserve-merges' 和 '--rebase-merges' �时使用"
-
-#~ msgid ""
-#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-#~ msgstr ""
-#~ "错误：�能将 '--preserve-merges' 和 '--reschedule-failed-exec' �时使用"
-
-#~ msgid ""
-#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> "
-#~ "--name <name>"
-#~ msgstr ""
-#~ "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --"
-#~ "name <�称>"
-
-#, c-format
-#~ msgid "failed to create file %s"
-#~ msgstr "创建文件 %s 失败"
-
-#~ msgid "exit immediately after initial ref advertisement"
-#~ msgstr "在�始的引用广告�立�退出"
-
-#, c-format
-#~ msgid "socket/pipe already in use: '%s'"
-#~ msgstr "套接字/管�已在使用：'%s'"
-
-#, c-format
-#~ msgid "could not start server on: '%s'"
-#~ msgstr "�能�动�务于：'%s'"
-
-#~ msgid "could not spawn daemon in the background"
-#~ msgstr "无法在��生�守护进程"
-
-#~ msgid "waitpid failed"
-#~ msgstr "waitpid 失败"
-
-#~ msgid "daemon not online yet"
-#~ msgstr "守护进程尚未上线"
-
-#~ msgid "daemon failed to start"
-#~ msgstr "守护进程无法�动"
-
-#~ msgid "waitpid is confused"
-#~ msgstr "waitpid 迷惑了"
-
-#~ msgid "daemon has not shutdown yet"
-#~ msgstr "守护进程尚未关闭"
-
-#~ msgid "Protocol restrictions not supported with cURL < 7.19.4"
-#~ msgstr "�支��议�制，因为 cURL < 7.19.4"
-
-#, sh-format
-#~ msgid "running $command"
-#~ msgstr "�行 $command"
-
-#, sh-format
-#~ msgid "'$sm_path' does not have a commit checked out"
-#~ msgstr "'$sm_path' 没有检出的�交"
-
-#, sh-format
-#~ msgid "Submodule path '$displaypath': '$command $sha1'"
-#~ msgstr "�模组 '$displaypath'：'$command $sha1'"
-
-#~ msgid "Applied autostash."
-#~ msgstr "已应用 autostash。"
-
-#, sh-format
-#~ msgid "Cannot store $stash_sha1"
-#~ msgstr "�能存储 $stash_sha1"
-
-#~ 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 ""
-#~ "应用 autostash 导致了冲�。\n"
-#~ "您的修改安全地�存在贮�区中。\n"
-#~ "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
-
-#, sh-format
-#~ msgid "Rebasing ($new_count/$total)"
-#~ msgstr "�基中（$new_count/$total）"
-
-#~ msgid ""
-#~ "\n"
-#~ "Commands:\n"
-#~ "p, pick <commit> = use commit\n"
-#~ "r, reword <commit> = use commit, but edit the commit message\n"
-#~ "e, edit <commit> = use commit, but stop for amending\n"
-#~ "s, squash <commit> = use commit, but meld into previous commit\n"
-#~ "f, fixup <commit> = like \"squash\", but discard this commit's log "
-#~ "message\n"
-#~ "x, exec <commit> = run command (the rest of the line) using shell\n"
-#~ "d, drop <commit> = remove commit\n"
-#~ "l, label <label> = label current HEAD with a name\n"
-#~ "t, reset <label> = reset HEAD to a label\n"
-#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
-#~ ".       create a merge commit using the original merge commit's\n"
-#~ ".       message (or the oneline, if no original merge commit was\n"
-#~ ".       specified). Use -c <commit> to reword the commit message.\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"
-#~ "l, label <标签> = 为当� HEAD 打上标签\n"
-#~ "t, reset <标签> = �置 HEAD 到该标签\n"
-#~ "m, merge [-C <�交> | -c <�交>] <标签> [# <oneline>]\n"
-#~ ".       创建一个�并�交，并使用原始的�并�交说明（如果没有指定\n"
-#~ ".       原始�交，使用注释部分的 oneline 作为�交说明）。使用\n"
-#~ ".       -c <�交> �以编辑�交说明。\n"
-#~ "\n"
-#~ "�以对这些行�新排�，将从上至下执行。\n"
-
-#, 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 ""
-#~ "您现在�以修补这个�交，使用\n"
-#~ "\n"
-#~ "\tgit commit --amend $gpg_sign_opt_quoted\n"
-#~ "\n"
-#~ "当您对�更感到满�，执行\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid "$sha1: not a commit that can be picked"
-#~ msgstr "$sha1：�是一个�以被拣选的�交"
-
-#, sh-format
-#~ msgid "Invalid commit name: $sha1"
-#~ msgstr "无效的�交�：$sha1"
-
-#~ msgid "Cannot write current commit's replacement sha1"
-#~ msgstr "�能写入当��交的替代 sha1"
-
-#, sh-format
-#~ msgid "Fast-forward to $sha1"
-#~ msgstr "快进到 $sha1"
-
-#, sh-format
-#~ msgid "Cannot fast-forward to $sha1"
-#~ msgstr "�能快进到 $sha1"
-
-#, sh-format
-#~ msgid "Cannot move HEAD to $first_parent"
-#~ msgstr "�能移动 HEAD 到 $first_parent"
-
-#, sh-format
-#~ msgid "Refusing to squash a merge: $sha1"
-#~ msgstr "拒�挤压一个�并：$sha1"
-
-#, sh-format
-#~ msgid "Error redoing merge $sha1"
-#~ msgstr "无法���并 $sha1"
-
-#, sh-format
-#~ msgid "Could not pick $sha1"
-#~ msgstr "�能拣选 $sha1"
-
-#, sh-format
-#~ msgid "This is the commit message #${n}:"
-#~ msgstr "这是�交说明 #${n}："
-
-#, sh-format
-#~ msgid "The commit message #${n} will be skipped:"
-#~ msgstr "�交说明 #${n} 将被跳过："
-
-#, 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 个�交的组�。"
-
-#, sh-format
-#~ msgid "Cannot write $fixup_msg"
-#~ msgstr "�能写入 $fixup_msg"
-
-#~ msgid "This is a combination of 2 commits."
-#~ msgstr "这是一个 2 个�交的组�。"
-
-#, sh-format
-#~ msgid "Could not apply $sha1... $rest"
-#~ msgstr "�能应用 $sha1... $rest"
-
-#, 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 ""
-#~ "�能在�功拣选 $sha1... $rest 之�修补�交\n"
-#~ "这通常是因为空的�交说明，或者 pre-commit 钩�执行失败。如果是 pre-"
-#~ "commit\n"
-#~ "钩�执行失败，你�能需�在�写�交说明�解决这个问题。"
-
-#, sh-format
-#~ msgid "Stopped at $sha1_abbrev... $rest"
-#~ msgstr "�止在 $sha1_abbrev... $rest"
-
-#, sh-format
-#~ msgid "Cannot '$squash_style' without a previous commit"
-#~ msgstr "没有父�交的情况下�能 '$squash_style'"
-
-#, sh-format
-#~ msgid "Executing: $rest"
-#~ msgstr "执行：$rest"
-
-#, sh-format
-#~ msgid "Execution failed: $rest"
-#~ msgstr "执行失败：$rest"
-
-#~ msgid "and made changes to the index and/or the working tree"
-#~ msgstr "并且修改索引和/或工作区"
-
-#~ msgid ""
-#~ "You can fix the problem, and then run\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-#~ msgstr ""
-#~ "您�以解决这个问题，然��行\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, 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 ""
-#~ "执行�功：$rest\n"
-#~ "但是在索引和/或工作区中存在�更。�交或贮�修改，然��行\n"
-#~ "\n"
-#~ "\tgit rebase --continue"
-
-#, sh-format
-#~ msgid "Unknown command: $command $sha1 $rest"
-#~ msgstr "未知命令：$command $sha1 $rest"
-
-#~ msgid "Please fix this using 'git rebase --edit-todo'."
-#~ msgstr "�修改请使用命令 'git rebase --edit-todo'。"
-
-#, sh-format
-#~ msgid "Successfully rebased and updated $head_name."
-#~ msgstr "�功�基并更新 $head_name。"
-
-#~ msgid "Could not remove CHERRY_PICK_HEAD"
-#~ msgstr "�能删除 CHERRY_PICK_HEAD"
-
-#, 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 ""
-#~ "您已暂存了工作区的修改。如果这些修改�挤压到�一个�交，执行：\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"
-
-#~ msgid "Error trying to find the author identity to amend commit"
-#~ msgstr "在修补�交中查找作者信�时�到错误"
-
-#~ 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'。"
-
-#~ msgid "Could not commit staged changes."
-#~ msgstr "�能�交暂存的修改。"
-
-#~ msgid "Could not execute editor"
-#~ msgstr "无法�行编辑器"
-
-#, sh-format
-#~ msgid "Could not checkout $switch_to"
-#~ msgstr "�能检出 $switch_to"
-
-#~ msgid "No HEAD?"
-#~ msgstr "没有 HEAD？"
-
-#, sh-format
-#~ msgid "Could not create temporary $state_dir"
-#~ msgstr "�能创建临时 $state_dir"
-
-#~ msgid "Could not mark as interactive"
-#~ msgstr "�能标记为交互�"
-
-#, 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 个�交）"
-
-#~ msgid "Note that empty commits are commented out"
-#~ msgstr "注�空�交已被注释掉"
-
-#~ msgid "Could not init rewritten commits"
-#~ msgstr "�能对�写�交进行�始化"
-
-#~ msgid "Cannot rebase: You have unstaged changes."
-#~ msgstr "�能�基：您有未暂存的�更。"
-
-#~ msgid "Cannot pull with rebase: You have unstaged changes."
-#~ msgstr "无法通过�基方�拉�：您有未暂存的�更。"
-
-#~ msgid "Cannot rebase: Your index contains uncommitted changes."
-#~ msgstr "�能�基：您的索引中包�未�交的�更。"
-
-#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-#~ msgstr "无法通过�基方�拉�：您的索引中包�未�交的�更。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1df8b60a9..60fe1235b6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,13 +17,13 @@
 # - Yichao Yu <yyc1992 AT gmail.com>
 # - Zhuang Ya <zhuangya AT me.com>
 #
-# Yi-Jyun Pan <pan93412@gmail.com>, 2021.
+# Yi-Jyun Pan <pan93412@gmail.com>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-11-10 08:55+0800\n"
-"PO-Revision-Date: 2021-11-11 06:38+0800\n"
+"POT-Creation-Date: 2022-01-17 08:31+0800\n"
+"PO-Revision-Date: 2022-01-22 07:05+0800\n"
 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
 "po/git-cli/zh_Hant/>\n"
@@ -32,7 +32,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 "X-ZhConverter: �化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
 "zhconvert.org\n"
 
@@ -41,8 +41,8 @@ msgstr ""
 msgid "Huh (%s)?"
 msgstr "嗯（%s）？"
 
-#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512
-#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233
+#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
+#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
 #: builtin/rebase.c:1642
 msgid "could not read index"
 msgstr "無法讀�索引"
@@ -71,7 +71,7 @@ msgstr "æ›´æ–°"
 msgid "could not stage '%s'"
 msgstr "無法暫存「%s�"
 
-#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718
+#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
 msgid "could not write index"
 msgstr "無法寫入索引"
 
@@ -86,8 +86,8 @@ msgstr[0] "已更新 %d 個路徑\n"
 msgid "note: %s is untracked now.\n"
 msgstr "注�：%s �已��追蹤。\n"
 
-#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298
-#: builtin/reset.c:151
+#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
+#: builtin/reset.c:167
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "「%s�路徑執行 make_cache_entry 失敗"
@@ -126,21 +126,21 @@ msgstr[0] "增加了 %d 個路徑\n"
 msgid "ignoring unmerged: %s"
 msgstr "忽略未�併：%s"
 
-#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369
+#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
 #, c-format
 msgid "Only binary files changed.\n"
 msgstr "�有二進�檔案被修改。\n"
 
-#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371
+#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
 #, c-format
 msgid "No changes.\n"
 msgstr "沒有修改。\n"
 
-#: add-interactive.c:947 git-add--interactive.perl:1379
+#: add-interactive.c:947 git-add--interactive.perl:1381
 msgid "Patch update"
 msgstr "修補檔更新"
 
-#: add-interactive.c:986 git-add--interactive.perl:1792
+#: add-interactive.c:986 git-add--interactive.perl:1794
 msgid "Review diff"
 msgstr "檢視 diff"
 
@@ -208,11 +208,11 @@ msgstr "�擇編號�的項目"
 msgid "(empty) select nothing"
 msgstr "（空）全���"
 
-#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896
+#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
 msgid "*** Commands ***"
 msgstr "*** 指令 ***"
 
-#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893
+#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
 msgid "What now"
 msgstr "請�擇"
 
@@ -224,13 +224,13 @@ msgstr "快�"
 msgid "unstaged"
 msgstr "未快�"
 
-#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311
-#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128
-#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194
-#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857
-#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503
-#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573
-#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811
+#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
+#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
+#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
+#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
+#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
 #: git-add--interactive.perl:213
 msgid "path"
 msgstr "路徑"
@@ -239,27 +239,27 @@ msgstr "路徑"
 msgid "could not refresh index"
 msgstr "無法�新整�索引"
 
-#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803
+#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
 #, c-format
 msgid "Bye.\n"
 msgstr "�見。\n"
 
-#: add-patch.c:34 git-add--interactive.perl:1431
+#: add-patch.c:34 git-add--interactive.perl:1433
 #, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暫存模�變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:35 git-add--interactive.perl:1432
+#: add-patch.c:35 git-add--interactive.perl:1434
 #, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:36 git-add--interactive.perl:1433
+#: add-patch.c:36 git-add--interactive.perl:1435
 #, c-format, perl-format
 msgid "Stage addition [y,n,q,a,d%s,?]? "
 msgstr "暫存新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:37 git-add--interactive.perl:1434
+#: add-patch.c:37 git-add--interactive.perl:1436
 #, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暫存此�塊 [y,n,q,a,d%s,?]? "
@@ -284,22 +284,22 @@ msgstr ""
 "a - 暫存此�塊和本檔案中後�的全部�塊\n"
 "d - �暫存此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:56 git-add--interactive.perl:1437
+#: add-patch.c:56 git-add--interactive.perl:1439
 #, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "儲�模�變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:57 git-add--interactive.perl:1438
+#: add-patch.c:57 git-add--interactive.perl:1440
 #, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "儲�刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:58 git-add--interactive.perl:1439
+#: add-patch.c:58 git-add--interactive.perl:1441
 #, c-format, perl-format
 msgid "Stash addition [y,n,q,a,d%s,?]? "
 msgstr "儲�新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:59 git-add--interactive.perl:1440
+#: add-patch.c:59 git-add--interactive.perl:1442
 #, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "儲�此�塊 [y,n,q,a,d%s,?]? "
@@ -324,22 +324,22 @@ msgstr ""
 "a - 儲�此�塊和本檔案中後�的全部�塊\n"
 "d - �儲�此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:80 git-add--interactive.perl:1443
+#: add-patch.c:80 git-add--interactive.perl:1445
 #, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "�消暫存模�變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:81 git-add--interactive.perl:1444
+#: add-patch.c:81 git-add--interactive.perl:1446
 #, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "�消暫存刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:82 git-add--interactive.perl:1445
+#: add-patch.c:82 git-add--interactive.perl:1447
 #, c-format, perl-format
 msgid "Unstage addition [y,n,q,a,d%s,?]? "
 msgstr "�消暫存新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:83 git-add--interactive.perl:1446
+#: add-patch.c:83 git-add--interactive.perl:1448
 #, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "�消暫存此�塊 [y,n,q,a,d%s,?]? "
@@ -364,22 +364,22 @@ msgstr ""
 "a - �暫存此�塊和本檔案中後�的全部�塊\n"
 "d - ���暫存此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:103 git-add--interactive.perl:1449
+#: add-patch.c:103 git-add--interactive.perl:1451
 #, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "將模�變更套用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:104 git-add--interactive.perl:1450
+#: add-patch.c:104 git-add--interactive.perl:1452
 #, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:105 git-add--interactive.perl:1451
+#: add-patch.c:105 git-add--interactive.perl:1453
 #, c-format, perl-format
 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
 msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:106 git-add--interactive.perl:1452
+#: add-patch.c:106 git-add--interactive.perl:1454
 #, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "將此�塊套用到索引 [y,n,q,a,d%s,?]? "
@@ -404,26 +404,26 @@ msgstr ""
 "a - 套用此�塊和本檔案中後�的全部�塊\n"
 "d - ��套用此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:126 git-add--interactive.perl:1455
-#: git-add--interactive.perl:1473
+#: add-patch.c:126 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
 #, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作�中�棄模�變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:127 git-add--interactive.perl:1456
-#: git-add--interactive.perl:1474
+#: add-patch.c:127 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
 #, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作�中�棄刪除變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:128 git-add--interactive.perl:1457
-#: git-add--interactive.perl:1475
+#: add-patch.c:128 git-add--interactive.perl:1459
+#: git-add--interactive.perl:1477
 #, c-format, perl-format
 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
 msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:129 git-add--interactive.perl:1458
-#: git-add--interactive.perl:1476
+#: add-patch.c:129 git-add--interactive.perl:1460
+#: git-add--interactive.perl:1478
 #, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "從工作�中�棄此�塊 [y,n,q,a,d%s,?]? "
@@ -448,22 +448,22 @@ msgstr ""
 "a - �棄此�塊和本檔案中後�的全部�塊\n"
 "d - ���棄此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463
 #, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作�中�棄模�變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464
 #, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作�中�棄刪除 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465
 #, c-format, perl-format
 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "放棄索引�工作目錄的新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466
 #, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "從索引和工作�中�棄此�塊 [y,n,q,a,d%s,?]? "
@@ -482,22 +482,22 @@ msgstr ""
 "a - �棄此�塊和本檔案中後�的全部�塊\n"
 "d - ���棄此�塊和本檔案中後�的全部�塊\n"
 
-#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469
 #, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將模�變更套用到索引和工作� [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470
 #, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將刪除變更套用到索引和工作� [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471
 #, c-format, perl-format
 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "套用索引�工作目錄的新增變更 [y,n,q,a,d%s,?]? "
 
-#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472
 #, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "將此�塊套用到索引和工作� [y,n,q,a,d%s,?]? "
@@ -635,7 +635,7 @@ msgstr "「git apply --cached�失敗"
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: add-patch.c:1247 git-add--interactive.perl:1242
+#: add-patch.c:1247 git-add--interactive.perl:1244
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "未套用編輯�塊。是��新編輯（輸入 “no� �棄�） [y/n]? "
@@ -644,11 +644,11 @@ msgstr "未套用編輯å�€å¡Šã€‚是å�¦é‡�新編輯（輸入 “noâ€� æ�¨æ£„ï¼�ï¼
 msgid "The selected hunks do not apply to the index!"
 msgstr "��的�塊�會套用進索引�"
 
-#: add-patch.c:1291 git-add--interactive.perl:1346
+#: add-patch.c:1291 git-add--interactive.perl:1348
 msgid "Apply them to the worktree anyway? "
 msgstr "無論如何都�套用到工作�嗎？ "
 
-#: add-patch.c:1298 git-add--interactive.perl:1349
+#: add-patch.c:1298 git-add--interactive.perl:1351
 msgid "Nothing was applied.\n"
 msgstr "未套用。\n"
 
@@ -686,11 +686,11 @@ msgstr "沒有下一個�塊"
 msgid "No other hunks to goto"
 msgstr "沒有其它�供跳轉的�塊"
 
-#: add-patch.c:1549 git-add--interactive.perl:1606
+#: add-patch.c:1549 git-add--interactive.perl:1608
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "�跳轉到哪個�塊（<Enter> 檢視更多）？ "
 
-#: add-patch.c:1550 git-add--interactive.perl:1608
+#: add-patch.c:1550 git-add--interactive.perl:1610
 msgid "go to which hunk? "
 msgstr "跳轉到哪個�塊？ "
 
@@ -709,7 +709,7 @@ msgstr[0] "��起，�有 %d 個�用�塊。"
 msgid "No other hunks to search"
 msgstr "沒有其它�供尋找的�塊"
 
-#: add-patch.c:1581 git-add--interactive.perl:1661
+#: add-patch.c:1581 git-add--interactive.perl:1663
 msgid "search for regex? "
 msgstr "使用常�表示��尋？ "
 
@@ -790,7 +790,7 @@ msgstr ""
 msgid "Exiting because of an unresolved conflict."
 msgstr "因為存在未解決的��而離開。"
 
-#: advice.c:209 builtin/merge.c:1379
+#: advice.c:209 builtin/merge.c:1382
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未��您的�併（存在 MERGE_HEAD）。"
 
@@ -885,21 +885,33 @@ msgstr "無法識別的空白字元�項 '%s'"
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "無法識別的空白字元忽略�項 '%s'"
 
-#: apply.c:136
-msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3way �能�時使用。"
-
-#: apply.c:139
-msgid "--3way outside a repository"
-msgstr "--3way 在版本庫之外"
-
-#: apply.c:150
-msgid "--index outside a repository"
-msgstr "--index 在版本庫之外"
-
-#: apply.c:153
-msgid "--cached outside a repository"
-msgstr "--cached 在版本庫之外"
+#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
+#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
+#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
+#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
+#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
+#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
+#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
+#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
+#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
+#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
+#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
+#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
+#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
+#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
+#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
+#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
+#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
+#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
+#: builtin/worktree.c:702
+#, c-format
+msgid "options '%s' and '%s' cannot be used together"
+msgstr "�能�時使用 '%s' 和 '%s' �項"
+
+#: apply.c:139 apply.c:150 apply.c:153
+#, c-format
+msgid "'%s' outside a repository"
+msgstr "'%s' 在版本庫之外"
 
 #: apply.c:800
 #, c-format
@@ -1100,8 +1112,8 @@ msgstr "打修補檔失敗：%s:%ld"
 msgid "cannot checkout %s"
 msgstr "�能簽出 %s"
 
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214
-#: setup.c:308
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
+#: setup.c:309
 #, c-format
 msgid "failed to read %s"
 msgstr "無法讀� %s"
@@ -1111,376 +1123,374 @@ msgstr "無法讀� %s"
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "讀��於符號連�中的 '%s'"
 
-#: apply.c:3442 apply.c:3709
+#: apply.c:3442 apply.c:3711
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路徑 %s 已經被�新命�/刪除"
 
-#: apply.c:3549 apply.c:3724
+#: apply.c:3549 apply.c:3726
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在於索引中"
 
-#: apply.c:3558 apply.c:3732 apply.c:3976
+#: apply.c:3558 apply.c:3734 apply.c:3978
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�符�"
 
-#: apply.c:3593
+#: apply.c:3595
 msgid "repository lacks the necessary blob to perform 3-way merge."
 msgstr "版本庫缺少用來進行三方�併所需�的資料物件。"
 
-#: apply.c:3596
+#: apply.c:3598
 #, c-format
 msgid "Performing three-way merge...\n"
 msgstr "正在進行三方�併⋯⋯\n"
 
-#: apply.c:3612 apply.c:3616
+#: apply.c:3614 apply.c:3618
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "無法讀� '%s' 的目�內容"
 
-#: apply.c:3628
+#: apply.c:3630
 #, c-format
 msgid "Failed to perform three-way merge...\n"
 msgstr "無法進行三方�併⋯⋯\n"
 
-#: apply.c:3642
+#: apply.c:3644
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "套用修補檔到 '%s' 存在��。\n"
 
-#: apply.c:3647
+#: apply.c:3649
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�功套用修補檔到 '%s'。\n"
 
-#: apply.c:3664
+#: apply.c:3666
 #, c-format
 msgid "Falling back to direct application...\n"
 msgstr "回復至直接套用模�⋯⋯\n"
 
-#: apply.c:3676
+#: apply.c:3678
 msgid "removal patch leaves file contents"
 msgstr "移除修補檔�留下了檔案內容"
 
-#: apply.c:3749
+#: apply.c:3751
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：錯誤類型"
 
-#: apply.c:3751
+#: apply.c:3753
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的類型是 %o，應為 %o"
 
-#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905
-#: read-cache.c:1368
+#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
+#: read-cache.c:1381
 #, c-format
 msgid "invalid path '%s'"
 msgstr "無效路徑 '%s'"
 
-#: apply.c:3974
+#: apply.c:3976
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已經存在於索引中"
 
-#: apply.c:3978
+#: apply.c:3980
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已經存在於工作�中"
 
-#: apply.c:3998
+#: apply.c:4000
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模�（%1$o）和舊模�（%3$o）�符�"
 
-#: apply.c:4003
+#: apply.c:4005
 #, 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:4023
+#: apply.c:4025
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影響的檔案 '%s' �於符號連�中"
 
-#: apply.c:4027
+#: apply.c:4029
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：修補檔未套用"
 
-#: apply.c:4042
+#: apply.c:4044
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在檢查修補檔 %s..."
 
-#: apply.c:4134
+#: apply.c:4136
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "�模組 %s 的 sha1 訊�缺少或無效"
 
-#: apply.c:4141
+#: apply.c:4143
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模�變更，但它�在目� HEAD 中"
 
-#: apply.c:4144
+#: apply.c:4146
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 訊�缺少或無效（%s）。"
 
-#: apply.c:4153
+#: apply.c:4155
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "�能在暫時索引中新增 %s"
 
-#: apply.c:4163
+#: apply.c:4165
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "�能把暫時索引寫入到 %s"
 
-#: apply.c:4301
+#: apply.c:4303
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能從索引中移除 %s"
 
-#: apply.c:4335
+#: apply.c:4337
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模組 %s �壞的修補檔"
 
-#: apply.c:4341
+#: apply.c:4343
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能�建立檔案 '%s' 呼� stat"
 
-#: apply.c:4349
+#: apply.c:4351
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能為建立檔案 %s 建立後端儲存"
 
-#: apply.c:4355 apply.c:4500
+#: apply.c:4357 apply.c:4502
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "無法為 %s 新增快��目"
 
-#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241
-#: builtin/gc.c:2276
+#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
+#: builtin/gc.c:2293
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "寫入 '%s' 失敗"
 
-#: apply.c:4402
+#: apply.c:4404
 #, c-format
 msgid "closing file '%s'"
 msgstr "關閉檔案 '%s'"
 
-#: apply.c:4472
+#: apply.c:4474
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能寫入檔案 '%s' 權� %o"
 
-#: apply.c:4570
+#: apply.c:4572
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功套用修補檔 %s。"
 
-#: apply.c:4578
+#: apply.c:4580
 msgid "internal error"
 msgstr "內部錯誤"
 
-#: apply.c:4581
+#: apply.c:4583
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
 
-#: apply.c:4592
+#: apply.c:4594
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 檔案�為 %.*s.rej"
 
-#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408
+#: apply.c:4602
 #, c-format
 msgid "cannot open %s"
 msgstr "�能開啟 %s"
 
-#: apply.c:4614
+#: apply.c:4616
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "�功套用第 #%d 個�塊。"
 
-#: apply.c:4618
+#: apply.c:4620
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒絕第 #%d 個�塊。"
 
-#: apply.c:4747
+#: apply.c:4749
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略�修補檔 '%s'。"
 
-#: apply.c:4755
-msgid "unrecognized input"
-msgstr "無法識別的輸入"
+#: apply.c:4758
+msgid "No valid patches in input (allow with \"--allow-empty\")"
+msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty��許）"
 
-#: apply.c:4775
+#: apply.c:4779
 msgid "unable to read index file"
 msgstr "無法讀�索引檔案"
 
-#: apply.c:4932
+#: apply.c:4936
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "�能開啟修補檔 '%s'：%s"
 
-#: apply.c:4959
+#: apply.c:4963
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 個空白字元誤用"
 
-#: apply.c:4965 apply.c:4980
+#: apply.c:4969 apply.c:4984
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字元誤用。"
 
-#: apply.c:4973
+#: apply.c:4977
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "修復空白錯誤後，套用了 %d 行。"
 
-#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429
+#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
 msgid "Unable to write new index file"
 msgstr "無法寫入新索引檔案"
 
-#: apply.c:5017
+#: apply.c:5021
 msgid "don't apply changes matching the given path"
 msgstr "��套用符��供路徑的變更"
 
-#: apply.c:5020
+#: apply.c:5024
 msgid "apply changes matching the given path"
 msgstr "套用符��供路徑的變更"
 
-#: apply.c:5022 builtin/am.c:2320
+#: apply.c:5026 builtin/am.c:2376
 msgid "num"
 msgstr "數字"
 
-#: apply.c:5023
+#: apply.c:5027
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "從傳統的 diff 路徑中移除指定數�的�導斜線"
 
-#: apply.c:5026
+#: apply.c:5030
 msgid "ignore additions made by the patch"
 msgstr "忽略修補檔中的新增的檔案"
 
-#: apply.c:5028
+#: apply.c:5032
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�套用修補檔，而是顯示輸入的差異統計（diffstat）"
 
-#: apply.c:5032
+#: apply.c:5036
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�進�數顯示新增和刪除的行數"
 
-#: apply.c:5034
+#: apply.c:5038
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�套用修補檔，而是顯示輸入的概�"
 
-#: apply.c:5036
+#: apply.c:5040
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�套用修補檔，而是檢視修補檔是��套用"
 
-#: apply.c:5038
+#: apply.c:5042
 msgid "make sure the patch is applicable to the current index"
 msgstr "確�修補檔�以套用到目�索引"
 
-#: apply.c:5040
+#: apply.c:5044
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
 
-#: apply.c:5042
+#: apply.c:5046
 msgid "apply a patch without touching the working tree"
 msgstr "套用修補檔而�修改工作�"
 
-#: apply.c:5044
+#: apply.c:5048
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作�之外檔案的修補檔"
 
-#: apply.c:5047
+#: apply.c:5051
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "還套用此修補檔（與 --stat/--summary/--check �項�時使用）"
 
-#: apply.c:5049
+#: apply.c:5053
 msgid "attempt three-way merge, fall back on normal patch if that fails"
 msgstr "嘗試三方�併。如果失敗，則回到正常修補檔 (patch) 模�"
 
-#: apply.c:5051
+#: apply.c:5055
 msgid "build a temporary index based on embedded index information"
 msgstr "建立一個暫時索引基於嵌入的索引訊�"
 
-#: apply.c:5054 builtin/checkout-index.c:196
+#: apply.c:5058 builtin/checkout-index.c:196
 msgid "paths are separated with NUL character"
 msgstr "路徑以 NUL 字元分隔"
 
-#: apply.c:5056
+#: apply.c:5060
 msgid "ensure at least <n> lines of context match"
 msgstr "確�至少符� <n> 行上下文"
 
-#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299
+#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
 #: builtin/rebase.c:1051
 msgid "action"
 msgstr "動作"
 
-#: apply.c:5058
+#: apply.c:5062
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "檢查新增和修改的行中間的空白字元濫用"
 
-#: apply.c:5061 apply.c:5064
+#: apply.c:5065 apply.c:5068
 msgid "ignore changes in whitespace when finding context"
 msgstr "尋找上下文時忽略空白字元的變更"
 
-#: apply.c:5067
+#: apply.c:5071
 msgid "apply the patch in reverse"
 msgstr "��套用修補檔"
 
-#: apply.c:5069
+#: apply.c:5073
 msgid "don't expect at least one line of context"
 msgstr "無需至少一行上下文"
 
-#: apply.c:5071
+#: apply.c:5075
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "將拒絕的修補檔�塊儲存在�應的 *.rej 檔案中"
 
-#: apply.c:5073
+#: apply.c:5077
 msgid "allow overlapping hunks"
 msgstr "�許�疊的修補檔�塊"
 
-#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22
-#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788
-#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120
-msgid "be verbose"
-msgstr "詳細輸出"
-
-#: apply.c:5076
+#: apply.c:5080
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�許�正確的檔案末尾�行符號"
 
-#: apply.c:5079
+#: apply.c:5083
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任修補檔�塊的標頭訊�中的行號"
 
-#: apply.c:5081 builtin/am.c:2308
+#: apply.c:5085 builtin/am.c:2364
 msgid "root"
 msgstr "根目錄"
 
-#: apply.c:5082
+#: apply.c:5086
 msgid "prepend <root> to all filenames"
 msgstr "為所有檔案��新增 <根目錄>"
 
+#: apply.c:5089
+msgid "don't return error for empty patches"
+msgstr "�到空白修補檔時�回傳錯誤"
+
 #: archive-tar.c:125 archive-zip.c:345
 #, c-format
 msgid "cannot stream blob %s"
@@ -1491,16 +1501,16 @@ msgstr "�能開啟資料物件 %s"
 msgid "unsupported file mode: 0%o (SHA1: %s)"
 msgstr "�支�的檔案模�：0%o (SHA1: %s)"
 
-#: archive-tar.c:450
+#: archive-tar.c:447
 #, c-format
 msgid "unable to start '%s' filter"
 msgstr "無法啟動 '%s' �濾器"
 
-#: archive-tar.c:453
+#: archive-tar.c:450
 msgid "unable to redirect descriptor"
 msgstr "無法�定��述符"
 
-#: archive-tar.c:460
+#: archive-tar.c:457
 #, c-format
 msgid "'%s' filter reported error"
 msgstr "'%s' �濾器報告了錯誤"
@@ -1543,19 +1553,13 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
 
-#: archive.c:188
+#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
+#: builtin/tag.c:578
 #, c-format
-msgid "cannot read %s"
-msgstr "�能讀� %s"
-
-#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114
-#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834
-#: builtin/merge.c:1145
-#, c-format
-msgid "could not read '%s'"
+msgid "cannot read '%s'"
 msgstr "�能讀� '%s'"
 
-#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334
+#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路徑�格 '%s' 未符�任何檔案"
@@ -1597,7 +1601,7 @@ msgstr "格�"
 msgid "archive format"
 msgstr "歸檔格�"
 
-#: archive.c:552 builtin/log.c:1775
+#: archive.c:552 builtin/log.c:1790
 msgid "prefix"
 msgstr "�綴"
 
@@ -1607,9 +1611,9 @@ msgstr "為歸檔中�個路徑�加上�綴"
 
 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
-#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
-#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103
-#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410
+#: builtin/fast-export.c:1181 builtin/fast-export.c:1183
+#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
+#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
 msgid "file"
 msgstr "檔案"
@@ -1639,7 +1643,7 @@ msgid "list supported archive formats"
 msgstr "列出支�的歸檔格�"
 
 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512
+#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
 msgid "repo"
 msgstr "版本庫"
 
@@ -1647,7 +1651,7 @@ msgstr "版本庫"
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "從�端版本庫（<版本庫>）擷�歸檔檔案"
 
-#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714
+#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708
 #: builtin/notes.c:496
 msgid "command"
 msgstr "指令"
@@ -1660,18 +1664,20 @@ msgstr "�端 git-upload-archive 指令的路徑"
 msgid "Unexpected option --remote"
 msgstr "未知�數 --remote"
 
-#: archive.c:580
-msgid "Option --exec can only be used together with --remote"
-msgstr "�項 --exec �能和 --remote �時使用"
+#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
+#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
+#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
+#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
+#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
+#: http-fetch.c:153
+#, c-format
+msgid "the option '%s' requires '%s'"
+msgstr "「%s��項需�「%s�"
 
 #: archive.c:582
 msgid "Unexpected option --output"
 msgstr "未知�數 --output"
 
-#: archive.c:584
-msgid "Options --add-file and --remote cannot be used together"
-msgstr "--add-file 和 --remote �項�能�時使用"
-
 #: archive.c:606
 #, c-format
 msgid "Unknown archive format '%s'"
@@ -1779,7 +1785,7 @@ msgstr "需�一個 %s 版本"
 msgid "could not create file '%s'"
 msgstr "�能建立檔案 '%s'"
 
-#: bisect.c:985 builtin/merge.c:154
+#: bisect.c:985 builtin/merge.c:155
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能讀�檔案 '%s'"
@@ -1829,10 +1835,10 @@ msgstr "�能將 --contents 和最終的�交物件�共用"
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041
-#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114
-#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056
-#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373
+#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
+#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
+#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
+#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
 #: builtin/shortlog.c:255
 msgid "revision walk setup failed"
@@ -1853,98 +1859,87 @@ msgstr "在 %2$s 中無此路徑 %1$s"
 msgid "cannot read blob %s for path %s"
 msgstr "�能為路徑 %2$s 讀�資料物件 %1$s"
 
-#: branch.c:53
-#, c-format
+#: branch.c:77
 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"
-"修正錯誤後，您�以執行\n"
-"\"git branch --set-upstream-to=%s%s%s\"\n"
-"命令修正�端追蹤資訊。"
+"cannot inherit upstream tracking configuration of multiple refs when "
+"rebasing is requested"
+msgstr "請求�定基底時，無法繼承多個�照的上游追蹤設定"
 
-#: branch.c:67
+#: branch.c:88
 #, c-format
-msgid "Not setting branch %s as its own upstream."
-msgstr "未設定分支 %s 作為它自己的上游。"
+msgid "not setting branch '%s' as its own upstream"
+msgstr "未將「%s�分支設定為其自己的上游"
 
-#: branch.c:93
+#: branch.c:144
 #, 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 '%s' by rebasing."
+msgstr "已將「%s�分支設定為���定基底追蹤「%s�。"
 
-#: branch.c:94
+#: branch.c:145
 #, 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 '%s'."
+msgstr "已將「%s�分支設定為追蹤「%s�。"
 
-#: branch.c:98
+#: branch.c:148
 #, c-format
-msgid "Branch '%s' set up to track local branch '%s' by rebasing."
-msgstr "分支 '%s' 設定為使用�定基底來追蹤本機分支 '%s'。"
+msgid "branch '%s' set up to track:"
+msgstr "「%s�分支已設定追蹤："
 
-#: branch.c:99
-#, c-format
-msgid "Branch '%s' set up to track local branch '%s'."
-msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"
+#: branch.c:160
+msgid "unable to write upstream branch configuration"
+msgstr "無法寫入上游分支設定"
 
-#: branch.c:104
-#, c-format
-msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
-msgstr "分支 '%s' 設定為使用�定基底來追蹤�端引用 '%s'。"
+#: branch.c:162
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking:"
+msgstr ""
+"\n"
+"修正錯誤後，您�以執行下述命令\n"
+"命令修正�端追蹤資訊："
 
-#: branch.c:105
+#: branch.c:203
 #, c-format
-msgid "Branch '%s' set up to track remote ref '%s'."
-msgstr "分支 '%s' 設定為追蹤�端引用 '%s'。"
+msgid "asked to inherit tracking from '%s', but no remote is set"
+msgstr "請求繼承「%s�的追蹤設定，但未設定�端"
 
-#: branch.c:109
+#: branch.c:209
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s' by rebasing."
-msgstr "分支 '%s' 設定為使用�定基底來追蹤本機引用 '%s'。"
+msgid "asked to inherit tracking from '%s', but no merge configuration is set"
+msgstr "請求繼承「%s�的追蹤設定，但未設定�併設定"
 
-#: branch.c:110
+#: branch.c:252
 #, c-format
-msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "分支 '%s' 設定為追蹤本機引用 '%s'。"
+msgid "not tracking: ambiguous information for ref %s"
+msgstr "未追蹤：%s 引用有歧義"
 
-#: branch.c:119
-msgid "Unable to write upstream branch configuration"
-msgstr "無法寫入上游分支設定"
-
-#: branch.c:156
+#: branch.c:287
 #, c-format
-msgid "Not tracking: ambiguous information for ref %s"
-msgstr "未追蹤：引用 %s 有歧義"
+msgid "'%s' is not a valid branch name"
+msgstr "「%s��是一個有效的分支�稱"
 
-#: branch.c:189
+#: branch.c:307
 #, c-format
-msgid "'%s' is not a valid branch name."
-msgstr "'%s' �是一個有效的分支�稱。"
+msgid "a branch named '%s' already exists"
+msgstr "已有��「%s�分支"
 
-#: branch.c:208
+#: branch.c:313
 #, c-format
-msgid "A branch named '%s' already exists."
-msgstr "一個分支� '%s' 已經存在。"
-
-#: branch.c:213
-msgid "Cannot force update the current branch."
-msgstr "無法強制更新目�分支。"
+msgid "cannot force update the branch '%s' checked out at '%s'"
+msgstr "無法強制更新在「%2$s�簽出的「%1$s�分支"
 
-#: branch.c:233
+#: branch.c:336
 #, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
-msgstr "無法設定追蹤訊�；起始點 '%s' �是一個分支。"
+msgid "cannot set up tracking information; starting point '%s' is not a branch"
+msgstr "無法設定追蹤資訊：起始點「%s��是分支"
 
-#: branch.c:235
+#: branch.c:338
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
 msgstr "請求的上游分支 '%s' �存在"
 
-#: branch.c:237
+#: branch.c:340
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1963,27 +1958,28 @@ msgstr ""
 "且建立兩個分支間的追蹤關係，\n"
 "您�能需�使用「git push -u�推�分支並設定和上游的關�。"
 
-#: branch.c:281
+#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
+#: builtin/replace.c:423 builtin/replace.c:453
 #, c-format
-msgid "Not a valid object name: '%s'."
-msgstr "�是一個有效的物件�：'%s'。"
+msgid "not a valid object name: '%s'"
+msgstr "�是一個有效的物件�：'%s'"
 
-#: branch.c:301
+#: branch.c:404
 #, c-format
-msgid "Ambiguous object name: '%s'."
-msgstr "歧義的物件�：'%s'。"
+msgid "ambiguous object name: '%s'"
+msgstr "物件�稱有歧義：「%s�"
 
-#: branch.c:306
+#: branch.c:409
 #, c-format
-msgid "Not a valid branch point: '%s'."
-msgstr "無效的分支點：'%s'。"
+msgid "not a valid branch point: '%s'"
+msgstr "無效的分支點：「%s�"
 
-#: branch.c:366
+#: branch.c:469
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已經簽出到 '%s'"
 
-#: branch.c:389
+#: branch.c:494
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作� %s 的 HEAD 指�沒有被更新"
@@ -2008,7 +2004,7 @@ msgstr "'%s' ��是一個 v2 或 v3 版本的包檔案"
 msgid "unrecognized header: %s%s (%d)"
 msgstr "無法識別的包頭：%s%s (%d)"
 
-#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404
+#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
 #: builtin/commit.c:862
 #, c-format
 msgid "could not open '%s'"
@@ -2065,7 +2061,7 @@ msgstr "�支�的包版本 %d"
 msgid "cannot write bundle version %d with algorithm %s"
 msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
 
-#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "無法識別的�數：%s"
@@ -2102,7 +2098,7 @@ msgstr "找到�複的�塊 ID %<PRIx32>"
 msgid "final chunk has non-zero id %<PRIx32>"
 msgstr "最終�塊有�零 ID %<PRIx32>"
 
-#: color.c:329
+#: color.c:354
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "無效的�色值：%.*s"
@@ -2152,205 +2148,205 @@ msgstr "無效的�交圖形�：行 '%s' �是一個雜湊值"
 msgid "unable to find all commit-graph files"
 msgstr "無法找到所有�交圖形檔案"
 
-#: commit-graph.c:746 commit-graph.c:783
+#: commit-graph.c:749 commit-graph.c:786
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "無效的�交�置。�交圖形�能已�壞"
 
-#: commit-graph.c:767
+#: commit-graph.c:770
 #, c-format
 msgid "could not find commit %s"
 msgstr "無法找到�交 %s"
 
-#: commit-graph.c:800
+#: commit-graph.c:803
 msgid "commit-graph requires overflow generation data but has none"
 msgstr "�交圖需�比目�更多的世代資料，但沒有相關資料"
 
-#: commit-graph.c:1105 builtin/am.c:1342
+#: commit-graph.c:1108 builtin/am.c:1369
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "�能解��交 %s"
 
-#: commit-graph.c:1367 builtin/pack-objects.c:3070
+#: commit-graph.c:1370 builtin/pack-objects.c:3070
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "無法�得物件 %s 類型"
 
-#: commit-graph.c:1398
+#: commit-graph.c:1401
 msgid "Loading known commits in commit graph"
 msgstr "正在載入�交圖中的已知�交"
 
-#: commit-graph.c:1415
+#: commit-graph.c:1418
 msgid "Expanding reachable commits in commit graph"
 msgstr "正在展開�交圖中的�以�得的�交"
 
-#: commit-graph.c:1435
+#: commit-graph.c:1438
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除�交圖中的�交標記"
 
-#: commit-graph.c:1454
+#: commit-graph.c:1457
 msgid "Computing commit graph topological levels"
 msgstr "正在計算�交圖拓樸級別"
 
-#: commit-graph.c:1507
+#: commit-graph.c:1510
 msgid "Computing commit graph generation numbers"
 msgstr "正在計算�交圖世代數字"
 
-#: commit-graph.c:1588
+#: commit-graph.c:1591
 msgid "Computing commit changed paths Bloom filters"
 msgstr "正在計算�交變更路徑的布隆�濾器"
 
-#: commit-graph.c:1665
+#: commit-graph.c:1668
 msgid "Collecting referenced commits"
 msgstr "正在收集引用�交"
 
-#: commit-graph.c:1690
+#: commit-graph.c:1693
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "正在 %d 個包中尋找�交圖的�交"
 
-#: commit-graph.c:1703
+#: commit-graph.c:1706
 #, c-format
 msgid "error adding pack %s"
 msgstr "新增包 %s 發生錯誤"
 
-#: commit-graph.c:1707
+#: commit-graph.c:1710
 #, c-format
 msgid "error opening index for %s"
 msgstr "為 %s 開啟索引發生錯誤"
 
-#: commit-graph.c:1744
+#: commit-graph.c:1747
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包物件中尋找�交圖的�交"
 
-#: commit-graph.c:1762
+#: commit-graph.c:1765
 msgid "Finding extra edges in commit graph"
 msgstr "正在尋找�交圖中�外的邊"
 
-#: commit-graph.c:1811
+#: commit-graph.c:1814
 msgid "failed to write correct number of base graph ids"
 msgstr "無法寫入正確數�的基礎圖形 ID"
 
-#: commit-graph.c:1842 midx.c:1146
+#: commit-graph.c:1845 midx.c:1149
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "�能為 %s 建立先導目錄"
 
-#: commit-graph.c:1855
+#: commit-graph.c:1858
 msgid "unable to create temporary graph layer"
 msgstr "無法建立暫時的圖形層"
 
-#: commit-graph.c:1860
+#: commit-graph.c:1863
 #, c-format
 msgid "unable to adjust shared permissions for '%s'"
 msgstr "無法調整「%s�的共用權�"
 
-#: commit-graph.c:1917
+#: commit-graph.c:1920
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "正在用 %d 步寫出�交圖"
 
-#: commit-graph.c:1953
+#: commit-graph.c:1956
 msgid "unable to open commit-graph chain file"
 msgstr "無法開啟�交圖形�檔案"
 
-#: commit-graph.c:1969
+#: commit-graph.c:1972
 msgid "failed to rename base commit-graph file"
 msgstr "無法�新命�基礎�交圖形檔案"
 
-#: commit-graph.c:1989
+#: commit-graph.c:1992
 msgid "failed to rename temporary commit-graph file"
 msgstr "無法�新命�暫時�交圖形檔案"
 
-#: commit-graph.c:2122
+#: commit-graph.c:2125
 msgid "Scanning merged commits"
 msgstr "正在掃��併�交"
 
-#: commit-graph.c:2166
+#: commit-graph.c:2169
 msgid "Merging commit-graph"
 msgstr "正在�併�交圖形"
 
-#: commit-graph.c:2274
+#: commit-graph.c:2277
 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr "嘗試寫入�交圖形，但 “core.commitGraph� 已被�用"
 
-#: commit-graph.c:2381
+#: commit-graph.c:2384
 msgid "too many commits to write graph"
 msgstr "�交太多�能畫圖"
 
-#: commit-graph.c:2479
+#: commit-graph.c:2482
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "�交圖檔案的總和檢查碼錯誤，�能已經�壞"
 
-#: commit-graph.c:2489
+#: commit-graph.c:2492
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "�交圖形的物件 ID 順��正確：%s 然後 %s"
 
-#: commit-graph.c:2499 commit-graph.c:2514
+#: commit-graph.c:2502 commit-graph.c:2517
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "�交圖形有�正確的扇出值：fanout[%d] = %u != %u"
 
-#: commit-graph.c:2506
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "無法從�交圖形中解��交 %s"
 
-#: commit-graph.c:2524
+#: commit-graph.c:2527
 msgid "Verifying commits in commit graph"
 msgstr "正在驗證�交圖中的�交"
 
-#: commit-graph.c:2539
+#: commit-graph.c:2542
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "無法從�交圖形的物件庫中解��交 %s"
 
-#: commit-graph.c:2546
+#: commit-graph.c:2549
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "�交圖形中的�交 %s 的根樹狀物件 ID 是 %s != %s"
 
-#: commit-graph.c:2556
+#: commit-graph.c:2559
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�交 %s 的�交圖形父�交列表太長了"
 
-#: commit-graph.c:2565
+#: commit-graph.c:2568
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的�交圖形父�交是 %s != %s"
 
-#: commit-graph.c:2579
+#: commit-graph.c:2582
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�交 %s 的�交圖形父�交列表�早終止"
 
-#: commit-graph.c:2584
+#: commit-graph.c:2587
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr "�交圖形中�交 %s 的世代號是零，但其它地方�零"
 
-#: commit-graph.c:2588
+#: commit-graph.c:2591
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr "�交圖形中�交 %s 的世代號�零，但其它地方是零"
 
-#: commit-graph.c:2605
+#: commit-graph.c:2608
 #, c-format
 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
 msgstr "�交 %s 的�交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
 
-#: commit-graph.c:2611
+#: commit-graph.c:2614
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "�交圖形中�交 %s 的�交日期是 %<PRIuMAX> != %<PRIuMAX>"
 
-#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418
-#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457
+#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
+#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
 #, c-format
 msgid "could not parse %s"
 msgstr "�能解� %s"
@@ -2380,27 +2376,27 @@ msgstr ""
 "設定 \"git config advice.graftFileDeprecated false\"\n"
 "�關閉本消�"
 
-#: commit.c:1239
+#: commit.c:1241
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "�交 %s 有一個��信的�稱來自 %s 的 GPG 簽�。"
 
-#: commit.c:1243
+#: commit.c:1245
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "�交 %s 有一個錯誤的�稱來自 %s 的 GPG 簽�。"
 
-#: commit.c:1246
+#: commit.c:1248
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "�交 %s 沒有 GPG 簽�。"
 
-#: commit.c:1249
+#: commit.c:1251
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "�交 %s 有一個來自 %s 的好的 GPG 簽�。\n"
 
-#: commit.c:1503
+#: commit.c:1505
 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"
@@ -2467,7 +2463,7 @@ msgstr "��沒有包�一個�節�稱：%s"
 msgid "key does not contain variable name: %s"
 msgstr "��沒有包�變數�：%s"
 
-#: config.c:470 sequencer.c:2804
+#: config.c:470 sequencer.c:2806
 #, c-format
 msgid "invalid key: %s"
 msgstr "無效��：%s"
@@ -2618,144 +2614,144 @@ msgstr "core.commentChar 應該是一個字元"
 msgid "invalid mode for object creation: %s"
 msgstr "無效的物件建立模�：%s"
 
-#: config.c:1581
+#: config.c:1584
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s 的�值格�錯誤"
 
-#: config.c:1607
+#: config.c:1610
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s 的�值格�錯誤：%s"
 
-#: config.c:1608
+#: config.c:1611
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必須是其中之一：nothing�matching�simple�upstream 或 current"
 
-#: config.c:1669 builtin/pack-objects.c:4053
+#: config.c:1672 builtin/pack-objects.c:4053
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "錯誤的打包壓縮級別 %d"
 
-#: config.c:1792
+#: config.c:1795
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "無法從資料物件 '%s' 載入設定"
 
-#: config.c:1795
+#: config.c:1798
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "引用 '%s' 沒有指�一個資料物件"
 
-#: config.c:1813
+#: config.c:1816
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "�能解�設定物件 '%s'"
 
-#: config.c:1858
+#: config.c:1861
 #, c-format
 msgid "failed to parse %s"
 msgstr "解� %s 失敗"
 
-#: config.c:1914
+#: config.c:1917
 msgid "unable to parse command-line config"
 msgstr "無法解�指令列中的設定"
 
-#: config.c:2282
+#: config.c:2285
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在讀�設定檔案時�到未知錯誤"
 
-#: config.c:2456
+#: config.c:2459
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "無效 %s：'%s'"
 
-#: config.c:2501
+#: config.c:2504
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 應該介於 0 和 100 之間"
 
-#: config.c:2547
+#: config.c:2550
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "無法解�指令列設定中的 '%s'"
 
-#: config.c:2549
+#: config.c:2552
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在檔案 '%2$s' 的第 %3$d 行發�錯誤的設定變數 '%1$s'"
 
-#: config.c:2633
+#: config.c:2637
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "無效的�節�稱 '%s'"
 
-#: config.c:2665
+#: config.c:2669
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多個�值"
 
-#: config.c:2694
+#: config.c:2698
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "寫入新的設定檔案 %s 失敗"
 
-#: config.c:2946 config.c:3273
+#: config.c:2950 config.c:3277
 #, c-format
 msgid "could not lock config file %s"
 msgstr "�能鎖定設定檔案 %s"
 
-#: config.c:2957
+#: config.c:2961
 #, c-format
 msgid "opening %s"
 msgstr "é–‹å•Ÿ %s"
 
-#: config.c:2994 builtin/config.c:361
+#: config.c:2998 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "無效模�：%s"
 
-#: config.c:3019
+#: config.c:3023
 #, c-format
 msgid "invalid config file %s"
 msgstr "無效的設定檔案 %s"
 
-#: config.c:3032 config.c:3286
+#: config.c:3036 config.c:3290
 #, c-format
 msgid "fstat on %s failed"
 msgstr "� %s 呼� fstat 失敗"
 
-#: config.c:3043
+#: config.c:3047
 #, c-format
 msgid "unable to mmap '%s'%s"
 msgstr "無法 mmap '%s'%s"
 
-#: config.c:3053 config.c:3291
+#: config.c:3057 config.c:3295
 #, c-format
 msgid "chmod on %s failed"
 msgstr "� %s 呼� chmod 失敗"
 
-#: config.c:3138 config.c:3388
+#: config.c:3142 config.c:3392
 #, c-format
 msgid "could not write config file %s"
 msgstr "�能寫入設定檔案 %s"
 
-#: config.c:3172
+#: config.c:3176
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能設定 '%s' 為 '%s'"
 
-#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
+#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
 #, c-format
 msgid "could not unset '%s'"
 msgstr "�能�消設定 '%s'"
 
-#: config.c:3264
+#: config.c:3268
 #, c-format
 msgid "invalid section name: %s"
 msgstr "無效的�節�稱：%s"
 
-#: config.c:3431
+#: config.c:3435
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s 的�值缺少"
@@ -2931,7 +2927,7 @@ msgstr "已阻止奇怪的路徑� '%s'"
 msgid "unable to fork"
 msgstr "無法 fork"
 
-#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57
 msgid "Checking connectivity"
 msgstr "正在檢查連通性"
 
@@ -3217,18 +3213,18 @@ msgid ""
 msgstr "�是一個 git 版本庫。使用 --no-index 比較工作�之外的兩個路徑"
 
 #  譯者：請維��導空格
-#: diff.c:157
+#: diff.c:158
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  無法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  譯者：請維��導空格
-#: diff.c:162
+#: diff.c:163
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �數 '%s'\n"
 
-#: diff.c:298
+#: diff.c:299
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -3236,7 +3232,7 @@ msgstr ""
 "移動的�色設定必須是 'no'�'default'�'blocks'�'zebra'�'dimmed-"
 "zebra'�'plain'"
 
-#: diff.c:326
+#: diff.c:327
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3245,18 +3241,18 @@ msgstr ""
 "未知的 color-moved-ws 模� '%s'，�能的�值有 'ignore-space-change'�'ignore-"
 "space-at-eol'�'ignore-all-space'�'allow-indentation-change'"
 
-#: diff.c:334
+#: diff.c:335
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr "color-moved-ws：allow-indentation-change �能與其它空白字元模�共用"
 
-#: diff.c:411
+#: diff.c:412
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "設定變數 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:471
+#: diff.c:472
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3265,47 +3261,48 @@ msgstr ""
 "發�設定變數 'diff.dirstat' 中的錯誤：\n"
 "%s"
 
-#: diff.c:4290
+#: diff.c:4237
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 離開，�止在 %s"
 
-#: diff.c:4642
-msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
+#: diff.c:4589
+#, c-format
+msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
+msgstr "「%s��「%s��「%s�和「%s��項�得�時使用"
 
-#: diff.c:4645
-msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "-G�-S 和 --find-object 是互斥的"
+#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
+#, c-format
+msgid "options '%s', '%s', and '%s' cannot be used together"
+msgstr "「%s��「%s�和「%s��項�得�時使用"
 
-#: diff.c:4648
-msgid ""
-"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
-msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex �� -S"
+#: diff.c:4597
+#, c-format
+msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
+msgstr "「%s�和「%s��項�得�時使用，請使用「%s���「%s�"
 
-#: diff.c:4651
+#: diff.c:4601
+#, c-format
 msgid ""
-"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
-"with -G and -S"
-msgstr ""
-"--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all �� -G 和 -S"
+"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
+msgstr "「%s�和「%s��項�得�時使用，請使用「%s���「%s��「%s�"
 
-#: diff.c:4730
+#: diff.c:4681
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明確�求�跟一個路徑�格"
 
-#: diff.c:4778
+#: diff.c:4729
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "無效的 --stat 值：%s"
 
-#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326
+#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
 #: parse-options.c:217 parse-options.c:221
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s 期望一個數字值"
 
-#: diff.c:4815
+#: diff.c:4766
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3314,200 +3311,200 @@ msgstr ""
 "無法解� --dirstat/-X �項的�數：\n"
 "%s"
 
-#: diff.c:4900
+#: diff.c:4851
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
 
-#: diff.c:4924
+#: diff.c:4875
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之後未知的值"
 
-#: diff.c:4938
+#: diff.c:4889
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "�能解� '%s'"
 
-#: diff.c:4988 diff.c:4994
+#: diff.c:4939 diff.c:4945
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格�"
 
-#: diff.c:5006
+#: diff.c:4957
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一個字元，得到 '%s'"
 
-#: diff.c:5027
+#: diff.c:4978
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "壞的 --color-moved �數：%s"
 
-#: diff.c:5046
+#: diff.c:4997
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的無效模� '%s'"
 
-#: diff.c:5086
+#: diff.c:5037
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm �項有 \"myers\"�\"minimal\"�\"patience\" 和 \"histogram\""
 
-#: diff.c:5122 diff.c:5142
+#: diff.c:5073 diff.c:5093
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的�數無效"
 
-#: diff.c:5246
+#: diff.c:5197
 #, c-format
 msgid "invalid regex given to -I: '%s'"
 msgstr "傳入 -I 的常�表示�無效：「%s�"
 
-#: diff.c:5295
+#: diff.c:5246
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "無法解� --submodule �項的�數：'%s'"
 
-#: diff.c:5351
+#: diff.c:5302
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "壞的 --word-diff �數：%s"
 
-#: diff.c:5387
+#: diff.c:5338
 msgid "Diff output format options"
 msgstr "差異輸出格�化�項"
 
-#: diff.c:5389 diff.c:5395
+#: diff.c:5340 diff.c:5346
 msgid "generate patch"
 msgstr "生�修補檔"
 
-#: diff.c:5392 builtin/log.c:179
+#: diff.c:5343 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "�顯示差異輸出"
 
-#: diff.c:5397 diff.c:5511 diff.c:5518
+#: diff.c:5348 diff.c:5462 diff.c:5469
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5398 diff.c:5401
+#: diff.c:5349 diff.c:5352
 msgid "generate diffs with <n> lines context"
 msgstr "生�� <n> 行上下文的差異"
 
-#: diff.c:5403
+#: diff.c:5354
 msgid "generate the diff in raw format"
 msgstr "生�原始格�的差異"
 
-#: diff.c:5406
+#: diff.c:5357
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' �義"
 
-#: diff.c:5410
+#: diff.c:5361
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' �義"
 
-#: diff.c:5414
+#: diff.c:5365
 msgid "machine friendly --stat"
 msgstr "機器�好的 --stat"
 
-#: diff.c:5417
+#: diff.c:5368
 msgid "output only the last line of --stat"
 msgstr "�輸出 --stat 的最後一行"
 
-#: diff.c:5419 diff.c:5427
+#: diff.c:5370 diff.c:5378
 msgid "<param1,param2>..."
 msgstr "<�數1,�數2>..."
 
-#: diff.c:5420
+#: diff.c:5371
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "輸出�個�目錄相�變更的分布"
 
-#: diff.c:5424
+#: diff.c:5375
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative �義"
 
-#: diff.c:5428
+#: diff.c:5379
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的�義詞"
 
-#: diff.c:5432
+#: diff.c:5383
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果變更中引入��定界符或空白錯誤，給出警告"
 
-#: diff.c:5435
+#: diff.c:5386
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精簡摘�，例如建立��新命�和模�變更"
 
-#: diff.c:5438
+#: diff.c:5389
 msgid "show only names of changed files"
 msgstr "�顯示變更檔案的檔案�"
 
-#: diff.c:5441
+#: diff.c:5392
 msgid "show only names and status of changed files"
 msgstr "�顯示變更檔案的檔案�和狀態"
 
-#: diff.c:5443
+#: diff.c:5394
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<寬度>[,<檔案�寬度>[,<次數>]]"
 
-#: diff.c:5444
+#: diff.c:5395
 msgid "generate diffstat"
 msgstr "生�差異統計（diffstat）"
 
-#: diff.c:5446 diff.c:5449 diff.c:5452
+#: diff.c:5397 diff.c:5400 diff.c:5403
 msgid "<width>"
 msgstr "<寬度>"
 
-#: diff.c:5447
+#: diff.c:5398
 msgid "generate diffstat with a given width"
 msgstr "使用�供的長度生�差異統計"
 
-#: diff.c:5450
+#: diff.c:5401
 msgid "generate diffstat with a given name width"
 msgstr "使用�供的檔案�長度生�差異統計"
 
-#: diff.c:5453
+#: diff.c:5404
 msgid "generate diffstat with a given graph width"
 msgstr "使用�供的圖形長度生�差異統計"
 
-#: diff.c:5455
+#: diff.c:5406
 msgid "<count>"
 msgstr "<次數>"
 
-#: diff.c:5456
+#: diff.c:5407
 msgid "generate diffstat with limited lines"
 msgstr "生�有�行數的差異統計"
 
-#: diff.c:5459
+#: diff.c:5410
 msgid "generate compact summary in diffstat"
 msgstr "生�差異統計的簡潔摘�"
 
-#: diff.c:5462
+#: diff.c:5413
 msgid "output a binary diff that can be applied"
 msgstr "輸出一個�以套用的二進�差異"
 
-#: diff.c:5465
+#: diff.c:5416
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行顯示完整的�後物件�稱"
 
-#: diff.c:5467
+#: diff.c:5418
 msgid "show colored diff"
 msgstr "顯示帶�色的差異"
 
-#: diff.c:5468
+#: diff.c:5419
 msgid "<kind>"
 msgstr "<é¡žåž‹>"
 
-#: diff.c:5469
+#: diff.c:5420
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "�於差異中的上下文�舊的和新的行，加亮顯示錯誤的空白字元"
 
-#: diff.c:5472
+#: diff.c:5423
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -3515,311 +3512,311 @@ msgstr ""
 "在 --raw 或者 --numstat 中，��路徑字元轉檔並使用 NUL 字元�為輸出欄�的分隔"
 "符"
 
-#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590
+#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
 msgid "<prefix>"
 msgstr "<�綴>"
 
-#: diff.c:5476
+#: diff.c:5427
 msgid "show the given source prefix instead of \"a/\""
 msgstr "顯示�供的來��綴，而� \"a/\""
 
-#: diff.c:5479
+#: diff.c:5430
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "顯示�供的目的地�綴�代 \"b/\""
 
-#: diff.c:5482
+#: diff.c:5433
 msgid "prepend an additional prefix to every line of output"
 msgstr "輸出的�一行附加�綴"
 
-#: diff.c:5485
+#: diff.c:5436
 msgid "do not show any source or destination prefix"
 msgstr "�顯示任何來�和目的地�綴"
 
-#: diff.c:5488
+#: diff.c:5439
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "顯示指定行數的差異�塊間的上下文"
 
-#: diff.c:5492 diff.c:5497 diff.c:5502
+#: diff.c:5443 diff.c:5448 diff.c:5453
 msgid "<char>"
 msgstr "<å­—å…ƒ>"
 
-#: diff.c:5493
+#: diff.c:5444
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一個字元�代 '+' 來表示新的一行"
 
-#: diff.c:5498
+#: diff.c:5449
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一個字元�代 '-' 來表示舊的一行"
 
-#: diff.c:5503
+#: diff.c:5454
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一個字元�代 ' ' 來表示一行上下文"
 
-#: diff.c:5506
+#: diff.c:5457
 msgid "Diff rename options"
 msgstr "差異�新命��項"
 
-#: diff.c:5507
+#: diff.c:5458
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5508
+#: diff.c:5459
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "將完全�寫的變更打破為��的刪除和建立"
 
-#: diff.c:5512
+#: diff.c:5463
 msgid "detect renames"
 msgstr "檢測�新命�"
 
-#: diff.c:5516
+#: diff.c:5467
 msgid "omit the preimage for deletes"
 msgstr "�略刪除變更的差異輸出"
 
-#: diff.c:5519
+#: diff.c:5470
 msgid "detect copies"
 msgstr "檢測複製"
 
-#: diff.c:5523
+#: diff.c:5474
 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的檔案�為發�拷�的來�"
 
-#: diff.c:5525
+#: diff.c:5476
 msgid "disable rename detection"
 msgstr "�用�新命��測"
 
-#: diff.c:5528
+#: diff.c:5479
 msgid "use empty blobs as rename source"
 msgstr "使用空的資料物件�為�新命�的來�"
 
-#: diff.c:5530
+#: diff.c:5481
 msgid "continue listing the history of a file beyond renames"
 msgstr "繼續列出檔案�新命�以外的歷�記錄"
 
-#: diff.c:5533
+#: diff.c:5484
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果�新命�/複製目標超��供的�制，�止�新命�/複製檢測"
 
-#: diff.c:5535
+#: diff.c:5486
 msgid "Diff algorithm options"
 msgstr "差異演算法�項"
 
-#: diff.c:5537
+#: diff.c:5488
 msgid "produce the smallest possible diff"
 msgstr "生�儘�能�的差異"
 
-#: diff.c:5540
+#: diff.c:5491
 msgid "ignore whitespace when comparing lines"
 msgstr "行比較時忽略空白字元"
 
-#: diff.c:5543
+#: diff.c:5494
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字元的變更"
 
-#: diff.c:5546
+#: diff.c:5497
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字元變更"
 
-#: diff.c:5549
+#: diff.c:5500
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的Enter符（CR）"
 
-#: diff.c:5552
+#: diff.c:5503
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的變更"
 
-#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624
+#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
 msgid "<regex>"
 msgstr "<正則>"
 
-#: diff.c:5555
+#: diff.c:5506
 msgid "ignore changes whose all lines match <regex>"
 msgstr "忽略整行符� <regex> 的變更"
 
-#: diff.c:5558
+#: diff.c:5509
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "啟發�轉�差異邊界以便閱讀"
 
-#: diff.c:5561
+#: diff.c:5512
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 演算法生�差異"
 
-#: diff.c:5565
+#: diff.c:5516
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 演算法生�差異"
 
-#: diff.c:5567
+#: diff.c:5518
 msgid "<algorithm>"
 msgstr "<演算法>"
 
-#: diff.c:5568
+#: diff.c:5519
 msgid "choose a diff algorithm"
 msgstr "�擇一個差異演算法"
 
-#: diff.c:5570
+#: diff.c:5521
 msgid "<text>"
 msgstr "<文字>"
 
-#: diff.c:5571
+#: diff.c:5522
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 演算法生�差異"
 
-#: diff.c:5573 diff.c:5582 diff.c:5585
+#: diff.c:5524 diff.c:5533 diff.c:5536
 msgid "<mode>"
 msgstr "<模�>"
 
-#: diff.c:5574
+#: diff.c:5525
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "顯示單詞差異，使用 <模�> 分隔變更的單詞"
 
-#: diff.c:5577
+#: diff.c:5528
 msgid "use <regex> to decide what a word is"
 msgstr "使用 <常�表示�> 確定何為一個詞"
 
-#: diff.c:5580
+#: diff.c:5531
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
 
-#: diff.c:5583
+#: diff.c:5534
 msgid "moved lines of code are colored differently"
 msgstr "移動的程�碼行用��方�著色"
 
-#: diff.c:5586
+#: diff.c:5537
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字元"
 
-#: diff.c:5589
+#: diff.c:5540
 msgid "Other diff options"
 msgstr "其它差異�項"
 
-#: diff.c:5591
+#: diff.c:5542
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "當從�目錄執行，排除目錄之外的變更並顯示相�路徑"
 
-#: diff.c:5595
+#: diff.c:5546
 msgid "treat all files as text"
 msgstr "把所有檔案當�文字處�"
 
-#: diff.c:5597
+#: diff.c:5548
 msgid "swap two inputs, reverse the diff"
 msgstr "交�兩個輸入，�轉差異"
 
-#: diff.c:5599
+#: diff.c:5550
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差異時離開碼為 1，�則為 0"
 
-#: diff.c:5601
+#: diff.c:5552
 msgid "disable all output of the program"
 msgstr "�用本程�的所有輸出"
 
-#: diff.c:5603
+#: diff.c:5554
 msgid "allow an external diff helper to be executed"
 msgstr "�許執行一個外部的差異�助工具"
 
-#: diff.c:5605
+#: diff.c:5556
 msgid "run external text conversion filters when comparing binary files"
 msgstr "當比較二進�檔案時，執行外部的文字轉��濾器"
 
-#: diff.c:5607
+#: diff.c:5558
 msgid "<when>"
 msgstr "<何時>"
 
-#: diff.c:5608
+#: diff.c:5559
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生�差異時，忽略�模組的更改"
 
-#: diff.c:5611
+#: diff.c:5562
 msgid "<format>"
 msgstr "<格�>"
 
-#: diff.c:5612
+#: diff.c:5563
 msgid "specify how differences in submodules are shown"
 msgstr "指定�模組的差異如何顯示"
 
-#: diff.c:5616
+#: diff.c:5567
 msgid "hide 'git add -N' entries from the index"
 msgstr "隱�索引中 'git add -N' �目"
 
-#: diff.c:5619
+#: diff.c:5570
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "將索引中 'git add -N' �目當�真實的"
 
-#: diff.c:5621
+#: diff.c:5572
 msgid "<string>"
 msgstr "<字串>"
 
-#: diff.c:5622
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "尋找改變了指定字串出�次數的差異"
 
-#: diff.c:5625
+#: diff.c:5576
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "尋找改變指定正則符�出�次數的差異"
 
-#: diff.c:5628
+#: diff.c:5579
 msgid "show all changes in the changeset with -S or -G"
 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
 
-#: diff.c:5631
+#: diff.c:5582
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "將 -S 的 <string> 當�延伸 POSIX 常�表示�"
 
-#: diff.c:5634
+#: diff.c:5585
 msgid "control the order in which files appear in the output"
 msgstr "控制輸出中的檔案顯示順�"
 
-#: diff.c:5635 diff.c:5638
+#: diff.c:5586 diff.c:5589
 msgid "<path>"
 msgstr "<路徑>"
 
-#: diff.c:5636
+#: diff.c:5587
 msgid "show the change in the specified path first"
 msgstr "先顯示指定路徑的變更"
 
-#: diff.c:5639
+#: diff.c:5590
 msgid "skip the output to the specified path"
 msgstr "略�輸出至指定路徑"
 
-#: diff.c:5641
+#: diff.c:5592
 msgid "<object-id>"
 msgstr "<物件 ID>"
 
-#: diff.c:5642
+#: diff.c:5593
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "尋找改變指定物件出�次數的差異"
 
-#: diff.c:5644
+#: diff.c:5595
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5645
+#: diff.c:5596
 msgid "select files by diff type"
 msgstr "��差異類型�擇檔案"
 
-#: diff.c:5647
+#: diff.c:5598
 msgid "<file>"
 msgstr "<檔案>"
 
-#: diff.c:5648
+#: diff.c:5599
 msgid "Output to a specific file"
 msgstr "輸出到一個指定的檔案"
 
-#: diff.c:6306
+#: diff.c:6257
 msgid "exhaustive rename detection was skipped due to too many files."
 msgstr "因為檔案太多，已略�詳細�新命��測。"
 
-#: diff.c:6309
+#: diff.c:6260
 msgid "only found copies from modified paths due to too many files."
 msgstr "因為檔案太多，�在修改的路徑中尋找複製。"
 
-#: diff.c:6312
+#: diff.c:6263
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3859,29 +3856,29 @@ msgstr "無法識別��模�：「%s�"
 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr "您的稀�簽出檔案�能有�題：「%s�樣��複"
 
-#: dir.c:830
+#: dir.c:828
 msgid "disabling cone pattern matching"
 msgstr "�用 cone 樣�符�模�"
 
-#: dir.c:1214
+#: dir.c:1212
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "�能將 %s 用作排除檔案"
 
-#: dir.c:2464
+#: dir.c:2418
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "�能開啟目錄 '%s'"
 
-#: dir.c:2766
+#: dir.c:2720
 msgid "failed to get kernel name and information"
 msgstr "無法�得核心�稱和訊�"
 
-#: dir.c:2890
+#: dir.c:2844
 msgid "untracked cache is disabled on this system or location"
 msgstr "快�未追蹤檔案在本系統或�置中被�用"
 
-#: dir.c:3158
+#: dir.c:3112
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -3889,36 +3886,36 @@ msgstr ""
 "無法猜到目錄�。\n"
 "請在指令列指定一個目錄"
 
-#: dir.c:3837
+#: dir.c:3800
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "版本庫 %s 中的索引檔案�壞"
 
-#: dir.c:3884 dir.c:3889
+#: dir.c:3847 dir.c:3852
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能為 %s 建立目錄"
 
-#: dir.c:3918
+#: dir.c:3881
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能從 '%s' �移 git 目錄到 '%s'"
 
-#: editor.c:77
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "�示：等待您的編輯器關閉檔案...%c"
 
-#: entry.c:177
+#: entry.c:179
 msgid "Filtering content"
 msgstr "�濾內容"
 
-#: entry.c:498
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "�能�檔案 '%s' 呼� stat"
 
-#: environment.c:143
+#: environment.c:145
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "錯誤的 git �字空間路徑 \"%s\""
@@ -3928,278 +3925,274 @@ msgstr "錯誤的 git �字空間路徑 \"%s\""
 msgid "too many args to run %s"
 msgstr "執行 %s 的�數太多"
 
-#: fetch-pack.c:193
+#: fetch-pack.c:194
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：應為 shallow 列表"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:197
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
 
-#: fetch-pack.c:207
+#: fetch-pack.c:208
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，�得到 flush 包"
 
-#: fetch-pack.c:227
+#: fetch-pack.c:228
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：應為 ACK/NAK，�得到 '%s'"
 
-#: fetch-pack.c:238
+#: fetch-pack.c:239
 msgid "unable to write to remote"
 msgstr "無法寫到�端"
 
-#: fetch-pack.c:299
-msgid "--stateless-rpc requires multi_ack_detailed"
-msgstr "--stateless-rpc 需� multi_ack_detailed"
-
-#: fetch-pack.c:394 fetch-pack.c:1434
+#: fetch-pack.c:395 fetch-pack.c:1439
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "無效的 shallow 訊�：%s"
 
-#: fetch-pack.c:400 fetch-pack.c:1440
+#: fetch-pack.c:401 fetch-pack.c:1445
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "無效的 unshallow 訊�：%s"
 
-#: fetch-pack.c:402 fetch-pack.c:1442
+#: fetch-pack.c:403 fetch-pack.c:1447
 #, c-format
 msgid "object not found: %s"
 msgstr "物件未找到：%s"
 
-#: fetch-pack.c:405 fetch-pack.c:1445
+#: fetch-pack.c:406 fetch-pack.c:1450
 #, c-format
 msgid "error in object: %s"
 msgstr "物件中發生錯誤：%s"
 
-#: fetch-pack.c:407 fetch-pack.c:1447
+#: fetch-pack.c:408 fetch-pack.c:1452
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未發� shallow：%s"
 
-#: fetch-pack.c:410 fetch-pack.c:1451
+#: fetch-pack.c:411 fetch-pack.c:1456
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "應為 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:450
+#: fetch-pack.c:451
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:467
+#: fetch-pack.c:468
 #, c-format
 msgid "invalid commit %s"
 msgstr "無效�交 %s"
 
-#: fetch-pack.c:498
+#: fetch-pack.c:499
 msgid "giving up"
 msgstr "放棄"
 
-#: fetch-pack.c:511 progress.c:339
+#: fetch-pack.c:512 progress.c:339
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:523
+#: fetch-pack.c:524
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:559
+#: fetch-pack.c:560
 #, c-format
 msgid "Marking %s as complete"
 msgstr "標記 %s 為完�"
 
-#: fetch-pack.c:774
+#: fetch-pack.c:775
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已經有 %s（%s）"
 
-#: fetch-pack.c:860
+#: fetch-pack.c:861
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：無法�生 sideband 多路輸出"
 
-#: fetch-pack.c:868
+#: fetch-pack.c:869
 msgid "protocol error: bad pack header"
 msgstr "�定錯誤：壞的包頭"
 
-#: fetch-pack.c:962
+#: fetch-pack.c:965
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：無法 fork %s 處�程�"
 
-#: fetch-pack.c:968
+#: fetch-pack.c:971
 msgid "fetch-pack: invalid index-pack output"
 msgstr "fetch-pack：無效的 index-pack 輸出"
 
-#: fetch-pack.c:985
+#: fetch-pack.c:988
 #, c-format
 msgid "%s failed"
 msgstr "%s 失敗"
 
-#: fetch-pack.c:987
+#: fetch-pack.c:990
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路輸出發生錯誤"
 
-#: fetch-pack.c:1030
+#: fetch-pack.c:1035
 #, c-format
 msgid "Server version is %.*s"
 msgstr "伺�器版本 %.*s"
 
-#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053
-#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069
-#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085
-#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
+#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
+#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
+#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
 #, c-format
 msgid "Server supports %s"
 msgstr "伺�器支� %s"
 
-#: fetch-pack.c:1040
+#: fetch-pack.c:1045
 msgid "Server does not support shallow clients"
 msgstr "伺�器�支� shallow 用戶端"
 
-#: fetch-pack.c:1100
+#: fetch-pack.c:1105
 msgid "Server does not support --shallow-since"
 msgstr "伺�器�支� --shallow-since"
 
-#: fetch-pack.c:1105
+#: fetch-pack.c:1110
 msgid "Server does not support --shallow-exclude"
 msgstr "伺�器�支� --shallow-exclude"
 
-#: fetch-pack.c:1109
+#: fetch-pack.c:1114
 msgid "Server does not support --deepen"
 msgstr "伺�器�支� --deepen"
 
-#: fetch-pack.c:1111
+#: fetch-pack.c:1116
 msgid "Server does not support this repository's object format"
 msgstr "伺�器�支�此版本庫的物件格�"
 
-#: fetch-pack.c:1124
+#: fetch-pack.c:1129
 msgid "no common commits"
 msgstr "沒有共�的�交"
 
-#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130
+#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
 msgid "source repository is shallow, reject to clone."
 msgstr "來�版本庫是淺版本庫 (shallow)。拒絕複製。"
 
-#: fetch-pack.c:1139 fetch-pack.c:1671
+#: fetch-pack.c:1144 fetch-pack.c:1681
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：�得失敗。"
 
-#: fetch-pack.c:1253
+#: fetch-pack.c:1258
 #, c-format
 msgid "mismatched algorithms: client %s; server %s"
 msgstr "算法�一致：用戶端 %s；伺�器 %s"
 
-#: fetch-pack.c:1257
+#: fetch-pack.c:1262
 #, c-format
 msgid "the server does not support algorithm '%s'"
 msgstr "伺�器�支�「%s�算法"
 
-#: fetch-pack.c:1290
+#: fetch-pack.c:1295
 msgid "Server does not support shallow requests"
 msgstr "伺�器�支� shallow 請求"
 
-#: fetch-pack.c:1297
+#: fetch-pack.c:1302
 msgid "Server supports filter"
 msgstr "伺�器支� filter"
 
-#: fetch-pack.c:1340 fetch-pack.c:2053
+#: fetch-pack.c:1345 fetch-pack.c:2063
 msgid "unable to write request to remote"
 msgstr "無法將請求寫到�端"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1363
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "讀�節標題 '%s' 發生錯誤"
 
-#: fetch-pack.c:1364
+#: fetch-pack.c:1369
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "�期 '%s'，得到 '%s'"
 
-#: fetch-pack.c:1398
+#: fetch-pack.c:1403
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "�外的確�行：'%s'"
 
-#: fetch-pack.c:1403
+#: fetch-pack.c:1408
 #, c-format
 msgid "error processing acks: %d"
 msgstr "處� ack 發生錯誤：%d"
 
-#: fetch-pack.c:1413
+#: fetch-pack.c:1418
 msgid "expected packfile to be sent after 'ready'"
 msgstr "�期在 'ready' 之後傳� packfile"
 
-#: fetch-pack.c:1415
+#: fetch-pack.c:1420
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在沒有 'ready' �應該傳�其它�節"
 
-#: fetch-pack.c:1456
+#: fetch-pack.c:1461
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "處�淺複製訊�發生錯誤：%d"
 
-#: fetch-pack.c:1505
+#: fetch-pack.c:1510
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "�期 wanted-ref，得到 '%s'"
 
-#: fetch-pack.c:1510
+#: fetch-pack.c:1515
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "�外的 wanted-ref：'%s'"
 
-#: fetch-pack.c:1515
+#: fetch-pack.c:1520
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "處���得的引用發生錯誤：%d"
 
-#: fetch-pack.c:1545
+#: fetch-pack.c:1550
 msgid "git fetch-pack: expected response end packet"
 msgstr "git fetch-pack: �期�有回應���包"
 
-#: fetch-pack.c:1949
+#: fetch-pack.c:1959
 msgid "no matching remote head"
 msgstr "沒有符�的�端分支"
 
-#: fetch-pack.c:1972 builtin/clone.c:581
+#: fetch-pack.c:1982 builtin/clone.c:581
 msgid "remote did not send all necessary objects"
 msgstr "�端沒有傳�所有必需的物件"
 
-#: fetch-pack.c:2075
+#: fetch-pack.c:2085
 msgid "unexpected 'ready' from remote"
 msgstr "從�端收到��期的 ‘ready’"
 
-#: fetch-pack.c:2098
+#: fetch-pack.c:2108
 #, c-format
 msgid "no such remote ref %s"
 msgstr "沒有這樣的�端引用 %s"
 
-#: fetch-pack.c:2101
+#: fetch-pack.c:2111
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "伺�器��許請求未公開的物件 %s"
 
-#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902
-#: gpg-interface.c:918
+#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
+#: gpg-interface.c:990
 msgid "could not create temporary file"
 msgstr "�能建立暫存檔"
 
-#: gpg-interface.c:332 gpg-interface.c:454
+#: gpg-interface.c:332 gpg-interface.c:460
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "無法將分離�簽�寫入 '%s'"
 
-#: gpg-interface.c:445
+#: gpg-interface.c:451
 msgid ""
 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
 "signature verification"
 msgstr "SSH 簽�驗證需�設定 gpg.ssh.allowedSignersFile，簽�檔案也�存在"
 
-#: gpg-interface.c:469
+#: gpg-interface.c:480
 msgid ""
 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
 "verification (available in openssh version 8.2p1+)"
@@ -4207,61 +4200,61 @@ msgstr ""
 "SSH 簽�驗證需� ssh-keygen -Y find-principals/verify（�以在 openssh 8.2p1+ "
 "版本使用）"
 
-#: gpg-interface.c:523
+#: gpg-interface.c:536
 #, c-format
 msgid "ssh signing revocation file configured but not found: %s"
 msgstr "有設定 SSH 簽�廢止檔案，但找�到檔案本體：%s"
 
-#: gpg-interface.c:576
+#: gpg-interface.c:624
 #, c-format
 msgid "bad/incompatible signature '%s'"
 msgstr "簽�「%s��壞或者�相容"
 
-#: gpg-interface.c:735 gpg-interface.c:740
+#: gpg-interface.c:801 gpg-interface.c:806
 #, c-format
 msgid "failed to get the ssh fingerprint for key '%s'"
 msgstr "無法�得「%s�金鑰的 SSH 指紋"
 
-#: gpg-interface.c:762
+#: gpg-interface.c:829
 msgid ""
 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
 msgstr "需�設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
 
-#: gpg-interface.c:780
+#: gpg-interface.c:851
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand 執行�功，但沒回傳按�：%s %s"
 
-#: gpg-interface.c:786
+#: gpg-interface.c:857
 #, c-format
 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
 msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
 
-#: gpg-interface.c:874
+#: gpg-interface.c:945
 msgid "gpg failed to sign the data"
 msgstr "gpg 無法為資料簽�"
 
-#: gpg-interface.c:895
+#: gpg-interface.c:967
 msgid "user.signingkey needs to be set for ssh signing"
 msgstr "需�設定 user.signingkey �能進行 SSH 簽�"
 
-#: gpg-interface.c:906
+#: gpg-interface.c:978
 #, c-format
 msgid "failed writing ssh signing key to '%s'"
 msgstr "無法將 SSH 簽�金鑰寫入「%s�"
 
-#: gpg-interface.c:924
+#: gpg-interface.c:996
 #, c-format
 msgid "failed writing ssh signing key buffer to '%s'"
 msgstr "無法將 SSH 簽�金鑰緩��寫入「%s�"
 
-#: gpg-interface.c:942
+#: gpg-interface.c:1014
 msgid ""
 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
 "8.2p1+)"
 msgstr "SSH 簽�需� ssh-keygen -Y sign（�以在 openssh 8.2p1+ 版本使用）"
 
-#: gpg-interface.c:954
+#: gpg-interface.c:1026
 #, c-format
 msgid "failed reading ssh signing data buffer from '%s'"
 msgstr "無法從「%s�讀� SSH 簽�資料緩��"
@@ -4271,7 +4264,7 @@ msgstr "無法從「%s�讀� SSH 簽�資料緩��"
 msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "已忽略 log.graphColors 中無效的 “%.*s� 色彩"
 
-#: grep.c:533
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -4279,18 +4272,18 @@ msgstr ""
 "�供的模�包� NULL 字元（通� -f <檔案> �數）。�有 PCRE v2 下的 -P 支�此"
 "功能"
 
-#: grep.c:1928
+#: grep.c:1942
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：無法讀� %s"
 
-#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90
+#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
 #: builtin/rm.c:136
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "� '%s' 呼� stat 失敗"
 
-#: grep.c:1956
+#: grep.c:1970
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：讀��完整"
@@ -4411,8 +4404,8 @@ msgstr "�定你想�的是 '%s' 並繼續。"
 
 #: help.c:646
 #, c-format
-msgid "Run '%s' instead? (y/N)"
-msgstr "改執行「%s�？(y/N)"
+msgid "Run '%s' instead [y/N]? "
+msgstr "改執行「%s�[y/N]？ "
 
 #: help.c:654
 #, c-format
@@ -4628,7 +4621,7 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"
 msgid "quoted CRLF detected"
 msgstr "�測到由�列�字元 (quoted) 所組�的 CRLF"
 
-#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46
+#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
 #, c-format
 msgid "bad action '%s' for '%s'"
 msgstr "「%s�動作�「%s�無效"
@@ -4851,7 +4844,7 @@ msgstr "�模組"
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "��（%s）：�併��於 %s"
 
-#: merge-ort.c:3856
+#: merge-ort.c:3869
 #, c-format
 msgid ""
 "CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
@@ -4860,7 +4853,7 @@ msgstr ""
 "��（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
 "上。"
 
-#: merge-ort.c:4152
+#: merge-ort.c:4165
 #, c-format
 msgid ""
 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4870,7 +4863,7 @@ msgstr "註：%s �是最新且干擾到簽出��版本。已將舊拷��
 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
 #. base, and 2-3) the trees for the two trees we're merging.
 #.
-#: merge-ort.c:4521
+#: merge-ort.c:4534
 #, c-format
 msgid "collecting merge info failed for trees %s, %s, %s"
 msgstr "%s, %s, %s 樹的�併資訊收集失敗"
@@ -4884,7 +4877,7 @@ msgstr ""
 "您�下列檔案的本機修改將被�併動作覆蓋：\n"
 "  %s"
 
-#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403
+#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
 msgid "Already up to date."
 msgstr "已經是最新的。"
 
@@ -5159,7 +5152,7 @@ msgstr "�併未返回�交"
 msgid "Could not parse object '%s'"
 msgstr "�能解�物件 '%s'"
 
-#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904
+#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
 #: builtin/stash.c:489
 msgid "Unable to write index."
 msgstr "�能寫入索引。"
@@ -5168,8 +5161,8 @@ msgstr "�能寫入索引。"
 msgid "failed to read the cache"
 msgstr "讀�快�失敗"
 
-#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967
-#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706
+#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
+#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
 #: builtin/stash.c:269
 msgid "unable to write new index file"
 msgstr "無法寫新的索引檔案"
@@ -5178,211 +5171,211 @@ msgstr "無法寫新的索引檔案"
 msgid "multi-pack-index OID fanout is of the wrong size"
 msgstr "多包索引的物件 ID fanout 大�錯誤"
 
-#: midx.c:109
+#: midx.c:111
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "多包索引檔案 %s 太�"
 
-#: midx.c:125
+#: midx.c:127
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "多包索引簽� 0x%08x 和簽� 0x%08x �符�"
 
-#: midx.c:130
+#: midx.c:132
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index 版本 %d �能被識別"
 
-#: midx.c:135
+#: midx.c:137
 #, c-format
 msgid "multi-pack-index hash version %u does not match version %u"
 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u �符�"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "多包索引缺少必需的包��塊"
 
-#: midx.c:154
+#: midx.c:156
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "多包索引缺少必需的物件 ID fanout �塊"
 
-#: midx.c:156
+#: midx.c:158
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "多包索引缺少必需的物件 ID 查詢�塊"
 
-#: midx.c:158
+#: midx.c:160
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "多包索引缺少必需的物件�移�塊"
 
-#: midx.c:174
+#: midx.c:176
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "多包索引包�無�：'%s' 在 '%s' 之�"
 
-#: midx.c:221
+#: midx.c:224
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
 
-#: midx.c:271
+#: midx.c:274
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "多包索引儲存一個64��移，但是 off_t 太�"
 
-#: midx.c:502
+#: midx.c:505
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "新增 packfile '%s' 失敗"
 
-#: midx.c:508
+#: midx.c:511
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "開啟包索引 '%s' 失敗"
 
-#: midx.c:576
+#: midx.c:579
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "在 packfile 中定�物件 %d 失敗"
 
-#: midx.c:892
+#: midx.c:895
 msgid "cannot store reverse index file"
 msgstr "無法儲存倒排索引檔案"
 
-#: midx.c:990
+#: midx.c:993
 #, c-format
 msgid "could not parse line: %s"
 msgstr "無法解�橫列：%s"
 
-#: midx.c:992
+#: midx.c:995
 #, c-format
 msgid "malformed line: %s"
 msgstr "橫列格�錯誤：%s"
 
-#: midx.c:1159
+#: midx.c:1162
 msgid "ignoring existing multi-pack-index; checksum mismatch"
 msgstr "忽略�有的多包索引：總和檢查碼�符"
 
-#: midx.c:1184
+#: midx.c:1187
 msgid "could not load pack"
 msgstr "無法載入包"
 
-#: midx.c:1190
+#: midx.c:1193
 #, c-format
 msgid "could not open index for %s"
 msgstr "無法開啟 %s 的索引"
 
-#: midx.c:1201
+#: midx.c:1204
 msgid "Adding packfiles to multi-pack-index"
 msgstr "正在新增 packfile 至多包索引"
 
-#: midx.c:1244
+#: midx.c:1247
 #, c-format
 msgid "unknown preferred pack: '%s'"
 msgstr "未知�好包：「%s�"
 
-#: midx.c:1289
+#: midx.c:1292
 #, c-format
 msgid "cannot select preferred pack %s with no objects"
 msgstr "無法���好，沒有物件的 %s 包"
 
-#: midx.c:1321
+#: midx.c:1324
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "沒有看到��棄的包檔案 %s"
 
-#: midx.c:1367
+#: midx.c:1370
 #, c-format
 msgid "preferred pack '%s' is expired"
 msgstr "�好包「%s�已經�期"
 
-#: midx.c:1380
+#: midx.c:1383
 msgid "no pack files to index."
 msgstr "沒有�索引的 pack 檔案。"
 
-#: midx.c:1417
+#: midx.c:1420
 msgid "could not write multi-pack bitmap"
 msgstr "無法寫入多包�圖"
 
-#: midx.c:1427
+#: midx.c:1430
 msgid "could not write multi-pack-index"
 msgstr "無法寫入多包索引"
 
-#: midx.c:1486 builtin/clean.c:37
+#: midx.c:1489 builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "刪除 %s 失敗"
 
-#: midx.c:1517
+#: midx.c:1522
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "清��於 %s 的多包索引失敗"
 
-#: midx.c:1577
+#: midx.c:1585
 msgid "multi-pack-index file exists, but failed to parse"
 msgstr "有 multi-pack-index 檔案，但無法解�"
 
-#: midx.c:1585
+#: midx.c:1593
 msgid "incorrect checksum"
 msgstr "總和檢查碼�正確"
 
-#: midx.c:1588
+#: midx.c:1596
 msgid "Looking for referenced packfiles"
 msgstr "正在尋找引用的 packfile"
 
-#: midx.c:1603
+#: midx.c:1611
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "物件 ID 扇出無�：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1608
+#: midx.c:1616
 msgid "the midx contains no oid"
 msgstr "midx 沒有 oid"
 
-#: midx.c:1617
+#: midx.c:1625
 msgid "Verifying OID order in multi-pack-index"
 msgstr "正在驗證多包索引中的物件 ID 順�"
 
-#: midx.c:1626
+#: midx.c:1634
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "物件 ID 查詢無�：oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1646
+#: midx.c:1654
 msgid "Sorting objects by packfile"
 msgstr "�� packfile 為物件排�"
 
-#: midx.c:1653
+#: midx.c:1661
 msgid "Verifying object offsets"
 msgstr "正在驗證物件�移"
 
-#: midx.c:1669
+#: midx.c:1677
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "為 oid[%d] = %s 載入包�目失敗"
 
-#: midx.c:1675
+#: midx.c:1683
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "為 packfile %s 載入包索引失敗"
 
-#: midx.c:1684
+#: midx.c:1692
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s 錯誤的物件�移：%<PRIx64> != %<PRIx64>"
 
-#: midx.c:1709
+#: midx.c:1719
 msgid "Counting referenced objects"
 msgstr "正在計算引用物件"
 
-#: midx.c:1719
+#: midx.c:1729
 msgid "Finding and deleting unreferenced packfiles"
 msgstr "正在尋找並刪除沒有引用的 packfile"
 
-#: midx.c:1911
+#: midx.c:1921
 msgid "could not start pack-objects"
 msgstr "�能開始 pack-objects"
 
-#: midx.c:1931
+#: midx.c:1941
 msgid "could not finish pack-objects"
 msgstr "�能�� pack-objects"
 
@@ -5440,257 +5433,257 @@ msgstr "拒絕� %s（在 refs/notes/ 之外）寫入註解"
 msgid "Bad %s value: '%s'"
 msgstr "壞的 %s 值：'%s'"
 
-#: object-file.c:459
+#: object-file.c:456
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr "物件目錄 %s �存在，檢查 .git/objects/info/alternates"
 
-#: object-file.c:517
+#: object-file.c:514
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "無法�範化備用物件路徑：%s"
 
-#: object-file.c:591
+#: object-file.c:588
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr "%s：忽略備用物件庫，嵌套太深"
 
-#: object-file.c:598
+#: object-file.c:595
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "無法�範化物件目錄: %s"
 
-#: object-file.c:641
+#: object-file.c:638
 msgid "unable to fdopen alternates lockfile"
 msgstr "無法 fdopen �代鎖檔案"
 
-#: object-file.c:659
+#: object-file.c:656
 msgid "unable to read alternates file"
 msgstr "無法讀�替代檔案"
 
-#: object-file.c:666
+#: object-file.c:663
 msgid "unable to move new alternates file into place"
 msgstr "無法將新的替代檔案移動到�"
 
-#: object-file.c:701
+#: object-file.c:741
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路徑 '%s' �存在"
 
-#: object-file.c:722
+#: object-file.c:762
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚�支�將引用版本庫 '%s' 作為一個連�簽出。"
 
-#: object-file.c:728
+#: object-file.c:768
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "引用版本庫 '%s' �是一個本機版本庫。"
 
-#: object-file.c:734
+#: object-file.c:774
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "引用版本庫 '%s' 是一個淺複製"
 
-#: object-file.c:742
+#: object-file.c:782
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "引用版本庫 '%s' 已被移�"
 
-#: object-file.c:773
+#: object-file.c:813
 #, c-format
 msgid "could not find object directory matching %s"
 msgstr "找�到符� %s 的物件目錄"
 
-#: object-file.c:823
+#: object-file.c:863
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "解�備用引用時無效的行：%s"
 
-#: object-file.c:973
+#: object-file.c:1013
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "嘗試 mmap %<PRIuMAX>，超�了最大值 %<PRIuMAX>"
 
-#: object-file.c:1008
+#: object-file.c:1048
 #, c-format
 msgid "mmap failed%s"
 msgstr "mmap 失敗%s"
 
-#: object-file.c:1174
+#: object-file.c:1214
 #, c-format
 msgid "object file %s is empty"
 msgstr "物件檔案 %s 為空"
 
-#: object-file.c:1293 object-file.c:2499
+#: object-file.c:1333 object-file.c:2542
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "�壞的鬆散物件 '%s'"
 
-#: object-file.c:1295 object-file.c:2503
+#: object-file.c:1335 object-file.c:2546
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "鬆散物件 '%s' 後�有垃圾資料"
 
-#: object-file.c:1417
+#: object-file.c:1457
 #, c-format
 msgid "unable to parse %s header"
 msgstr "無法解� %s 頭部"
 
-#: object-file.c:1419
+#: object-file.c:1459
 msgid "invalid object type"
 msgstr "無效的物件類型"
 
-#: object-file.c:1430
+#: object-file.c:1470
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "無法解開 %s 頭部"
 
-#: object-file.c:1434
+#: object-file.c:1474
 #, c-format
 msgid "header for %s too long, exceeds %d bytes"
 msgstr "%s 的標頭�長，超出 %d �元組"
 
-#: object-file.c:1664
+#: object-file.c:1704
 #, c-format
 msgid "failed to read object %s"
 msgstr "讀�物件 %s 失敗"
 
-#: object-file.c:1668
+#: object-file.c:1708
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "找�到 %2$s 的替代 %1$s"
 
-#: object-file.c:1672
+#: object-file.c:1712
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "鬆散物件 %s（儲存在 %s）已�壞"
 
-#: object-file.c:1676
+#: object-file.c:1716
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "打包物件 %s（儲存在 %s）已�壞"
 
-#: object-file.c:1781
+#: object-file.c:1821
 #, c-format
 msgid "unable to write file %s"
 msgstr "無法寫檔案 %s"
 
-#: object-file.c:1788
+#: object-file.c:1828
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "無法為 '%s' 設定權�"
 
-#: object-file.c:1795
+#: object-file.c:1835
 msgid "file write error"
 msgstr "檔案寫錯誤"
 
-#: object-file.c:1815
+#: object-file.c:1858
 msgid "error when closing loose object file"
 msgstr "關閉鬆散物件檔案時發生錯誤"
 
-#: object-file.c:1882
+#: object-file.c:1925
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr "權��足，無法在版本庫物件庫 %s 中新增物件"
 
-#: object-file.c:1884
+#: object-file.c:1927
 msgid "unable to create temporary file"
 msgstr "無法建立暫存檔"
 
-#: object-file.c:1908
+#: object-file.c:1951
 msgid "unable to write loose object file"
 msgstr "�能寫鬆散物件檔案"
 
-#: object-file.c:1914
+#: object-file.c:1957
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "�能壓縮新物件 %s（%d）"
 
-#: object-file.c:1918
+#: object-file.c:1961
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "在物件 %s 上呼� deflateEnd 失敗（%d）"
 
-#: object-file.c:1922
+#: object-file.c:1965
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "被 %s 的�穩定物件來�資料混淆"
 
-#: object-file.c:1933 builtin/pack-objects.c:1243
+#: object-file.c:1976 builtin/pack-objects.c:1243
 #, c-format
 msgid "failed utime() on %s"
 msgstr "在 %s 上呼� utime() 失敗"
 
-#: object-file.c:2011
+#: object-file.c:2054
 #, c-format
 msgid "cannot read object for %s"
 msgstr "�能讀�物件 %s"
 
-#: object-file.c:2062
+#: object-file.c:2105
 msgid "corrupt commit"
 msgstr "�壞的�交"
 
-#: object-file.c:2070
+#: object-file.c:2113
 msgid "corrupt tag"
 msgstr "�壞的標籤"
 
-#: object-file.c:2170
+#: object-file.c:2213
 #, c-format
 msgid "read error while indexing %s"
 msgstr "索引 %s 時讀�錯誤"
 
-#: object-file.c:2173
+#: object-file.c:2216
 #, c-format
 msgid "short read while indexing %s"
 msgstr "索引 %s 時讀入�完整"
 
-#: object-file.c:2246 object-file.c:2256
+#: object-file.c:2289 object-file.c:2299
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s：�入資料庫失敗"
 
-#: object-file.c:2262
+#: object-file.c:2305
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s：�支�的檔案類型"
 
-#: object-file.c:2286 builtin/fetch.c:1445
+#: object-file.c:2329 builtin/fetch.c:1453
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s �是一個有效的物件"
 
-#: object-file.c:2288
+#: object-file.c:2331
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s �是一個有效的 '%s' 物件"
 
-#: object-file.c:2315
+#: object-file.c:2358
 #, c-format
 msgid "unable to open %s"
 msgstr "�能開啟 %s"
 
-#: object-file.c:2510
+#: object-file.c:2553
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "%s 的雜湊值�符�（�期 %s）"
 
-#: object-file.c:2533
+#: object-file.c:2576
 #, c-format
 msgid "unable to mmap %s"
 msgstr "�能 mmap %s"
 
-#: object-file.c:2539
+#: object-file.c:2582
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "無法解壓縮 %s 的頭部"
 
-#: object-file.c:2544
+#: object-file.c:2587
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "無法解� %s 的頭部"
 
-#: object-file.c:2555
+#: object-file.c:2598
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "無法解壓縮 %s 的內容"
@@ -5817,25 +5810,25 @@ msgstr "�能解�物件：%s"
 msgid "hash mismatch %s"
 msgstr "雜湊值與 %s �符�"
 
-#: pack-bitmap.c:348
+#: pack-bitmap.c:353
 msgid "multi-pack bitmap is missing required reverse index"
 msgstr "多包�圖缺少需�的��索引"
 
-#: pack-bitmap.c:424
+#: pack-bitmap.c:429
 msgid "load_reverse_index: could not open pack"
 msgstr "load_reverse_index：無法開啟包"
 
-#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424
+#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424
 #, c-format
 msgid "unable to get size of %s"
 msgstr "�能得到 %s 的大�"
 
-#: pack-bitmap.c:1916
+#: pack-bitmap.c:1935
 #, c-format
 msgid "could not find %s in pack %s at offset %<PRIuMAX>"
 msgstr "找�到 %2$s 包，�移�置 %3$<PRIuMAX> 的 %1$s"
 
-#: pack-bitmap.c:1952 builtin/rev-list.c:92
+#: pack-bitmap.c:1971 builtin/rev-list.c:92
 #, c-format
 msgid "unable to get disk usage of %s"
 msgstr "無法�得 %s 的�碟用�"
@@ -5884,45 +5877,50 @@ msgstr "無法讓 %s 能夠寫入"
 msgid "could not write '%s' promisor file"
 msgstr "無法寫入「%s�promisor 檔案"
 
-#: packfile.c:626
+#: packfile.c:627
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在 packfile ��之�（�壞的 .idx？）"
 
-#: packfile.c:656
+#: packfile.c:657
 #, c-format
 msgid "packfile %s cannot be mapped%s"
 msgstr "包檔案 %s 無法映射%s"
 
-#: packfile.c:1923
+#: packfile.c:1924
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引開始之�（�壞的索引？）"
 
-#: packfile.c:1927
+#: packfile.c:1928
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "�移�越�了 %s 的包索引的�尾（被截斷的索引？）"
 
-#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175
+#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175
 #, c-format
 msgid "option `%s' expects a numerical value"
 msgstr "�項 `%s' 期望一個數字值"
 
-#: parse-options-cb.c:41
+#: parse-options-cb.c:42
 #, c-format
 msgid "malformed expiration date '%s'"
 msgstr "格�錯誤的到期時間：'%s'"
 
-#: parse-options-cb.c:54
+#: parse-options-cb.c:55
 #, c-format
 msgid "option `%s' expects \"always\", \"auto\", or \"never\""
 msgstr "�項 `%s' 期望 \"always\"�\"auto\" 或 \"never\""
 
-#: parse-options-cb.c:132 parse-options-cb.c:149
+#: parse-options-cb.c:133 parse-options-cb.c:150
 #, c-format
 msgid "malformed object name '%s'"
 msgstr "格�錯誤的物件� '%s'"
 
+#: parse-options-cb.c:307
+#, c-format
+msgid "option `%s' expects \"%s\" or \"%s\""
+msgstr "�項「%s�期望「%s�或「%s�"
+
 #: parse-options.c:58
 #, c-format
 msgid "%s requires a value"
@@ -5958,36 +5956,36 @@ msgstr "%s 期望一個�負整數和一個��的 k/m/g 後綴"
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "有歧義的�項：%s（�以是 --%s%s 或 --%s%s）"
 
-#: parse-options.c:427 parse-options.c:435
+#: parse-options.c:428 parse-options.c:436
 #, c-format
 msgid "did you mean `--%s` (with two dashes)?"
 msgstr "你的��是 `--%s`（有兩個短線）嗎？"
 
-#: parse-options.c:677 parse-options.c:1053
+#: parse-options.c:678 parse-options.c:1054
 #, c-format
 msgid "alias of --%s"
 msgstr "--%s 的別�"
 
-#: parse-options.c:891
+#: parse-options.c:892
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知�項 `%s'"
 
-#: parse-options.c:893
+#: parse-options.c:894
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "未知開關 `%c'"
 
-#: parse-options.c:895
+#: parse-options.c:896
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "字串中未知的� ascii 字元�項：`%s'"
 
-#: parse-options.c:919
+#: parse-options.c:920
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:933
+#: parse-options.c:934
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -5995,7 +5993,7 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:948
+#: parse-options.c:949
 #, c-format
 msgid "   or: %s"
 msgstr "   或：%s"
@@ -6019,18 +6017,18 @@ msgstr "   或：%s"
 #. translated) N_() usage string, which contained embedded
 #. newlines before we split it up.
 #.
-#: parse-options.c:969
+#: parse-options.c:970
 #, c-format
 msgid "%*s%s"
 msgstr "%*s%s"
 
 #  譯者：為�證在輸出中�齊，注�調整�中空格�
-#: parse-options.c:992
+#: parse-options.c:993
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:1039
+#: parse-options.c:1040
 msgid "-NUM"
 msgstr "-數字"
 
@@ -6156,17 +6154,17 @@ msgstr "讀�錯誤"
 msgid "the remote end hung up unexpectedly"
 msgstr "�端�外掛斷了"
 
-#: pkt-line.c:390 pkt-line.c:392
+#: pkt-line.c:417 pkt-line.c:419
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "�定錯誤：錯誤的行長度字串：%.4s"
 
-#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417
+#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "�定錯誤：錯誤的行長度 %d"
 
-#: pkt-line.c:434 sideband.c:165
+#: pkt-line.c:472 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "�端錯誤：%s"
@@ -6217,7 +6215,7 @@ msgstr "�能啟動 `log`"
 msgid "could not read `log` output"
 msgstr "�能讀� `log` 的輸出"
 
-#: range-diff.c:97 sequencer.c:5605
+#: range-diff.c:97 sequencer.c:5602
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "�能解��交 '%s'"
@@ -6238,59 +6236,55 @@ msgstr "無法解� git 頭 '%.*s'"
 msgid "failed to generate diff"
 msgstr "生� diff 失敗"
 
-#: range-diff.c:559
-msgid "--left-only and --right-only are mutually exclusive"
-msgstr "--left-only 和 --right-only 互斥"
-
 #: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "�能解� '%s' 的日誌"
 
-#: read-cache.c:710
+#: read-cache.c:723
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "將�會新增檔案別� '%s'（'%s' 已經存在於索引中）"
 
-#: read-cache.c:726
+#: read-cache.c:739
 msgid "cannot create an empty blob in the object database"
 msgstr "�能在物件資料庫中建立空的資料物件"
 
-#: read-cache.c:748
+#: read-cache.c:761
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s：�能新增一般檔案�符號連�或 git 目錄"
 
-#: read-cache.c:753 builtin/submodule--helper.c:3241
+#: read-cache.c:766 builtin/submodule--helper.c:3242
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' 沒有簽出一個�交"
 
-#: read-cache.c:805
+#: read-cache.c:818
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "無法索引檔案 '%s'"
 
-#: read-cache.c:824
+#: read-cache.c:837
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "無法在索引中新增 '%s'"
 
-#: read-cache.c:835
+#: read-cache.c:848
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "無法� %s 執行 stat"
 
-#: read-cache.c:1373
+#: read-cache.c:1386
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' 看起來既是檔案�是目錄"
 
-#: read-cache.c:1588
+#: read-cache.c:1601
 msgid "Refresh index"
 msgstr "�新整�索引"
 
-#: read-cache.c:1720
+#: read-cache.c:1733
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -6299,7 +6293,7 @@ msgstr ""
 "設定了 index.version，但是�值無效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1730
+#: read-cache.c:1743
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -6308,144 +6302,144 @@ msgstr ""
 "設定了 GIT_INDEX_VERSION，但是�值無效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1786
+#: read-cache.c:1799
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "壞的簽� 0x%08x"
 
-#: read-cache.c:1789
+#: read-cache.c:1802
 #, c-format
 msgid "bad index version %d"
 msgstr "壞的索引版本 %d"
 
-#: read-cache.c:1798
+#: read-cache.c:1811
 msgid "bad index file sha1 signature"
 msgstr "壞的索引檔案 sha1 簽�"
 
-#: read-cache.c:1832
+#: read-cache.c:1845
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "索引使用�被支�的 %.4s 副檔�"
 
 #
-#: read-cache.c:1834
+#: read-cache.c:1847
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "忽略 %.4s 副檔�"
 
-#: read-cache.c:1871
+#: read-cache.c:1884
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "未知的索引�目格� 0x%08x"
 
-#: read-cache.c:1887
+#: read-cache.c:1900
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "索引中�近路徑 '%s' 有錯誤的�稱欄�"
 
-#: read-cache.c:1944
+#: read-cache.c:1957
 msgid "unordered stage entries in index"
 msgstr "索引中有未排�的暫存�目"
 
-#: read-cache.c:1947
+#: read-cache.c:1960
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "�併檔案 '%s' 有多個暫存�目"
 
-#: read-cache.c:1950
+#: read-cache.c:1963
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' 的未排�暫存�目"
 
-#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095
-#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183
-#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987
+#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183
+#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013
 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519
-#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293
-#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201
+#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293
+#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202
 msgid "index file corrupt"
 msgstr "索引檔案�壞"
 
-#: read-cache.c:2209
+#: read-cache.c:2222
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "無法建立 load_cache_entries 執行緒：%s"
 
-#: read-cache.c:2222
+#: read-cache.c:2235
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "無法加入 load_cache_entries 執行緒：%s"
 
-#: read-cache.c:2255
+#: read-cache.c:2268
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s：開啟索引檔案失敗"
 
-#: read-cache.c:2259
+#: read-cache.c:2272
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s：�能�開啟的索引執行 stat 動作"
 
-#: read-cache.c:2263
+#: read-cache.c:2276
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s：索引檔案比�期的�"
 
-#: read-cache.c:2267
+#: read-cache.c:2280
 #, c-format
 msgid "%s: unable to map index file%s"
 msgstr "%s：無法 map 索引檔案%s"
 
-#: read-cache.c:2310
+#: read-cache.c:2323
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "無法建立 load_index_extensions 執行緒：%s"
 
-#: read-cache.c:2337
+#: read-cache.c:2350
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "無法加入 load_index_extensions 執行緒：%s"
 
-#: read-cache.c:2375
+#: read-cache.c:2396
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "無法�新整�共享索引 '%s'"
 
-#: read-cache.c:2434
+#: read-cache.c:2455
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "�壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
 
-#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147
+#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150
 #, c-format
 msgid "could not close '%s'"
 msgstr "�能關閉 '%s'"
 
-#: read-cache.c:3108
+#: read-cache.c:3129
 msgid "failed to convert to a sparse-index"
 msgstr "無法轉��稀�索引"
 
-#: read-cache.c:3179
+#: read-cache.c:3200
 #, c-format
 msgid "could not stat '%s'"
 msgstr "�能� '%s' 呼� stat"
 
-#: read-cache.c:3192
+#: read-cache.c:3213
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能開啟 git 目錄：%s"
 
-#: read-cache.c:3204
+#: read-cache.c:3225
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "無法刪除：%s"
 
-#: read-cache.c:3233
+#: read-cache.c:3254
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "�能修復 '%s' 的權��"
 
-#: read-cache.c:3390
+#: read-cache.c:3411
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s：�能�到暫存� #0"
@@ -6556,8 +6550,8 @@ msgstr ""
 "然而，如果您刪除全部內容，�定基底動作將會終止。\n"
 "\n"
 
-#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888
-#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789
+#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883
+#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791
 #: builtin/rebase.c:190
 #, c-format
 msgid "could not write '%s'"
@@ -6598,7 +6592,7 @@ msgstr ""
 msgid "%s: 'preserve' superseded by 'merges'"
 msgstr "%s：「preserve�已經改�「merges�"
 
-#: ref-filter.c:42 wt-status.c:2036
+#: ref-filter.c:42 wt-status.c:2048
 msgid "gone"
 msgstr "�失"
 
@@ -6637,7 +6631,8 @@ msgstr "期望整數值 refname:lstrip=%s"
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整數值 refname:rstrip=%s"
 
-#: ref-filter.c:265
+#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431
+#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "無法識別的 %%(%s) �數：%s"
@@ -6647,11 +6642,6 @@ msgstr "無法識別的 %%(%s) �數：%s"
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) �帶�數"
 
-#: ref-filter.c:344
-#, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "無法識別的 %%(objectsize) �數：%s"
-
 #: ref-filter.c:352
 #, c-format
 msgid "%%(deltabase) does not take arguments"
@@ -6662,11 +6652,6 @@ msgstr "%%(deltabase) �帶�數"
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) �帶�數"
 
-#: ref-filter.c:377
-#, c-format
-msgid "unrecognized %%(subject) argument: %s"
-msgstr "無法識別的 %%(subject) 引數：%s"
-
 #: ref-filter.c:396
 #, c-format
 msgid "expected %%(trailers:key=<value>)"
@@ -6682,26 +6667,11 @@ msgstr "未知的 %%(trailers) �數：%s"
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一個正數 contents:lines=%s"
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "無法識別的 %%(contents) �數：%s"
-
-#: ref-filter.c:443
-#, c-format
-msgid "unrecognized %%(raw) argument: %s"
-msgstr "無法識別的 %%(raw) 引數：%s"
-
 #: ref-filter.c:458
 #, c-format
 msgid "positive value expected '%s' in %%(%s)"
 msgstr "%%(%2$s) 中的 '%1$s' �期是正數值"
 
-#: ref-filter.c:462
-#, c-format
-msgid "unrecognized argument '%s' in %%(%s)"
-msgstr "無法識別 %%(%2$s) 中的 '%1$s' �數"
-
 #: ref-filter.c:476
 #, c-format
 msgid "unrecognized email option: %s"
@@ -6722,21 +6692,11 @@ msgstr "無法識別的�置：%s"
 msgid "unrecognized width:%s"
 msgstr "無法識別的寬度：%s"
 
-#: ref-filter.c:534
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
-msgstr "無法識別的 %%(align) �數：%s"
-
 #: ref-filter.c:542
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需�一個正數的寬度"
 
-#: ref-filter.c:560
-#, c-format
-msgid "unrecognized %%(if) argument: %s"
-msgstr "無法識別的 %%(if) �數：%s"
-
 #: ref-filter.c:568
 #, c-format
 msgid "%%(rest) does not take arguments"
@@ -6758,15 +6718,10 @@ msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "�是一個 git 版本庫，但是欄� '%.*s' 需�存�物件資料"
 
-#: ref-filter.c:844
-#, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(if) 元素而沒有 %%(then) 元素"
-
-#: ref-filter.c:910
+#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948
 #, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(then) 元素而沒有 %%(if) 元素"
+msgid "format: %%(%s) atom used without a %%(%s) atom"
+msgstr "format：使用 %%(%s) 元素�缺少 %%(%s) 元素"
 
 #: ref-filter.c:912
 #, c-format
@@ -6778,16 +6733,6 @@ msgstr "格�：%%(then) 元素用了多次"
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格�：%%(then) 元素用在了 %%(else) 之後"
 
-#: ref-filter.c:946
-#, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
-msgstr "格�：使用了 %%(else) 元素而沒有 %%(if) 元素"
-
-#: ref-filter.c:948
-#, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
-msgstr "格�：使用了 %%(else) 元素而沒有 %%(then) 元素"
-
 #: ref-filter.c:950
 #, c-format
 msgid "format: %%(else) atom used more than once"
@@ -6862,22 +6807,22 @@ msgstr "格�錯誤的物件 '%s'"
 msgid "ignoring ref with broken name %s"
 msgstr "忽略帶有錯誤�稱 %s 的引用"
 
-#: ref-filter.c:2250 refs.c:673
+#: ref-filter.c:2250 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略�壞的引用 %s"
 
-#: ref-filter.c:2623
+#: ref-filter.c:2629
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2726
+#: ref-filter.c:2740
 #, c-format
 msgid "malformed object name %s"
 msgstr "格�錯誤的物件� %s"
 
-#: ref-filter.c:2731
+#: ref-filter.c:2745
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "�項 `%s' 必須指�一個�交"
@@ -6922,71 +6867,71 @@ msgstr "無法擷�「%s�"
 msgid "invalid branch name: %s = %s"
 msgstr "分支�稱無效：%s = %s"
 
-#: refs.c:671
+#: refs.c:674
 #, c-format
 msgid "ignoring dangling symref %s"
 msgstr "忽略懸空符號引用 %s"
 
-#: refs.c:920
+#: refs.c:925
 #, c-format
 msgid "log for ref %s has gap after %s"
 msgstr "引用 %s 的日誌在 %s 之後有缺�"
 
-#: refs.c:927
+#: refs.c:932
 #, c-format
 msgid "log for ref %s unexpectedly ended on %s"
 msgstr "引用 %s 的日誌�外終止於 %s"
 
-#: refs.c:992
+#: refs.c:997
 #, c-format
 msgid "log for %s is empty"
 msgstr "%s 的日誌為空"
 
-#: refs.c:1084
+#: refs.c:1090
 #, c-format
 msgid "refusing to update ref with bad name '%s'"
 msgstr "拒絕更新有錯誤�稱 '%s' 的引用"
 
-#: refs.c:1155
+#: refs.c:1168
 #, c-format
 msgid "update_ref failed for ref '%s': %s"
 msgstr "�引用 '%s' 執行 update_ref 失敗：%s"
 
-#: refs.c:2062
+#: refs.c:2067
 #, c-format
 msgid "multiple updates for ref '%s' not allowed"
 msgstr "��許�引用 '%s' 多次更新"
 
-#: refs.c:2142
+#: refs.c:2150
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔離環境中�止更新引用"
 
-#: refs.c:2153
+#: refs.c:2161
 msgid "ref updates aborted by hook"
 msgstr "引用更新被掛鉤拒絕"
 
-#: refs.c:2253 refs.c:2283
+#: refs.c:2269 refs.c:2299
 #, c-format
 msgid "'%s' exists; cannot create '%s'"
 msgstr "'%s' 已存在，無法建立 '%s'"
 
-#: refs.c:2259 refs.c:2294
+#: refs.c:2275 refs.c:2310
 #, c-format
 msgid "cannot process '%s' and '%s' at the same time"
 msgstr "無法�時處� '%s' 和 '%s'"
 
-#: refs/files-backend.c:1271
+#: refs/files-backend.c:1267
 #, c-format
 msgid "could not remove reference %s"
 msgstr "無法刪除引用 %s"
 
-#: refs/files-backend.c:1285 refs/packed-backend.c:1549
+#: refs/files-backend.c:1281 refs/packed-backend.c:1549
 #: refs/packed-backend.c:1559
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "無法刪除引用 %s：%s"
 
-#: refs/files-backend.c:1288 refs/packed-backend.c:1562
+#: refs/files-backend.c:1284 refs/packed-backend.c:1562
 #, c-format
 msgid "could not delete references: %s"
 msgstr "無法刪除引用：%s"
@@ -6996,50 +6941,50 @@ msgstr "無法刪除引用：%s"
 msgid "invalid refspec '%s'"
 msgstr "無效的引用�格：「%s�"
 
-#: remote.c:351
+#: remote.c:402
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "設定的�端短�稱�能以 '/' 開始：%s"
 
-#: remote.c:399
+#: remote.c:450
 msgid "more than one receivepack given, using the first"
 msgstr "�供了一個以上的 receivepack，使用第一個"
 
-#: remote.c:407
+#: remote.c:458
 msgid "more than one uploadpack given, using the first"
 msgstr "�供了一個以上的 uploadpack，使用第一個"
 
-#: remote.c:590
+#: remote.c:699
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�能�時�得 %s 和 %s 至 %s"
 
-#: remote.c:594
+#: remote.c:703
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常追蹤 %s，而� %s"
 
-#: remote.c:598
+#: remote.c:707
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s �時追蹤 %s 和 %s"
 
-#: remote.c:666
+#: remote.c:775
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "模�的� '%s' 沒有 '*'"
 
-#: remote.c:676
+#: remote.c:785
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "模�的值 '%s' 沒有 '*'"
 
-#: remote.c:1083
+#: remote.c:1192
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "來�引用�格 %s 沒有符�項目"
 
-#: remote.c:1088
+#: remote.c:1197
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "來�引用�格 %s 符�超�一個"
@@ -7048,7 +6993,7 @@ msgstr "來�引用�格 %s 符�超�一個"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1103
+#: remote.c:1212
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -7070,7 +7015,7 @@ msgstr ""
 "\n"
 "由於這些猜測都�正確，我們放棄了。您必須給出完整引用。"
 
-#: remote.c:1123
+#: remote.c:1232
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -7081,7 +7026,7 @@ msgstr ""
 "您是想��推�至「%s:refs/heads/%s�\n"
 "來建立新分支嗎？"
 
-#: remote.c:1128
+#: remote.c:1237
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -7092,7 +7037,7 @@ msgstr ""
 "您是想��推�至「%s:refs/tags/%s�\n"
 "來建立新標籤嗎？"
 
-#: remote.c:1133
+#: remote.c:1242
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -7103,7 +7048,7 @@ msgstr ""
 "您是想��推�至「%s:refs/tags/%s�\n"
 "為新樹狀物件貼上標籤嗎？"
 
-#: remote.c:1138
+#: remote.c:1247
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -7114,113 +7059,113 @@ msgstr ""
 "您是想��推�至「%s:refs/tags/%s�\n"
 "為新資料物件貼上標籤嗎？"
 
-#: remote.c:1174
+#: remote.c:1283
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s 無法被解�為分支"
 
-#: remote.c:1185
+#: remote.c:1294
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "無法刪除 '%s'：�端引用�存在"
 
-#: remote.c:1197
+#: remote.c:1306
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "目的地引用�格 %s 符�超�一個"
 
-#: remote.c:1204
+#: remote.c:1313
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "目的地引用 %s 接收超�一個來�"
 
-#: remote.c:1724 remote.c:1825
+#: remote.c:1834 remote.c:1941
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 沒有指�一個分支"
 
-#: remote.c:1733
+#: remote.c:1843
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "沒有此分支：'%s'"
 
-#: remote.c:1736
+#: remote.c:1846
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未給分支 '%s' 設定上游"
 
-#: remote.c:1742
+#: remote.c:1852
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 沒有儲存為一個�端追蹤分支"
 
-#: remote.c:1757
+#: remote.c:1867
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推�目的地 '%s' 至�端 '%s' 沒有本機追蹤分支"
 
-#: remote.c:1769
+#: remote.c:1882
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 沒有設定�推�的�端伺�器"
 
-#: remote.c:1779
+#: remote.c:1892
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "� '%s' 推�引用�格未包� '%s'"
 
-#: remote.c:1792
+#: remote.c:1905
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推�沒有目的地（push.default 是 'nothing'）"
 
-#: remote.c:1814
+#: remote.c:1927
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "無法解� 'simple' 推�至單�目的地"
 
-#: remote.c:1943
+#: remote.c:2060
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "無法找到�端引用 %s"
 
-#: remote.c:1956
+#: remote.c:2073
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* 在本機忽略�笑的引用 '%s'"
 
-#: remote.c:2119
+#: remote.c:2236
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基於 '%s'，但此上游分支已經�存在。\n"
 
-#: remote.c:2123
+#: remote.c:2240
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" 來修復）\n"
 
-#: remote.c:2126
+#: remote.c:2243
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支與上游分支 '%s' 一致。\n"
 
-#: remote.c:2130
+#: remote.c:2247
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "您的分支和 '%s' 指���的�交。\n"
 
-#: remote.c:2133
+#: remote.c:2250
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  （使用 \"%s\" 檢視詳情）\n"
 
-#: remote.c:2137
+#: remote.c:2254
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支領先 '%s' 共 %d 個�交。\n"
 
-#: remote.c:2143
+#: remote.c:2260
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" 來發布您的本機�交）\n"
 
-#: remote.c:2146
+#: remote.c:2263
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -7228,11 +7173,11 @@ msgid_plural ""
 msgstr[0] "您的分支�後 '%s' 共 %d 個�交，並且�以快轉。\n"
 
 #  譯者：請維��導空格
-#: remote.c:2154
+#: remote.c:2271
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" 來更新您的本機分支）\n"
 
-#: remote.c:2157
+#: remote.c:2274
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -7245,11 +7190,11 @@ msgstr[0] ""
 "並且分別有 %d 和 %d 處��的�交。\n"
 
 #  譯者：請維��導空格
-#: remote.c:2167
+#: remote.c:2284
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" 來�併�端分支）\n"
 
-#: remote.c:2359
+#: remote.c:2476
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "無法解�期望的物件� '%s'"
@@ -7282,7 +7227,7 @@ msgstr "無法寫入 rerere 記錄"
 msgid "there were errors while writing '%s' (%s)"
 msgstr "寫入 '%s' (%s) 時發生錯誤"
 
-#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281
+#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "�新整� '%s' 失敗"
@@ -7327,8 +7272,8 @@ msgstr "�能刪除 stray '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "為 '%s' 記錄 preimage"
 
-#: rerere.c:865 submodule.c:2121 builtin/log.c:2002
-#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819
+#: rerere.c:865 submodule.c:2121 builtin/log.c:2017
+#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "�能建立目錄 '%s'"
@@ -7366,37 +7311,29 @@ msgstr "�能開啟 rr-cache 目錄"
 msgid "could not determine HEAD revision"
 msgstr "�能確定 HEAD 版本"
 
-#: reset.c:70 reset.c:76 sequencer.c:3705
+#: reset.c:70 reset.c:76 sequencer.c:3700
 #, c-format
 msgid "failed to find tree of %s"
 msgstr "無法找到 %s 指�的樹"
 
-#: revision.c:2259
-msgid "--unsorted-input is incompatible with --no-walk"
-msgstr "--unsorted-input 與 --no-walk �相容"
-
-#: revision.c:2346
+#: revision.c:2347
 msgid "--unpacked=<packfile> no longer supported"
 msgstr "--unpacked=<packfile> 已��支�"
 
-#: revision.c:2655 revision.c:2659
-msgid "--no-walk is incompatible with --unsorted-input"
-msgstr "--no-walk 與 --unsorted-input �相容"
-
-#: revision.c:2690
+#: revision.c:2686
 msgid "your current branch appears to be broken"
 msgstr "您的目�分支好�被�壞"
 
-#: revision.c:2693
+#: revision.c:2689
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的目�分支 '%s' 尚無任何�交"
 
-#: revision.c:2895
+#: revision.c:2891
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚�支� -p 和 -s 之外的差異格�"
 
-#: run-command.c:1278
+#: run-command.c:1262
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "�能建立 async 執行緒：%s"
@@ -7459,8 +7396,8 @@ msgstr "無效的�交說明清�模� '%s'"
 msgid "could not delete '%s'"
 msgstr "無法刪除 '%s'"
 
-#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297
-#: builtin/rm.c:408
+#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297
+#: builtin/rm.c:409
 #, c-format
 msgid "could not remove '%s'"
 msgstr "無法刪除 '%s'"
@@ -7522,13 +7459,13 @@ msgstr ""
 "若��消並返回 \"git revert\" �的狀態，\n"
 "請執行 \"git revert --abort\"。"
 
-#: sequencer.c:448 sequencer.c:3290
+#: sequencer.c:448 sequencer.c:3292
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能鎖定 '%s'"
 
-#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308
-#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639
+#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310
+#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639
 #, c-format
 msgid "could not write to '%s'"
 msgstr "�能寫入 '%s'"
@@ -7538,12 +7475,18 @@ msgstr "�能寫入 '%s'"
 msgid "could not write eol to '%s'"
 msgstr "�能將�行符號寫入 '%s'"
 
-#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310
-#: sequencer.c:3574
+#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312
+#: sequencer.c:3569
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "無法完� '%s'"
 
+#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551
+#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148
+#, c-format
+msgid "could not read '%s'"
+msgstr "�能讀� '%s'"
+
 #: sequencer.c:499
 #, c-format
 msgid "your local changes would be overwritten by %s."
@@ -7558,7 +7501,7 @@ msgstr "�交您的修改或儲�後�繼續。"
 msgid "%s: fast-forward"
 msgstr "%s：快轉"
 
-#: sequencer.c:574 builtin/tag.c:610
+#: sequencer.c:574 builtin/tag.c:614
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "無效的清�模� %s"
@@ -7589,8 +7532,8 @@ msgstr "在 '%.*s' 中沒有 key"
 msgid "unable to dequote value of '%s'"
 msgstr "無法為 '%s' 的值去引號"
 
-#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730
-#: builtin/am.c:822 builtin/rebase.c:694
+#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756
+#: builtin/am.c:848 builtin/rebase.c:694
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "無法開啟 '%s' 進行讀�"
@@ -7653,11 +7596,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1229
+#: sequencer.c:1225
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 掛鉤失敗"
 
-#: sequencer.c:1235
+#: sequencer.c:1231
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7681,7 +7624,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1248
+#: sequencer.c:1244
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -7704,349 +7647,350 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1290
+#: sequencer.c:1288
 msgid "couldn't look up newly created commit"
 msgstr "無法找到新建立的�交"
 
-#: sequencer.c:1292
+#: sequencer.c:1290
 msgid "could not parse newly created commit"
 msgstr "�能解�新建立的�交"
 
-#: sequencer.c:1338
+#: sequencer.c:1339
 msgid "unable to resolve HEAD after creating commit"
 msgstr "建立�交後，�能解� HEAD"
 
-#: sequencer.c:1340
+#: sequencer.c:1342
 msgid "detached HEAD"
 msgstr "分離 HEAD"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: sequencer.c:1344
+#: sequencer.c:1346
 msgid " (root-commit)"
 msgstr " (根�交)"
 
-#: sequencer.c:1365
+#: sequencer.c:1367
 msgid "could not parse HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1367
+#: sequencer.c:1369
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s �是一個�交�"
 
-#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707
+#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:1427 sequencer.c:2312
+#: sequencer.c:1429 sequencer.c:2314
 msgid "unable to parse commit author"
 msgstr "�能解��交作者"
 
-#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708
+#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 無法寫入樹狀物件"
 
-#: sequencer.c:1471 sequencer.c:1591
+#: sequencer.c:1473 sequencer.c:1593
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�能從 '%s' 讀��交說明"
 
-#: sequencer.c:1502 sequencer.c:1534
+#: sequencer.c:1504 sequencer.c:1536
 #, c-format
 msgid "invalid author identity '%s'"
 msgstr "無效的作者身分 '%s'"
 
-#: sequencer.c:1508
+#: sequencer.c:1510
 msgid "corrupt author: missing date information"
 msgstr "作者資訊�壞：缺少日期資訊"
 
-#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913
-#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915
+#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "寫�交物件失敗"
 
-#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199
+#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199
 #: t/helper/test-fast-rebase.c:217
 #, c-format
 msgid "could not update %s"
 msgstr "�能更新 %s"
 
-#: sequencer.c:1623
+#: sequencer.c:1625
 #, c-format
 msgid "could not parse commit %s"
 msgstr "�能解��交 %s"
 
-#: sequencer.c:1628
+#: sequencer.c:1630
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "�能解�父�交 %s"
 
-#: sequencer.c:1711 sequencer.c:1992
+#: sequencer.c:1713 sequencer.c:1994
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知指令：%d"
 
-#: sequencer.c:1753
+#: sequencer.c:1755
 msgid "This is the 1st commit message:"
 msgstr "這是第一個�交說明："
 
-#: sequencer.c:1754
+#: sequencer.c:1756
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "這是�交說明 #%d："
 
-#: sequencer.c:1755
+#: sequencer.c:1757
 msgid "The 1st commit message will be skipped:"
 msgstr "略�第 1 個�交說明："
 
-#: sequencer.c:1756
+#: sequencer.c:1758
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "略�第 %d 個�交說明："
 
-#: sequencer.c:1757
+#: sequencer.c:1759
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "這是整� %d 個�交的集��交。"
 
-#: sequencer.c:1904 sequencer.c:1961
+#: sequencer.c:1906 sequencer.c:1963
 #, c-format
 msgid "cannot write '%s'"
 msgstr "�能寫 '%s'"
 
-#: sequencer.c:1951
+#: sequencer.c:1953
 msgid "need a HEAD to fixup"
 msgstr "需�一個 HEAD 來修復"
 
-#: sequencer.c:1953 sequencer.c:3601
+#: sequencer.c:1955 sequencer.c:3596
 msgid "could not read HEAD"
 msgstr "�能讀� HEAD"
 
-#: sequencer.c:1955
+#: sequencer.c:1957
 msgid "could not read HEAD's commit message"
 msgstr "�能讀� HEAD 的�交說明"
 
-#: sequencer.c:1979
+#: sequencer.c:1981
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能讀� %s 的�交說明"
 
-#: sequencer.c:2089
+#: sequencer.c:2091
 msgid "your index file is unmerged."
 msgstr "您的索引檔案未完��併。"
 
-#: sequencer.c:2096
+#: sequencer.c:2098
 msgid "cannot fixup root commit"
 msgstr "�能修復根�交"
 
-#: sequencer.c:2115
+#: sequencer.c:2117
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一個�併�交但未�供 -m �項。"
 
-#: sequencer.c:2123 sequencer.c:2131
+#: sequencer.c:2125 sequencer.c:2133
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 沒有第 %d 個父�交"
 
-#: sequencer.c:2137
+#: sequencer.c:2139
 #, 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:2156
+#: sequencer.c:2158
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:2222
+#: sequencer.c:2224
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能將 '%s' �新命�為 '%s'"
 
-#: sequencer.c:2282
+#: sequencer.c:2284
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能還原 %s... %s"
 
-#: sequencer.c:2283
+#: sequencer.c:2285
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能套用 %s... %s"
 
-#: sequencer.c:2304
+#: sequencer.c:2306
 #, c-format
 msgid "dropping %s %s -- patch contents already upstream\n"
 msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
 
-#: sequencer.c:2362
+#: sequencer.c:2364
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：無法讀�索引"
 
-#: sequencer.c:2370
+#: sequencer.c:2372
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：無法�新整�索引"
 
-#: sequencer.c:2450
+#: sequencer.c:2452
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s �接��數：'%s'"
 
-#: sequencer.c:2459
+#: sequencer.c:2461
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的�數"
 
-#: sequencer.c:2502
+#: sequencer.c:2504
 #, c-format
 msgid "could not parse '%s'"
 msgstr "無法解� '%s'"
 
-#: sequencer.c:2563
+#: sequencer.c:2565
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "無效行 %d：%.*s"
 
-#: sequencer.c:2574
+#: sequencer.c:2576
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "沒有父�交的情�下�能 '%s'"
 
-#: sequencer.c:2622 builtin/rebase.c:184
+#: sequencer.c:2624 builtin/rebase.c:184
 #, c-format
 msgid "could not read '%s'."
 msgstr "�能讀� '%s'。"
 
-#: sequencer.c:2660
+#: sequencer.c:2662
 msgid "cancelling a cherry picking in progress"
 msgstr "正在�消一個進行中的��"
 
-#: sequencer.c:2669
+#: sequencer.c:2671
 msgid "cancelling a revert in progress"
 msgstr "正在�消一個進行中的還原"
 
-#: sequencer.c:2709
+#: sequencer.c:2711
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "請用 'git rebase --edit-todo' 來修改。"
 
-#: sequencer.c:2711
+#: sequencer.c:2713
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清單：'%s'"
 
-#: sequencer.c:2716
+#: sequencer.c:2718
 msgid "no commits parsed."
 msgstr "沒有解��交。"
 
-#: sequencer.c:2727
+#: sequencer.c:2729
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在還原�交中執行��。"
 
-#: sequencer.c:2729
+#: sequencer.c:2731
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在��中執行還原�交。"
 
-#: sequencer.c:2807
+#: sequencer.c:2809
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值無效：%s"
 
-#: sequencer.c:2916
+#: sequencer.c:2918
 msgid "unusable squash-onto"
 msgstr "��用的 squash-onto"
 
-#: sequencer.c:2936
+#: sequencer.c:2938
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格�錯誤的�項清單：'%s'"
 
-#: sequencer.c:3031 sequencer.c:4905
+#: sequencer.c:3033 sequencer.c:4902
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:3048
+#: sequencer.c:3050
 msgid "revert is already in progress"
 msgstr "一個還原動作已在進行"
 
-#: sequencer.c:3050
+#: sequencer.c:3052
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3053
+#: sequencer.c:3055
 msgid "cherry-pick is already in progress"
 msgstr "��動作已在進行"
 
-#: sequencer.c:3055
+#: sequencer.c:3057
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:3069
+#: sequencer.c:3071
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能建立�列目錄 '%s'"
 
-#: sequencer.c:3084
+#: sequencer.c:3086
 msgid "could not lock HEAD"
 msgstr "�能鎖定 HEAD"
 
-#: sequencer.c:3144 sequencer.c:4615
+#: sequencer.c:3146 sequencer.c:4612
 msgid "no cherry-pick or revert in progress"
 msgstr "��或還原動作並未進行"
 
-#: sequencer.c:3146 sequencer.c:3157
+#: sequencer.c:3148 sequencer.c:3159
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:3148 sequencer.c:3192
+#: sequencer.c:3150 sequencer.c:3194
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能從尚未建立的分支終止"
 
-#: sequencer.c:3178 builtin/grep.c:772
+#: sequencer.c:3180 builtin/fetch.c:1004 builtin/fetch.c:1416
+#: builtin/grep.c:772
 #, c-format
 msgid "cannot open '%s'"
 msgstr "�能開啟 '%s'"
 
-#: sequencer.c:3180
+#: sequencer.c:3182
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能讀� '%s'：%s"
 
-#: sequencer.c:3181
+#: sequencer.c:3183
 msgid "unexpected end of file"
 msgstr "�外的檔案��"
 
-#: sequencer.c:3187
+#: sequencer.c:3189
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "儲存���交�的 HEAD 檔案 '%s' �壞"
 
-#: sequencer.c:3198
+#: sequencer.c:3200
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移動了 HEAD。未能還原，檢查您的 HEAD�"
 
-#: sequencer.c:3239
+#: sequencer.c:3241
 msgid "no revert in progress"
 msgstr "沒有正在進行的還原"
 
-#: sequencer.c:3248
+#: sequencer.c:3250
 msgid "no cherry-pick in progress"
 msgstr "沒有正在進行的��"
 
-#: sequencer.c:3258
+#: sequencer.c:3260
 msgid "failed to skip the commit"
 msgstr "無法略�這個�交"
 
-#: sequencer.c:3265
+#: sequencer.c:3267
 msgid "there is nothing to skip"
 msgstr "沒有�略�的"
 
-#: sequencer.c:3268
+#: sequencer.c:3270
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -8055,16 +7999,16 @@ msgstr ""
 "您已經�交了嗎？\n"
 "試試 \"git %s --continue\""
 
-#: sequencer.c:3430 sequencer.c:4506
+#: sequencer.c:3432 sequencer.c:4503
 msgid "cannot read HEAD"
 msgstr "�能讀� HEAD"
 
-#: sequencer.c:3447
+#: sequencer.c:3449
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "無法複製 '%s' 至 '%s'"
 
-#: sequencer.c:3455
+#: sequencer.c:3457
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -8083,28 +8027,28 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3465
+#: sequencer.c:3467
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "�能套用 %s... %.*s"
 
-#: sequencer.c:3472
+#: sequencer.c:3474
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�能�併 %.*s"
 
-#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639
+#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能複製 '%s' 至 '%s'"
 
-#: sequencer.c:3502
+#: sequencer.c:3503
 #, c-format
 msgid "Executing: %s\n"
 msgstr "執行：%s\n"
 
 #  譯者：請維��導空格
-#: sequencer.c:3517
+#: sequencer.c:3514
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -8119,11 +8063,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3523
+#: sequencer.c:3520
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "並且修改索引和/或工作�\n"
 
-#: sequencer.c:3529
+#: sequencer.c:3526
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -8140,90 +8084,90 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3591
+#: sequencer.c:3586
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "�法的標籤�稱：'%.*s'"
 
-#: sequencer.c:3664
+#: sequencer.c:3659
 msgid "writing fake root commit"
 msgstr "寫�根�交"
 
-#: sequencer.c:3669
+#: sequencer.c:3664
 msgid "writing squash-onto"
 msgstr "寫入 squash-onto"
 
-#: sequencer.c:3748
+#: sequencer.c:3743
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "無法解� '%s'"
 
-#: sequencer.c:3780
+#: sequencer.c:3775
 msgid "cannot merge without a current revision"
 msgstr "沒有目�版本�能�併"
 
-#: sequencer.c:3802
+#: sequencer.c:3797
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "無法解� '%.*s'"
 
-#: sequencer.c:3811
+#: sequencer.c:3806
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "無�用�併：'%.*s'"
 
-#: sequencer.c:3823
+#: sequencer.c:3818
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "章魚�並�能在一個新的根�交上執行"
 
-#: sequencer.c:3878
+#: sequencer.c:3873
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�能�得 '%s' 的�交說明"
 
-#: sequencer.c:4024
+#: sequencer.c:4019
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "甚至�能嘗試�併 '%.*s'"
 
-#: sequencer.c:4040
+#: sequencer.c:4035
 msgid "merge: Unable to write new index file"
 msgstr "�併：無法寫入新索引檔案"
 
-#: sequencer.c:4121
+#: sequencer.c:4116
 msgid "Cannot autostash"
 msgstr "無法 autostash"
 
-#: sequencer.c:4124
+#: sequencer.c:4119
 #, c-format
 msgid "Unexpected stash response: '%s'"
 msgstr "�外的 stash 回應：'%s'"
 
-#: sequencer.c:4130
+#: sequencer.c:4125
 #, c-format
 msgid "Could not create directory for '%s'"
 msgstr "�能為 '%s' 建立目錄"
 
-#: sequencer.c:4133
+#: sequencer.c:4128
 #, c-format
 msgid "Created autostash: %s\n"
 msgstr "建立了 autostash：%s\n"
 
-#: sequencer.c:4137
+#: sequencer.c:4132
 msgid "could not reset --hard"
 msgstr "無法 reset --hard"
 
-#: sequencer.c:4162
+#: sequencer.c:4157
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已套用 autostash。\n"
 
-#: sequencer.c:4174
+#: sequencer.c:4169
 #, c-format
 msgid "cannot store %s"
 msgstr "�能儲存 %s"
 
-#: sequencer.c:4177
+#: sequencer.c:4172
 #, c-format
 msgid ""
 "%s\n"
@@ -8234,29 +8178,29 @@ msgstr ""
 "您的修改安全地儲存在儲��中。\n"
 "您�以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:4182
+#: sequencer.c:4177
 msgid "Applying autostash resulted in conflicts."
 msgstr "因套用自動儲�而導致��。"
 
-#: sequencer.c:4183
+#: sequencer.c:4178
 msgid "Autostash exists; creating a new stash entry."
 msgstr "已有自動儲�；建立新儲�項目。"
 
-#: sequencer.c:4255
+#: sequencer.c:4252
 msgid "could not detach HEAD"
 msgstr "�能分離開頭指標"
 
-#: sequencer.c:4270
+#: sequencer.c:4267
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "�止在 HEAD\n"
 
-#: sequencer.c:4272
+#: sequencer.c:4269
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "�止在 %s\n"
 
-#: sequencer.c:4304
+#: sequencer.c:4301
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -8276,58 +8220,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:4350
+#: sequencer.c:4347
 #, c-format
 msgid "Rebasing (%d/%d)%s"
 msgstr "正在�定基底 (%d/%d)%s"
 
-#: sequencer.c:4396
+#: sequencer.c:4393
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:4466
+#: sequencer.c:4463
 #, c-format
 msgid "unknown command %d"
 msgstr "未知指令 %d"
 
-#: sequencer.c:4514
+#: sequencer.c:4511
 msgid "could not read orig-head"
 msgstr "�能讀� orig-head"
 
-#: sequencer.c:4519
+#: sequencer.c:4516
 msgid "could not read 'onto'"
 msgstr "�能讀� 'onto'"
 
-#: sequencer.c:4533
+#: sequencer.c:4530
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 為 %s"
 
-#: sequencer.c:4593
+#: sequencer.c:4590
 #, c-format
 msgid "Successfully rebased and updated %s.\n"
 msgstr "�功�定基底並更新 %s。\n"
 
-#: sequencer.c:4645
+#: sequencer.c:4642
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�定基底：您有未暫存的變更。"
 
-#: sequencer.c:4654
+#: sequencer.c:4651
 msgid "cannot amend non-existing commit"
 msgstr "�能修補�存在的�交"
 
-#: sequencer.c:4656
+#: sequencer.c:4653
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "無效檔案：'%s'"
 
-#: sequencer.c:4658
+#: sequencer.c:4655
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "無效內容：'%s'"
 
-#: sequencer.c:4661
+#: sequencer.c:4658
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -8336,68 +8280,68 @@ msgstr ""
 "\n"
 "您的工作�中有未�交的變更。請先�交然後�次執行 'git rebase --continue'。"
 
-#: sequencer.c:4697 sequencer.c:4736
+#: sequencer.c:4694 sequencer.c:4733
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "�能寫入檔案：'%s'"
 
-#: sequencer.c:4752
+#: sequencer.c:4749
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能刪除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:4762
+#: sequencer.c:4759
 msgid "could not commit staged changes."
 msgstr "�能�交暫存的修改。"
 
-#: sequencer.c:4882
+#: sequencer.c:4879
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能��一個%s"
 
-#: sequencer.c:4886
+#: sequencer.c:4883
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：錯誤的版本"
 
-#: sequencer.c:4921
+#: sequencer.c:4918
 msgid "can't revert as initial commit"
 msgstr "�能作為�始�交還原�交"
 
-#: sequencer.c:5192 sequencer.c:5421
+#: sequencer.c:5189 sequencer.c:5418
 #, c-format
 msgid "skipped previously applied commit %s"
 msgstr "已略�先�套用的 %s �交"
 
-#: sequencer.c:5262 sequencer.c:5437
+#: sequencer.c:5259 sequencer.c:5434
 msgid "use --reapply-cherry-picks to include skipped commits"
 msgstr "使用 --reapply-cherry-picks 以包�略��交"
 
-#: sequencer.c:5408
+#: sequencer.c:5405
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能處�的�項"
 
-#: sequencer.c:5411
+#: sequencer.c:5408
 msgid "make_script: error preparing revisions"
 msgstr "make_script：準備版本時錯誤"
 
-#: sequencer.c:5669 sequencer.c:5686
+#: sequencer.c:5666 sequencer.c:5683
 msgid "nothing to do"
 msgstr "無事��"
 
-#: sequencer.c:5705
+#: sequencer.c:5702
 msgid "could not skip unnecessary pick commands"
 msgstr "無法略��必�的��"
 
-#: sequencer.c:5805
+#: sequencer.c:5802
 msgid "the script was already rearranged."
 msgstr "腳本已經�新編排。"
 
-#: setup.c:133
+#: setup.c:134
 #, c-format
 msgid "'%s' is outside repository at '%s'"
 msgstr "'%s' 在�於 '%s' 的版本庫之外"
 
-#: setup.c:185
+#: setup.c:186
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -8406,7 +8350,7 @@ msgstr ""
 "%s：工作�中無此路徑。\n"
 "使用指令 'git <命令> -- <路徑>...' 來指定本機�存在的路徑。"
 
-#: setup.c:198
+#: setup.c:199
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -8417,12 +8361,12 @@ msgstr ""
 "使用 '--' 來分隔版本和路徑，例如：\n"
 "'git <命令> [<版本>...] -- [<檔案>...]'"
 
-#: setup.c:264
+#: setup.c:265
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "�項 '%s' 必須在其他��項�數之�"
 
-#: setup.c:283
+#: setup.c:284
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -8433,98 +8377,98 @@ msgstr ""
 "使用 '--' 來分隔版本和路徑，例如：\n"
 "'git <命令> [<版本>...] -- [<檔案>...]'"
 
-#: setup.c:419
+#: setup.c:420
 msgid "unable to set up work tree using invalid config"
 msgstr "無法使用無效設定來建立工作�"
 
-#: setup.c:423 builtin/rev-parse.c:895
+#: setup.c:424 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "該動作必須在一個工作�中執行"
 
-#: setup.c:658
+#: setup.c:722
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 版本庫版本 <= %d，�得到 %d"
 
-#: setup.c:666
+#: setup.c:730
 msgid "unknown repository extension found:"
 msgid_plural "unknown repository extensions found:"
 msgstr[0] "找到未知的儲存庫擴充元件："
 
-#: setup.c:680
+#: setup.c:744
 msgid "repo version is 0, but v1-only extension found:"
 msgid_plural "repo version is 0, but v1-only extensions found:"
 msgstr[0] "repo 版本是 0 (v0)，但找到�支� v1 的擴充元件："
 
-#: setup.c:701
+#: setup.c:765
 #, c-format
 msgid "error opening '%s'"
 msgstr "開啟 '%s' 發生錯誤"
 
-#: setup.c:703
+#: setup.c:767
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "檔案太大，無法作為 .git 檔案：'%s'"
 
-#: setup.c:705
+#: setup.c:769
 #, c-format
 msgid "error reading %s"
 msgstr "讀� %s 發生錯誤"
 
-#: setup.c:707
+#: setup.c:771
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "無效的 gitfile 格�：%s"
 
-#: setup.c:709
+#: setup.c:773
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中沒有路徑：%s"
 
-#: setup.c:711
+#: setup.c:775
 #, c-format
 msgid "not a git repository: %s"
 msgstr "�是一個 git 版本庫：%s"
 
-#: setup.c:813
+#: setup.c:877
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c:827
+#: setup.c:891
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "�是一個 git 版本庫：'%s'"
 
-#: setup.c:856 setup.c:858 setup.c:889
+#: setup.c:920 setup.c:922 setup.c:953
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "�能切�目錄到 '%s'"
 
-#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038
 msgid "cannot come back to cwd"
 msgstr "無法返回目�工作目錄"
 
-#: setup.c:988
+#: setup.c:1052
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "�得 '%*s%s%s' 狀態（stat）失敗"
 
-#: setup.c:1231
+#: setup.c:1295
 msgid "Unable to read current working directory"
 msgstr "�能讀�目�工作目錄"
 
-#: setup.c:1240 setup.c:1246
+#: setup.c:1304 setup.c:1310
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1251
+#: setup.c:1315
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "�是一個 git 版本庫（或者任何父目錄）：%s"
 
-#: setup.c:1257
+#: setup.c:1321
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -8533,7 +8477,7 @@ msgstr ""
 "�是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
 "�止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1381
+#: setup.c:1446
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -8542,15 +8486,15 @@ msgstr ""
 "�數 core.sharedRepository 的檔案屬性值有�題（0%.3o）。\n"
 "檔案所有者必須始終�有讀寫權�。"
 
-#: setup.c:1443
+#: setup.c:1508
 msgid "fork failed"
 msgstr "fork 失敗"
 
-#: setup.c:1448
+#: setup.c:1513
 msgid "setsid failed"
 msgstr "setsid 失敗"
 
-#: sparse-index.c:273
+#: sparse-index.c:289
 #, c-format
 msgid "index entry is a directory, but not sparse (%08x)"
 msgstr "索引項目是資料夾，但�是稀�資料夾（%08x）"
@@ -8605,13 +8549,13 @@ msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u �元組/秒"
 
-#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739
+#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765
 #: builtin/rebase.c:650
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "無法開啟 '%s' 進行寫入"
 
-#: strbuf.c:1183
+#: strbuf.c:1195
 #, c-format
 msgid "could not edit '%s'"
 msgstr "無法編輯 '%s'"
@@ -8697,7 +8641,7 @@ msgstr "無法在 %s �模組執行 'git rev-list <�交> --not --remotes -n 1
 msgid "process for submodule '%s' failed"
 msgstr "處� '%s' �模組失敗"
 
-#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713
+#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "無法將 HEAD 解�為有效引用。"
 
@@ -8940,7 +8884,7 @@ msgstr "�定�支�設定�端�務路徑"
 msgid "invalid remote service path"
 msgstr "無效的�端�務路徑"
 
-#: transport-helper.c:661 transport.c:1475
+#: transport-helper.c:661 transport.c:1479
 msgid "operation not supported by protocol"
 msgstr "�定�支�該動作"
 
@@ -9159,7 +9103,7 @@ msgstr ""
 msgid "Aborting."
 msgstr "正在終止。"
 
-#: transport.c:1344
+#: transport.c:1343
 msgid "failed to push all needed submodules"
 msgstr "�能推�全部需�的�模組"
 
@@ -9179,7 +9123,7 @@ msgstr "樹狀物件�目中空的檔案�"
 msgid "too-short tree file"
 msgstr "太短的樹檔案"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9188,7 +9132,7 @@ msgstr ""
 "您�下列檔案的本機修改將被簽出動作覆蓋：\n"
 "%%s請在切�分支��交或儲�您的修改。"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -9197,7 +9141,7 @@ msgstr ""
 "您�下列檔案的本機修改將被簽出動作覆蓋：\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9206,7 +9150,7 @@ msgstr ""
 "您�下列檔案的本機修改將被�併動作覆蓋：\n"
 "%%s請在�併��交或儲�您的修改。"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -9215,7 +9159,7 @@ msgstr ""
 "您�下列檔案的本機修改將被�併動作覆蓋：\n"
 "%%s"
 
-#: unpack-trees.c:125
+#: unpack-trees.c:128
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9224,7 +9168,7 @@ msgstr ""
 "您�下列檔案的本機修改將被 %s 覆蓋：\n"
 "%%s請在 %s 之��交或儲�您的修改。"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -9233,7 +9177,7 @@ msgstr ""
 "您�下列檔案的本機修改將被 %s 覆蓋：\n"
 "%%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:135
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -9242,7 +9186,16 @@ msgstr ""
 "更新如下目錄將會�失其中未追蹤的檔案：\n"
 "%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"Refusing to remove the current working directory:\n"
+"%s"
+msgstr ""
+"拒絕移除目�工作目錄：\n"
+"%s"
+
+#: unpack-trees.c:142
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9251,7 +9204,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
 "%%s請在切�分支之�移動或刪除。"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -9260,7 +9213,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:147
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9269,7 +9222,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為�併動作而被刪除：\n"
 "%%s請在�併�移動或刪除。"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:149
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -9278,7 +9231,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為�併動作而被刪除：\n"
 "%%s"
 
-#: unpack-trees.c:146
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9287,7 +9240,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
 "%%s請在 %s �移動或刪除。"
 
-#: unpack-trees.c:148
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -9296,7 +9249,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:160
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9306,7 +9259,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
 "%%s請在切�分支�移動或刪除。"
 
-#: unpack-trees.c:156
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -9316,7 +9269,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:165
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9325,7 +9278,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為�併動作而被覆蓋：\n"
 "%%s請在�併�移動或刪除。"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:167
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -9334,7 +9287,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為�併動作而被覆蓋：\n"
 "%%s"
 
-#: unpack-trees.c:164
+#: unpack-trees.c:170
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9343,7 +9296,7 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
 "%%s請在 %s �移動或刪除。"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:172
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -9352,12 +9305,12 @@ msgstr ""
 "工作�中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
 "%%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "�目 '%s' 和 '%s' �疊。無法�併。"
 
-#: unpack-trees.c:177
+#: unpack-trees.c:183
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -9366,7 +9319,7 @@ msgstr ""
 "無法更新�模組：\n"
 "%s"
 
-#: unpack-trees.c:180
+#: unpack-trees.c:186
 #, c-format
 msgid ""
 "The following paths are not up to date and were left despite sparse "
@@ -9376,7 +9329,7 @@ msgstr ""
 "�使有稀�簽出樣�，以下路徑�是最新且�留下來：\n"
 "%s"
 
-#: unpack-trees.c:182
+#: unpack-trees.c:188
 #, c-format
 msgid ""
 "The following paths are unmerged and were left despite sparse patterns:\n"
@@ -9385,7 +9338,7 @@ msgstr ""
 "�使有稀�簽出樣�，以下路徑未�併且�留下來：\n"
 "%s"
 
-#: unpack-trees.c:184
+#: unpack-trees.c:190
 #, c-format
 msgid ""
 "The following paths were already present and thus not updated despite sparse "
@@ -9395,23 +9348,23 @@ msgstr ""
 "�使有稀�簽出樣�，以下路徑已經存在而因此未更新：\n"
 "%s"
 
-#: unpack-trees.c:264
+#: unpack-trees.c:270
 #, c-format
 msgid "Aborting\n"
 msgstr "正在終止\n"
 
-#: unpack-trees.c:291
+#: unpack-trees.c:297
 #, c-format
 msgid ""
 "After fixing the above paths, you may want to run `git sparse-checkout "
 "reapply`.\n"
 msgstr "修正以上路徑後，您�能想�執行「git sparse-checkout reapply�。\n"
 
-#: unpack-trees.c:352
+#: unpack-trees.c:358
 msgid "Updating files"
 msgstr "正在更新檔案"
 
-#: unpack-trees.c:384
+#: unpack-trees.c:390
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -9420,16 +9373,16 @@ msgstr ""
 "以下路徑發生碰撞（如：在��分大�寫的檔案系統上的�分大�寫的路徑），\n"
 "並且碰撞組中�有一個檔案存在工作�中：\n"
 
-#: unpack-trees.c:1620
+#: unpack-trees.c:1636
 msgid "Updating index flags"
 msgstr "正在更新索引旗標"
 
-#: unpack-trees.c:2772
+#: unpack-trees.c:2803
 #, c-format
 msgid "worktree and untracked commit have duplicate entries: %s"
 msgstr "工作�和未追蹤�交有�複項目：%s"
 
-#: upload-pack.c:1561
+#: upload-pack.c:1565
 msgid "expected flush after fetch arguments"
 msgstr "在 fetch 引數應為一個 flush 包"
 
@@ -9466,99 +9419,99 @@ msgstr "無效的 '..' 路徑�塊"
 msgid "Fetching objects"
 msgstr "正在抓�物件"
 
-#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156
+#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156
 #, c-format
 msgid "failed to read '%s'"
 msgstr "讀� '%s' 失敗"
 
-#: worktree.c:303
+#: worktree.c:305
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作�的 '%s' �是版本庫目錄"
 
-#: worktree.c:314
+#: worktree.c:316
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "檔案 '%s' �包�工作�的絕�路徑"
 
-#: worktree.c:326
+#: worktree.c:328
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' �存在"
 
-#: worktree.c:332
+#: worktree.c:334
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' �是一個 .git 檔案，錯誤碼 %d"
 
-#: worktree.c:341
+#: worktree.c:343
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 沒有指回到 '%s'"
 
-#: worktree.c:603
+#: worktree.c:604
 msgid "not a directory"
 msgstr "�是目錄"
 
-#: worktree.c:612
+#: worktree.c:613
 msgid ".git is not a file"
 msgstr ".git �是檔案"
 
-#: worktree.c:614
+#: worktree.c:615
 msgid ".git file broken"
 msgstr ".git 檔案�毀"
 
-#: worktree.c:616
+#: worktree.c:617
 msgid ".git file incorrect"
 msgstr ".git 檔案�正確"
 
-#: worktree.c:722
+#: worktree.c:723
 msgid "not a valid path"
 msgstr "�有效路徑"
 
-#: worktree.c:728
+#: worktree.c:729
 msgid "unable to locate repository; .git is not a file"
 msgstr "無法定�版本庫；.git �是檔案"
 
-#: worktree.c:732
+#: worktree.c:733
 msgid "unable to locate repository; .git file does not reference a repository"
 msgstr "無法定�版本庫：.git 檔案未指�版本庫"
 
-#: worktree.c:736
+#: worktree.c:737
 msgid "unable to locate repository; .git file broken"
 msgstr "無法定�版本庫；.git 檔案�壞"
 
-#: worktree.c:742
+#: worktree.c:743
 msgid "gitdir unreadable"
 msgstr "無法讀� gitdir"
 
-#: worktree.c:746
+#: worktree.c:747
 msgid "gitdir incorrect"
 msgstr "�正確的 gitdir"
 
-#: worktree.c:771
+#: worktree.c:772
 msgid "not a valid directory"
 msgstr "�有效目錄"
 
-#: worktree.c:777
+#: worktree.c:778
 msgid "gitdir file does not exist"
 msgstr "找�到 gitdir 檔案"
 
-#: worktree.c:782 worktree.c:791
+#: worktree.c:783 worktree.c:792
 #, c-format
 msgid "unable to read gitdir file (%s)"
 msgstr "無法讀� gitdir 檔案 (%s)"
 
-#: worktree.c:801
+#: worktree.c:802
 #, c-format
 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
 msgstr "讀��短（�期有 %<PRIuMAX> �元組，�讀到 %<PRIuMAX>）"
 
-#: worktree.c:809
+#: worktree.c:810
 msgid "invalid gitdir file"
 msgstr "gitdir 檔案無效"
 
-#: worktree.c:817
+#: worktree.c:818
 msgid "gitdir file points to non-existent location"
 msgstr "gitdir 檔案指�的�置�存在"
 
@@ -9621,11 +9574,11 @@ msgstr "  （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）"
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <檔案>...\" 標記解決方案）"
 
-#: wt-status.c:211 wt-status.c:1125
+#: wt-status.c:211 wt-status.c:1131
 msgid "Changes to be committed:"
 msgstr "��交的變更："
 
-#: wt-status.c:234 wt-status.c:1134
+#: wt-status.c:234 wt-status.c:1140
 msgid "Changes not staged for commit:"
 msgstr "尚未暫存以備�交的變更："
 
@@ -9731,21 +9684,21 @@ msgstr "修改的內容, "
 msgid "untracked content, "
 msgstr "未追蹤的內容, "
 
-#: wt-status.c:958
+#: wt-status.c:964
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "您的儲��目�有 %d �紀錄"
 
-#: wt-status.c:989
+#: wt-status.c:995
 msgid "Submodules changed but not updated:"
 msgstr "�模組已修改但尚未更新："
 
-#: wt-status.c:991
+#: wt-status.c:997
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模組變更："
 
-#: wt-status.c:1073
+#: wt-status.c:1079
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -9753,7 +9706,7 @@ msgstr ""
 "��改動或刪除上�的一行。\n"
 "其下所有內容都將被忽略。"
 
-#: wt-status.c:1165
+#: wt-status.c:1171
 #, c-format
 msgid ""
 "\n"
@@ -9764,282 +9717,288 @@ msgstr ""
 "花了 %.2f 秒�計算出分支的領先/�後範�。\n"
 "為��，您�以使用 '--no-ahead-behind'。\n"
 
-#: wt-status.c:1195
+#: wt-status.c:1201
 msgid "You have unmerged paths."
 msgstr "您有尚未�併的路徑。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1198
+#: wt-status.c:1204
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解決��並執行 \"git commit\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1200
+#: wt-status.c:1206
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 終止�併）"
 
-#: wt-status.c:1204
+#: wt-status.c:1210
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有��已解決但您�處於�併中。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1207
+#: wt-status.c:1213
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" ���併）"
 
-#: wt-status.c:1216
+#: wt-status.c:1224
 msgid "You are in the middle of an am session."
 msgstr "您正處於 am 動作�程中。"
 
-#: wt-status.c:1219
+#: wt-status.c:1227
 msgid "The current patch is empty."
 msgstr "目�的修補檔為空。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1223
+#: wt-status.c:1232
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解決��，然後執行 \"git am --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1225
+#: wt-status.c:1234
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1227
+#: wt-status.c:1237
+msgid ""
+"  (use \"git am --allow-empty\" to record this patch as an empty commit)"
+msgstr "  （使用 \"git am --allow-empty\" 將目�修補檔錄製為空白�交）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1239
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" 復原原有分支）"
 
-#: wt-status.c:1360
+#: wt-status.c:1372
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo �失。"
 
-#: wt-status.c:1362
+#: wt-status.c:1374
 msgid "No commands done."
 msgstr "沒有指令被執行。"
 
-#: wt-status.c:1365
+#: wt-status.c:1377
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "最後一�指令已完�（%d �指令被執行）："
 
-#: wt-status.c:1376
+#: wt-status.c:1388
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多�見檔案 %s）"
 
-#: wt-status.c:1381
+#: wt-status.c:1393
 msgid "No commands remaining."
 msgstr "未剩下任何指令。"
 
-#: wt-status.c:1384
+#: wt-status.c:1396
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "接下來�執行的指令（剩餘 %d �指令）："
 
 #  譯者：請維��導空格
-#: wt-status.c:1392
+#: wt-status.c:1404
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
 
-#: wt-status.c:1404
+#: wt-status.c:1416
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作。"
 
-#: wt-status.c:1409
+#: wt-status.c:1421
 msgid "You are currently rebasing."
 msgstr "您在執行�定基底動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1422
+#: wt-status.c:1434
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解決��，然後執行 \"git rebase --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1424
+#: wt-status.c:1436
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1426
+#: wt-status.c:1438
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以簽出原有分支）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1433
+#: wt-status.c:1445
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有��已解決：執行 \"git rebase --continue\"）"
 
-#: wt-status.c:1437
+#: wt-status.c:1449
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作時分割�交。"
 
-#: wt-status.c:1442
+#: wt-status.c:1454
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在執行�定基底動作時分割�交。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1445
+#: wt-status.c:1457
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目錄�交乾淨後，執行 \"git rebase --continue\"）"
 
-#: wt-status.c:1449
+#: wt-status.c:1461
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作時編輯�交。"
 
-#: wt-status.c:1454
+#: wt-status.c:1466
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在執行�定基底動作時編輯�交。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1457
+#: wt-status.c:1469
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修補目��交）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1459
+#: wt-status.c:1471
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （當您�您的修改滿�後執行 \"git rebase --continue\"）"
 
-#: wt-status.c:1470
+#: wt-status.c:1482
 msgid "Cherry-pick currently in progress."
 msgstr "��動作正在進行中。"
 
-#: wt-status.c:1473
+#: wt-status.c:1485
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在執行���交 %s 的動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1480
+#: wt-status.c:1492
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解決��並執行 \"git cherry-pick --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1483
+#: wt-status.c:1495
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  （執行 \"git cherry-pick --continue\" 以繼續）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1486
+#: wt-status.c:1498
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有��已解決：執行 \"git cherry-pick --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1488
+#: wt-status.c:1500
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  （使用 \"git cherry-pick --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1490
+#: wt-status.c:1502
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以�消��動作）"
 
-#: wt-status.c:1500
+#: wt-status.c:1512
 msgid "Revert currently in progress."
 msgstr "還原動作正在進行中。"
 
-#: wt-status.c:1503
+#: wt-status.c:1515
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在執行�轉�交 %s 的動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1509
+#: wt-status.c:1521
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解決��並執行 \"git revert --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1512
+#: wt-status.c:1524
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  （執行 \"git revert --continue\" 以繼續）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1515
+#: wt-status.c:1527
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有��已解決：執行 \"git revert --continue\"）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1517
+#: wt-status.c:1529
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  （使用 \"git revert --skip\" 略�此修補檔）"
 
 #  譯者：請維��導空格
-#: wt-status.c:1519
+#: wt-status.c:1531
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以�消�轉�交動作）"
 
-#: wt-status.c:1529
+#: wt-status.c:1541
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在執行從分支 '%s' 開始的二分�尋動作。"
 
-#: wt-status.c:1533
+#: wt-status.c:1545
 msgid "You are currently bisecting."
 msgstr "您在執行二分�尋動作。"
 
 #  譯者：請維��導空格
-#: wt-status.c:1536
+#: wt-status.c:1548
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 簽出原有分支）"
 
-#: wt-status.c:1547
+#: wt-status.c:1559
 msgid "You are in a sparse checkout."
 msgstr "您正在稀�簽出的工作�中。"
 
-#: wt-status.c:1550
+#: wt-status.c:1562
 #, c-format
 msgid "You are in a sparse checkout with %d%% of tracked files present."
 msgstr "您處於稀�簽出狀態，包� %d%% 的追蹤檔案。"
 
-#: wt-status.c:1794
+#: wt-status.c:1806
 msgid "On branch "
 msgstr "�於分支 "
 
-#: wt-status.c:1801
+#: wt-status.c:1813
 msgid "interactive rebase in progress; onto "
 msgstr "互動��定基底動作正在進行中；至 "
 
-#: wt-status.c:1803
+#: wt-status.c:1815
 msgid "rebase in progress; onto "
 msgstr "�定基底動作正在進行中；至 "
 
-#: wt-status.c:1808
+#: wt-status.c:1820
 msgid "HEAD detached at "
 msgstr "開頭指標分離於 "
 
-#: wt-status.c:1810
+#: wt-status.c:1822
 msgid "HEAD detached from "
 msgstr "開頭指標分離自 "
 
-#: wt-status.c:1813
+#: wt-status.c:1825
 msgid "Not currently on any branch."
 msgstr "目��在任何分支上。"
 
-#: wt-status.c:1830
+#: wt-status.c:1842
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1831
+#: wt-status.c:1843
 msgid "No commits yet"
 msgstr "尚無�交"
 
-#: wt-status.c:1845
+#: wt-status.c:1857
 msgid "Untracked files"
 msgstr "未追蹤的檔案"
 
-#: wt-status.c:1847
+#: wt-status.c:1859
 msgid "Ignored files"
 msgstr "忽略的檔案"
 
-#: wt-status.c:1851
+#: wt-status.c:1863
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -10049,115 +10008,115 @@ msgstr ""
 "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能�高速度，\n"
 "但您需��心��忘了新增新檔案（�見 'git help status'）。"
 
-#: wt-status.c:1857
+#: wt-status.c:1869
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未追蹤的檔案沒有列出%s"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1859
+#: wt-status.c:1871
 msgid " (use -u option to show untracked files)"
 msgstr " （使用 -u �數顯示未追蹤的檔案）"
 
-#: wt-status.c:1865
+#: wt-status.c:1877
 msgid "No changes"
 msgstr "沒有修改"
 
-#: wt-status.c:1870
+#: wt-status.c:1882
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入�交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c:1874
+#: wt-status.c:1886
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1878
+#: wt-status.c:1890
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "�交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
 
-#: wt-status.c:1882
+#: wt-status.c:1894
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交為空，但是存在尚未追蹤的檔案\n"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1886
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "無檔案��交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
 
-#: wt-status.c:1890 wt-status.c:1896
+#: wt-status.c:1902 wt-status.c:1908
 #, c-format
 msgid "nothing to commit\n"
 msgstr "無檔案��交\n"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1893
+#: wt-status.c:1905
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "無檔案��交（使用 -u 顯示未追蹤的檔案）\n"
 
 #  譯者：中文字串拼接，�刪除�導空格
-#: wt-status.c:1898
+#: wt-status.c:1910
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "沒有��交的檔案，工作�為乾淨狀態\n"
 
-#: wt-status.c:2003
+#: wt-status.c:2015
 msgid "No commits yet on "
 msgstr "尚無�交在 "
 
-#: wt-status.c:2007
+#: wt-status.c:2019
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
-#: wt-status.c:2038
+#: wt-status.c:2050
 msgid "different"
 msgstr "��"
 
 #  譯者：請維��尾空格
-#: wt-status.c:2040 wt-status.c:2048
+#: wt-status.c:2052 wt-status.c:2060
 msgid "behind "
 msgstr "�後 "
 
-#: wt-status.c:2043 wt-status.c:2046
+#: wt-status.c:2055 wt-status.c:2058
 msgid "ahead "
 msgstr "領先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2569
+#: wt-status.c:2596
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "�能%s：您有未暫存的變更。"
 
-#: wt-status.c:2575
+#: wt-status.c:2602
 msgid "additionally, your index contains uncommitted changes."
 msgstr "�外，您的索引中包�未�交的變更。"
 
-#: wt-status.c:2577
+#: wt-status.c:2604
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的變更。"
 
-#: compat/simple-ipc/ipc-unix-socket.c:183
+#: compat/simple-ipc/ipc-unix-socket.c:205
 msgid "could not send IPC command"
 msgstr "無法傳� IPC 命令"
 
-#: compat/simple-ipc/ipc-unix-socket.c:190
+#: compat/simple-ipc/ipc-unix-socket.c:212
 msgid "could not read IPC response"
 msgstr "無法讀� IPC 回應"
 
-#: compat/simple-ipc/ipc-unix-socket.c:870
+#: compat/simple-ipc/ipc-unix-socket.c:892
 #, c-format
 msgid "could not start accept_thread '%s'"
 msgstr "無法啟動 accept_thread “%s�"
 
-#: compat/simple-ipc/ipc-unix-socket.c:882
+#: compat/simple-ipc/ipc-unix-socket.c:904
 #, c-format
 msgid "could not start worker[0] for '%s'"
 msgstr "無法啟動「%s�的 worker[0]"
@@ -10194,107 +10153,113 @@ msgstr "刪除 '%s'\n"
 msgid "Unstaged changes after refreshing the index:"
 msgstr "�新整�索引之後尚未被暫存的變更："
 
-#: builtin/add.c:317 builtin/rev-parse.c:993
+#: builtin/add.c:313 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "�能讀�索引"
 
-#: builtin/add.c:330
+#: builtin/add.c:326
 msgid "Could not write patch"
 msgstr "�能生�修補檔"
 
-#: builtin/add.c:333
+#: builtin/add.c:329
 msgid "editing patch failed"
 msgstr "編輯修補檔失敗"
 
-#: builtin/add.c:336
+#: builtin/add.c:332
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�能� '%s' 呼� stat"
 
-#: builtin/add.c:338
+#: builtin/add.c:334
 msgid "Empty patch. Aborted."
 msgstr "空修補檔。異常終止。"
 
-#: builtin/add.c:343
+#: builtin/add.c:340
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�能套用 '%s'"
 
-#: builtin/add.c:351
+#: builtin/add.c:348
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
 
-#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124
+#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124
 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550
 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194
 msgid "dry run"
 msgstr "測試執行"
 
-#: builtin/add.c:374
+#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484
+#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313
+#: builtin/mv.c:123 builtin/read-tree.c:120
+msgid "be verbose"
+msgstr "詳細輸出"
+
+#: builtin/add.c:371
 msgid "interactive picking"
 msgstr "互動���"
 
-#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314
+#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409
 msgid "select hunks interactively"
 msgstr "互動�挑�資料�塊"
 
-#: builtin/add.c:376
+#: builtin/add.c:373
 msgid "edit current diff and apply"
 msgstr "編輯目�差異並套用"
 
-#: builtin/add.c:377
+#: builtin/add.c:374
 msgid "allow adding otherwise ignored files"
 msgstr "�許新增忽略的檔案"
 
-#: builtin/add.c:378
+#: builtin/add.c:375
 msgid "update tracked files"
 msgstr "更新已追蹤的檔案"
 
-#: builtin/add.c:379
+#: builtin/add.c:376
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "�已追蹤檔案（隱� -u）�新歸一�行符號"
 
-#: builtin/add.c:380
+#: builtin/add.c:377
 msgid "record only the fact that the path will be added later"
 msgstr "�記錄，該路徑�後�新增"
 
-#: builtin/add.c:381
+#: builtin/add.c:378
 msgid "add changes from all tracked and untracked files"
 msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
 
-#: builtin/add.c:384
+#: builtin/add.c:381
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作�中移除的路徑（和 --no-all 相�）"
 
-#: builtin/add.c:386
+#: builtin/add.c:383
 msgid "don't add, only refresh the index"
 msgstr "�新增，��新整�索引"
 
-#: builtin/add.c:387
+#: builtin/add.c:384
 msgid "just skip files which cannot be added because of errors"
 msgstr "略�因發生錯誤�能新增的檔案"
 
-#: builtin/add.c:388
+#: builtin/add.c:385
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "檢查在測試執行模�下檔案（�使�存在）是�被忽略"
 
-#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251
+#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251
 msgid "allow updating entries outside of the sparse-checkout cone"
 msgstr "�許更新稀�簽出 cone 外的項目"
 
-#: builtin/add.c:391 builtin/update-index.c:1004
+#: builtin/add.c:388 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "覆蓋列表裡檔案的�執行�"
 
-#: builtin/add.c:393
+#: builtin/add.c:390
 msgid "warn when adding an embedded repository"
 msgstr "建立一個嵌入�版本庫時給予警告"
 
-#: builtin/add.c:395
+#: builtin/add.c:392
 msgid "backend for `git stash -p`"
 msgstr "`git stash -p` 的後端"
 
-#: builtin/add.c:413
+#: builtin/add.c:410
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -10323,12 +10288,12 @@ msgstr ""
 "\n"
 "�見 \"git help submodule\" �得更多訊�。"
 
-#: builtin/add.c:442
+#: builtin/add.c:439
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在新增嵌入� git 版本庫：%s"
 
-#: builtin/add.c:462
+#: builtin/add.c:459
 msgid ""
 "Use -f if you really want to add them.\n"
 "Turn this message off by running\n"
@@ -10338,51 +10303,27 @@ msgstr ""
 "如�關閉此訊�，請執行\n"
 "\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:477
+#: builtin/add.c:474
 msgid "adding files failed"
 msgstr "新增檔案失敗"
 
-#: builtin/add.c:513
-msgid "--dry-run is incompatible with --interactive/--patch"
-msgstr "--dry-run 和 --interactive/--patch �相容"
-
-#: builtin/add.c:515 builtin/commit.c:358
-msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--pathspec-from-file 與 --interactive/--patch �相容"
-
-#: builtin/add.c:532
-msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--pathspec-from-file 與 --edit �相容"
-
-#: builtin/add.c:544
-msgid "-A and -u are mutually incompatible"
-msgstr "-A 和 -u �項互斥"
-
-#: builtin/add.c:547
-msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "�項 --ignore-missing �能和 --dry-run �時使用"
-
-#: builtin/add.c:551
+#: builtin/add.c:548
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "�數 --chmod �值 '%s' 必須是 -x 或 +x"
 
-#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364
-#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650
-msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file 與 <路徑�格> �數�相容"
-
-#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370
-#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656
-msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "--pathspec-file-nul 需� --pathspec-from-file"
+#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364
+#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713
+#, c-format
+msgid "'%s' and pathspec arguments cannot be used together"
+msgstr "「%s�和路徑�格引數�得�時使用"
 
-#: builtin/add.c:583
+#: builtin/add.c:580
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "沒有指定檔案，也沒有檔案被新增。\n"
 
-#: builtin/add.c:585
+#: builtin/add.c:582
 msgid ""
 "Maybe you wanted to say 'git add .'?\n"
 "Turn this message off by running\n"
@@ -10392,105 +10333,111 @@ msgstr ""
 "如�關閉此訊�，請執行\n"
 "\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:366
+#: builtin/am.c:202
+#, c-format
+msgid "Invalid value for --empty: %s"
+msgstr "傳入 --empty 的值無效：%s"
+
+#: builtin/am.c:392
 msgid "could not parse author script"
 msgstr "�能解�作者腳本"
 
-#: builtin/am.c:456
+#: builtin/am.c:482
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
 
-#: builtin/am.c:498
+#: builtin/am.c:524
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�法的輸入行：'%s'。"
 
-#: builtin/am.c:536
+#: builtin/am.c:562
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "從 '%s' 複製註解到 '%s' 時失敗"
 
-#: builtin/am.c:562
+#: builtin/am.c:588
 msgid "fseek failed"
 msgstr "fseek 失敗"
 
-#: builtin/am.c:750
+#: builtin/am.c:776
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "無法解�修補檔 '%s'"
 
-#: builtin/am.c:815
+#: builtin/am.c:841
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一個 StGIT 修補檔佇列被套用"
 
-#: builtin/am.c:863
+#: builtin/am.c:889
 msgid "invalid timestamp"
 msgstr "無效的時間戳"
 
-#: builtin/am.c:868 builtin/am.c:880
+#: builtin/am.c:894 builtin/am.c:906
 msgid "invalid Date line"
 msgstr "無效的日期行"
 
-#: builtin/am.c:875
+#: builtin/am.c:901
 msgid "invalid timezone offset"
 msgstr "無效的時��移值"
 
-#: builtin/am.c:968
+#: builtin/am.c:994
 msgid "Patch format detection failed."
 msgstr "修補檔格��測失敗。"
 
-#: builtin/am.c:973 builtin/clone.c:300
+#: builtin/am.c:999 builtin/clone.c:300
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "建立目錄 '%s' 失敗"
 
-#: builtin/am.c:978
+#: builtin/am.c:1004
 msgid "Failed to split patches."
 msgstr "分割修補檔失敗。"
 
-#: builtin/am.c:1127
+#: builtin/am.c:1153
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "當您解決這一�題，執行 \"%s --continue\"。"
 
-#: builtin/am.c:1128
+#: builtin/am.c:1154
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�略�這一修補檔，則執行 \"%s --skip\"。"
 
-#: builtin/am.c:1129
+#: builtin/am.c:1159
+#, c-format
+msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"."
+msgstr "若�將空白修補檔錄製為空白�交，請執行「%s --allow-empty�。"
+
+#: builtin/am.c:1161
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若�復原至原始分支並�止修補動作，執行 \"%s --abort\"。"
 
-#: builtin/am.c:1224
+#: builtin/am.c:1256
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "修補檔使用 format=flowed 格�傳�，行尾的空格�能會�失。"
 
-#: builtin/am.c:1252
-msgid "Patch is empty."
-msgstr "修補檔為空。"
-
-#: builtin/am.c:1317
+#: builtin/am.c:1344
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在�交 %s 中缺少作者行"
 
-#: builtin/am.c:1320
+#: builtin/am.c:1347
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "無效的身份標記：%.*s"
 
-#: builtin/am.c:1539
+#: builtin/am.c:1566
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "版本庫缺�必�的資料物件以進行三方�併。"
 
-#: builtin/am.c:1541
+#: builtin/am.c:1568
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引來�建一個（三方�併的）基礎目錄樹..."
 
-#: builtin/am.c:1560
+#: builtin/am.c:1587
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -10498,24 +10445,24 @@ msgstr ""
 "您是�曾手動編輯�您的修補檔？\n"
 "無法套用修補檔到索引中的資料物件上。"
 
-#: builtin/am.c:1566
+#: builtin/am.c:1593
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基礎版本上修補�進行三方�併..."
 
-#: builtin/am.c:1592
+#: builtin/am.c:1619
 msgid "Failed to merge in the changes."
 msgstr "無法�併變更。"
 
-#: builtin/am.c:1624
+#: builtin/am.c:1651
 msgid "applying to an empty history"
 msgstr "正套用到一個空歷�上"
 
-#: builtin/am.c:1676 builtin/am.c:1680
+#: builtin/am.c:1703 builtin/am.c:1707
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "無法繼續：%s �存在。"
 
-#: builtin/am.c:1698
+#: builtin/am.c:1725
 msgid "Commit Body is:"
 msgstr "�交內容為："
 
@@ -10524,39 +10471,57 @@ msgstr "�交內容為："
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1708
+#: builtin/am.c:1735
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "套用？是[y]/�[n]/編輯[e]/檢視修補檔[v]/全部接�[a]： "
 
-#: builtin/am.c:1754 builtin/commit.c:409
+#: builtin/am.c:1781 builtin/commit.c:409
 msgid "unable to write index file"
 msgstr "無法寫入索引檔案"
 
-#: builtin/am.c:1758
+#: builtin/am.c:1785
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "髒索引：�能套用修補檔（髒檔案：%s）"
 
-#: builtin/am.c:1798 builtin/am.c:1865
+#: builtin/am.c:1827
+#, c-format
+msgid "Skipping: %.*s"
+msgstr "略�：%.*s"
+
+#: builtin/am.c:1832
+#, c-format
+msgid "Creating an empty commit: %.*s"
+msgstr "建立空白�交：%.*s"
+
+#: builtin/am.c:1836
+msgid "Patch is empty."
+msgstr "修補檔為空。"
+
+#: builtin/am.c:1847 builtin/am.c:1916
 #, c-format
 msgid "Applying: %.*s"
 msgstr "套用：%.*s"
 
-#: builtin/am.c:1815
+#: builtin/am.c:1864
 msgid "No changes -- Patch already applied."
 msgstr "沒有變更——修補檔已經套用�。"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1870
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打修補檔失敗於 %s %.*s"
 
-#: builtin/am.c:1825
+#: builtin/am.c:1874
 msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
 
-#: builtin/am.c:1868
+#: builtin/am.c:1920
+msgid "No changes - recorded it as an empty commit."
+msgstr "沒有變更 � 將其錄製為空白�交。"
+
+#: builtin/am.c:1922
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -10566,7 +10531,7 @@ msgstr ""
 "如果沒有什麼�新增到暫存�的，則很�能是其它�交已經引入了相�的變更。\n"
 "您也許想�略�這個修補檔。"
 
-#: builtin/am.c:1875
+#: builtin/am.c:1930
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -10577,175 +10542,183 @@ msgstr ""
 "您應該�已經��解決的�一個檔案執行 'git add' 來標記已經完�。 \n"
 "你�以� \"由他們刪除\" 的檔案執行 `git rm` 指令。"
 
-#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353
-#: builtin/reset.c:361
+#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448
+#: builtin/reset.c:456
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�能解�物件 '%s'。"
 
-#: builtin/am.c:2035 builtin/am.c:2111
+#: builtin/am.c:2090 builtin/am.c:2166
 msgid "failed to clean index"
 msgstr "清空索引失敗"
 
-#: builtin/am.c:2079
+#: builtin/am.c:2134
 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:2187
+#: builtin/am.c:2242
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "無效的 --patch-format 值：%s"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2285
 #, c-format
 msgid "Invalid value for --show-current-patch: %s"
 msgstr "無效的 --show-current-patch 值：%s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2289
 #, c-format
-msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
-msgstr "--show-current-patch=%s 與 --show-current-patch=%s �相容"
+msgid "options '%s=%s' and '%s=%s' cannot be used together"
+msgstr "「%s=%s�和「%s=%s��項�得�時使用"
 
-#: builtin/am.c:2264
+#: builtin/am.c:2320
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<�項>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2265
+#: builtin/am.c:2321
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<�項>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2271
+#: builtin/am.c:2327
 msgid "run interactively"
 msgstr "以互動�方�執行"
 
-#: builtin/am.c:2273
+#: builtin/am.c:2329
 msgid "historical option -- no-op"
 msgstr "�的�數 —— 無作用"
 
-#: builtin/am.c:2275
+#: builtin/am.c:2331
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�許使用三方�併"
 
-#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16
-#: builtin/repack.c:640 builtin/stash.c:961
+#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16
+#: builtin/repack.c:642 builtin/stash.c:962
 msgid "be quiet"
 msgstr "�默模�"
 
-#: builtin/am.c:2278
+#: builtin/am.c:2334
 msgid "add a Signed-off-by trailer to the commit message"
 msgstr "在�交說明�尾加入 Signed-off-by"
 
-#: builtin/am.c:2281
+#: builtin/am.c:2337
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字元集（�設）"
 
-#: builtin/am.c:2283
+#: builtin/am.c:2339
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 傳� -k �數"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2341
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 傳� -b �數"
 
-#: builtin/am.c:2287
+#: builtin/am.c:2343
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 傳� -m �數"
 
-#: builtin/am.c:2289
+#: builtin/am.c:2345
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "�� mbox 格�，� git-mailsplit 傳� --keep-cr �數"
 
-#: builtin/am.c:2292
+#: builtin/am.c:2348
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "�� git-mailsplit 傳� --keep-cr �數，覆蓋 am.keepcr 的設定"
 
-#: builtin/am.c:2295
+#: builtin/am.c:2351
 msgid "strip everything before a scissors line"
 msgstr "�棄�切線�的所有內容"
 
-#: builtin/am.c:2297
+#: builtin/am.c:2353
 msgid "pass it through git-mailinfo"
 msgstr "�� git-mailinfo 傳�"
 
-#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309
-#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321
-#: builtin/am.c:2327
+#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365
+#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377
+#: builtin/am.c:2383
 msgid "pass it through git-apply"
 msgstr "傳�給 git-apply"
 
-#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17
-#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262
+#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263
 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221
-#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655
-#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172
+#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657
+#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172
 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175
-#: parse-options.h:315
+#: parse-options.h:317
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109
-#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479
+#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109
+#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479
 #: builtin/verify-tag.c:38
 msgid "format"
 msgstr "格�"
 
-#: builtin/am.c:2324
+#: builtin/am.c:2380
 msgid "format the patch(es) are in"
 msgstr "修補檔的格�"
 
-#: builtin/am.c:2330
+#: builtin/am.c:2386
 msgid "override error message when patch failure occurs"
 msgstr "打修補檔失敗時顯示的錯誤訊�"
 
-#: builtin/am.c:2332
+#: builtin/am.c:2388
 msgid "continue applying patches after resolving a conflict"
 msgstr "��解決後繼續套用修補檔"
 
-#: builtin/am.c:2335
+#: builtin/am.c:2391
 msgid "synonyms for --continue"
 msgstr "和 --continue �義"
 
-#: builtin/am.c:2338
+#: builtin/am.c:2394
 msgid "skip the current patch"
 msgstr "略�目�修補檔"
 
-#: builtin/am.c:2341
+#: builtin/am.c:2397
 msgid "restore the original branch and abort the patching operation"
 msgstr "還原原始分支並中止修補動作"
 
-#: builtin/am.c:2344
+#: builtin/am.c:2400
 msgid "abort the patching operation but keep HEAD where it is"
 msgstr "終止修補動作但�� HEAD �變"
 
-#: builtin/am.c:2348
+#: builtin/am.c:2404
 msgid "show the patch being applied"
 msgstr "顯示正在套用的修補檔"
 
-#: builtin/am.c:2353
+#: builtin/am.c:2408
+msgid "record the empty patch as an empty commit"
+msgstr "將空白修補檔錄製為空白�交"
+
+#: builtin/am.c:2412
 msgid "lie about committer date"
 msgstr "將作者日期作為�交日期"
 
-#: builtin/am.c:2355
+#: builtin/am.c:2414
 msgid "use current timestamp for author date"
 msgstr "用目�時間作為作者日期"
 
-#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642
-#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099
+#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643
+#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099
 #: builtin/revert.c:117 builtin/tag.c:460
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2358 builtin/rebase.c:1100
+#: builtin/am.c:2417 builtin/rebase.c:1100
 msgid "GPG-sign commits"
 msgstr "使用 GPG 簽��交"
 
-#: builtin/am.c:2361
+#: builtin/am.c:2420
+msgid "how to handle empty patches"
+msgstr "空白修補檔的處�方�"
+
+#: builtin/am.c:2423
 msgid "(internal use for git-rebase)"
 msgstr "（內部使用，用於 git-rebase）"
 
-#: builtin/am.c:2379
+#: builtin/am.c:2441
 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."
@@ -10753,16 +10726,16 @@ msgstr ""
 "�數 -b/--binary 已經很長時間��任何實質動作了，並且將被移除。\n"
 "請���使用它了。"
 
-#: builtin/am.c:2386
+#: builtin/am.c:2448
 msgid "failed to read the index"
 msgstr "讀�索引失敗"
 
-#: builtin/am.c:2401
+#: builtin/am.c:2463
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�定基底目錄 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2425
+#: builtin/am.c:2487
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -10771,11 +10744,11 @@ msgstr ""
 "發�了錯誤的 %s 目錄。\n"
 "使用 \"git am --abort\" 刪除它。"
 
-#: builtin/am.c:2431
+#: builtin/am.c:2493
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解決動作未進行，我們�會繼續。"
 
-#: builtin/am.c:2441
+#: builtin/am.c:2503
 msgid "interactive mode requires patches on the command line"
 msgstr "互動�模�需�指令列上�供修補檔"
 
@@ -11228,11 +11201,11 @@ msgstr "�將根�交看作邊界（�設值：off）"
 msgid "show work cost statistics"
 msgstr "顯示工作�統計"
 
-#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94
-#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179
-#: builtin/merge.c:298 builtin/multi-pack-index.c:103
-#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178
-#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566
+#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94
+#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180
+#: builtin/merge.c:301 builtin/multi-pack-index.c:103
+#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180
+#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566
 #: builtin/send-pack.c:202
 msgid "force progress reporting"
 msgstr "強制顯示進度報告"
@@ -11281,7 +11254,7 @@ msgstr "顯示作者信箱而��稱（�設值：off）"
 msgid "ignore whitespace differences"
 msgstr "忽略空白差異"
 
-#: builtin/blame.c:879 builtin/log.c:1823
+#: builtin/blame.c:879 builtin/log.c:1838
 msgid "rev"
 msgstr "版本"
 
@@ -11295,7 +11268,7 @@ msgstr "忽略 <檔案> 中的修訂版"
 
 #: builtin/blame.c:881
 msgid "color redundant metadata from previous line differently"
-msgstr "使用�色間隔輸出與�一行��的�複元訊�"
+msgstr "使用�色間隔輸出與�一行��的�複中介資料"
 
 #: builtin/blame.c:882
 msgid "color lines by age"
@@ -11333,7 +11306,7 @@ msgstr "range"
 msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "�處�範�在 <開始>,<�尾> 的列，或是 :<函數�稱> 函數"
 
-#: builtin/blame.c:944
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress �能跟 --incremental 或 porcelain 格��時使用"
 
@@ -11345,17 +11318,17 @@ msgstr "--progress �能跟 --incremental 或 porcelain 格��時使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:995
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 個月�"
 
-#: builtin/blame.c:1111
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "檔案 %s �有 %lu 行"
 
-#: builtin/blame.c:1156
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "追蹤程�碼行"
 
@@ -11388,7 +11361,7 @@ msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<�項>] [-r | -a] [--format]"
 
 #  譯者：��原�行格�，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:154
+#: builtin/branch.c:153
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
@@ -11398,7 +11371,7 @@ msgstr ""
 "         '%s'，但未�併到 HEAD。"
 
 #  譯者：��原�行格�，在輸出時 %s 的替代內容會讓字串變長
-#: builtin/branch.c:158
+#: builtin/branch.c:157
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
@@ -11407,12 +11380,12 @@ msgstr ""
 "並未刪除分支 '%s'， 雖然它已經�併到 HEAD，\n"
 "         然而�尚未被�併到分支 '%s' 。"
 
-#: builtin/branch.c:172
+#: builtin/branch.c:171
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "無法查詢 '%s' 指�的�交物件"
 
-#: builtin/branch.c:176
+#: builtin/branch.c:175
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
@@ -11421,7 +11394,7 @@ msgstr ""
 "分支 '%s' 沒有完全�併。\n"
 "如果您確��刪除它，執行 'git branch -D %s'。"
 
-#: builtin/branch.c:189
+#: builtin/branch.c:188
 msgid "Update of config-file failed"
 msgstr "更新設定檔案失敗"
 
@@ -11433,99 +11406,99 @@ msgstr "�能將 -a 和 -d �時使用"
 msgid "Couldn't look up commit object for HEAD"
 msgstr "無法查詢 HEAD 指�的�交物件"
 
-#: builtin/branch.c:244
+#: builtin/branch.c:247
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "無法刪除在「%2$s�簽出的「%1$s�分支"
 
-#: builtin/branch.c:259
+#: builtin/branch.c:262
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到�端追蹤分支 '%s'。"
 
-#: builtin/branch.c:260
+#: builtin/branch.c:263
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未發�。"
 
-#: builtin/branch.c:291
+#: builtin/branch.c:294
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已刪除�端追蹤分支 %s（曾為 %s）。\n"
 
-#: builtin/branch.c:292
+#: builtin/branch.c:295
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已刪除分支 %s（曾為 %s）。\n"
 
-#: builtin/branch.c:441 builtin/tag.c:63
+#: builtin/branch.c:445 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "�能解�格�化字串"
 
-#: builtin/branch.c:472
+#: builtin/branch.c:476
 msgid "could not resolve HEAD"
 msgstr "�能解� HEAD �交"
 
-#: builtin/branch.c:478
+#: builtin/branch.c:482
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指� refs/heads/ 之外"
 
-#: builtin/branch.c:493
+#: builtin/branch.c:497
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被�定基底到 %s"
 
-#: builtin/branch.c:497
+#: builtin/branch.c:501
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分�尋於 %s"
 
-#: builtin/branch.c:514
+#: builtin/branch.c:518
 msgid "cannot copy the current branch while not on any."
 msgstr "無法複製目�分支因為�處於任何分支上。"
 
-#: builtin/branch.c:516
+#: builtin/branch.c:520
 msgid "cannot rename the current branch while not on any."
 msgstr "無法�新命�目�分支因為�處於任何分支上。"
 
-#: builtin/branch.c:527
+#: builtin/branch.c:531
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "無效的分支�：'%s'"
 
-#: builtin/branch.c:556
+#: builtin/branch.c:560
 msgid "Branch rename failed"
 msgstr "分支�新命�失敗"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:562
 msgid "Branch copy failed"
 msgstr "分支複製失敗"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:566
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已為錯誤命�的分支 '%s' 建立了一個副本"
 
-#: builtin/branch.c:565
+#: builtin/branch.c:569
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已將錯誤命�的分支 '%s' �新命�"
 
-#: builtin/branch.c:571
+#: builtin/branch.c:575
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�新命�為 %s，但 HEAD 沒有更新�"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:584
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被�新命�，但更新設定檔案失敗"
 
-#: builtin/branch.c:582
+#: builtin/branch.c:586
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已複製，但更新設定檔案失敗"
 
-#: builtin/branch.c:598
+#: builtin/branch.c:602
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -11536,209 +11509,205 @@ msgstr ""
 "  %s\n"
 "以 '%c' 開頭的行將被�濾。\n"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:637
 msgid "Generic options"
 msgstr "通用�項"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:639
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "顯示雜湊值和主題，若�數出�兩次則顯示上游分支"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:640
 msgid "suppress informational messages"
 msgstr "�顯示訊�"
 
-#: builtin/branch.c:636
-msgid "set up tracking mode (see git-pull(1))"
-msgstr "設定追蹤模�（�見 git-pull(1)）"
+#: builtin/branch.c:642
+msgid "set branch tracking configuration"
+msgstr "設定分支追蹤設定"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:645
 msgid "do not use"
 msgstr "��使用"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:647
 msgid "change the upstream info"
 msgstr "改變上游訊�"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:648
 msgid "unset the upstream info"
 msgstr "�消上游資訊設定"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:649
 msgid "use colored output"
 msgstr "使用彩色輸出"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:650
 msgid "act on remote-tracking branches"
 msgstr "作用於�端追蹤分支"
 
-#: builtin/branch.c:645 builtin/branch.c:647
+#: builtin/branch.c:652 builtin/branch.c:654
 msgid "print only branches that contain the commit"
 msgstr "�列�包�該�交的分支"
 
-#: builtin/branch.c:646 builtin/branch.c:648
+#: builtin/branch.c:653 builtin/branch.c:655
 msgid "print only branches that don't contain the commit"
 msgstr "�列��包�該�交的分支"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:658
 msgid "Specific git-branch actions:"
 msgstr "具體的 git-branch 動作："
 
-#: builtin/branch.c:652
+#: builtin/branch.c:659
 msgid "list both remote-tracking and local branches"
 msgstr "列出�端追蹤�本機分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:661
 msgid "delete fully merged branch"
 msgstr "刪除完全�併的分支"
 
-#: builtin/branch.c:655
+#: builtin/branch.c:662
 msgid "delete branch (even if not merged)"
 msgstr "刪除分支（�使沒有�併）"
 
-#: builtin/branch.c:656
+#: builtin/branch.c:663
 msgid "move/rename a branch and its reflog"
 msgstr "移動/�新命�一個分支，以�它的引用日誌"
 
-#: builtin/branch.c:657
+#: builtin/branch.c:664
 msgid "move/rename a branch, even if target exists"
 msgstr "移動/�新命�一個分支，�使目標已存在"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:665
 msgid "copy a branch and its reflog"
 msgstr "複製一個分支和它的引用日誌"
 
-#: builtin/branch.c:659
+#: builtin/branch.c:666
 msgid "copy a branch, even if target exists"
 msgstr "複製一個分支，�使目標已存在"
 
-#: builtin/branch.c:660
+#: builtin/branch.c:667
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:661
+#: builtin/branch.c:668
 msgid "show current branch name"
 msgstr "顯示目�分支�"
 
-#: builtin/branch.c:662
+#: builtin/branch.c:669
 msgid "create the branch's reflog"
 msgstr "建立分支的引用日誌"
 
-#: builtin/branch.c:664
+#: builtin/branch.c:671
 msgid "edit the description for the branch"
 msgstr "標記分支的�述"
 
-#: builtin/branch.c:665
+#: builtin/branch.c:672
 msgid "force creation, move/rename, deletion"
 msgstr "強制建立�移動/�新命��刪除"
 
-#: builtin/branch.c:666
+#: builtin/branch.c:673
 msgid "print only branches that are merged"
 msgstr "�列�已經�併的分支"
 
-#: builtin/branch.c:667
+#: builtin/branch.c:674
 msgid "print only branches that are not merged"
 msgstr "�列�尚未�併的分支"
 
-#: builtin/branch.c:668
+#: builtin/branch.c:675
 msgid "list branches in columns"
 msgstr "以列的方�顯示分支"
 
-#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413
+#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413
 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582
 #: builtin/tag.c:475
 msgid "object"
 msgstr "物件"
 
-#: builtin/branch.c:671
+#: builtin/branch.c:678
 msgid "print only branches of the object"
 msgstr "�列�指�該物件的分支"
 
-#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482
+#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482
 msgid "sorting and filtering are case insensitive"
 msgstr "排�和�濾屬於大�寫��感"
 
-#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480
+#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "輸出格�"
 
-#: builtin/branch.c:696 builtin/clone.c:678
+#: builtin/branch.c:703 builtin/clone.c:678
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 沒有�於 /refs/heads 之下�"
 
-#: builtin/branch.c:720
-msgid "--column and --verbose are incompatible"
-msgstr "--column 和 --verbose �相容"
-
-#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801
+#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807
 msgid "branch name required"
 msgstr "必須�供分支�"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:774
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分離開頭指標�供�述"
 
-#: builtin/branch.c:773
+#: builtin/branch.c:779
 msgid "cannot edit description of more than one branch"
 msgstr "�能為一個以上的分支編輯�述"
 
-#: builtin/branch.c:780
+#: builtin/branch.c:786
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚無�交。"
 
-#: builtin/branch.c:783
+#: builtin/branch.c:789
 #, c-format
 msgid "No branch named '%s'."
 msgstr "沒有分支 '%s'。"
 
-#: builtin/branch.c:798
+#: builtin/branch.c:804
 msgid "too many branches for a copy operation"
 msgstr "為複製動作�供了太多的分支�"
 
-#: builtin/branch.c:807
+#: builtin/branch.c:813
 msgid "too many arguments for a rename operation"
 msgstr "為�新命�動作�供了太多的�數"
 
-#: builtin/branch.c:812
+#: builtin/branch.c:818
 msgid "too many arguments to set new upstream"
 msgstr "為設定新上游�供了太多的�數"
 
-#: builtin/branch.c:816
+#: builtin/branch.c:822
 #, 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:819 builtin/branch.c:842
+#: builtin/branch.c:825 builtin/branch.c:848
 #, c-format
 msgid "no such branch '%s'"
 msgstr "沒有此分支 '%s'"
 
-#: builtin/branch.c:823
+#: builtin/branch.c:829
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:836
+#: builtin/branch.c:842
 msgid "too many arguments to unset upstream"
 msgstr "為�消上游設定動作�供了太多的�數"
 
-#: builtin/branch.c:840
+#: builtin/branch.c:846
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "在 HEAD 的上游未指�任何分支時無法�消設定。"
 
-#: builtin/branch.c:846
+#: builtin/branch.c:852
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 沒有上游訊�"
 
-#: builtin/branch.c:856
+#: builtin/branch.c:862
 msgid ""
 "The -a, and -r, options to 'git branch' do not take a branch name.\n"
 "Did you mean to use: -a|-r --list <pattern>?"
@@ -11746,7 +11715,7 @@ msgstr ""
 "'git branch' 的 -a 和 -r �項�帶一個分支�。\n"
 "您是�想�使用：-a|-r --list <模�>？"
 
-#: builtin/branch.c:860
+#: builtin/branch.c:866
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -12013,8 +11982,8 @@ msgstr "從標準輸入讀出檔案�"
 msgid "terminate input and output records by a NUL character"
 msgstr "輸入和輸出的紀錄使用 NUL 字元終�"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549
-#: builtin/worktree.c:494
+#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "�顯示進度報告"
 
@@ -12072,10 +12041,10 @@ msgid "git checkout--worker [<options>]"
 msgstr "git checkout--worker [<�項>]"
 
 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863
-#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874
-#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576
-#: builtin/worktree.c:492 builtin/worktree.c:729
+#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875
+#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/worktree.c:491 builtin/worktree.c:728
 msgid "string"
 msgstr "字串"
 
@@ -12139,95 +12108,90 @@ msgstr "git switch [<�項>] [<分支>]"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<�項>] [--source=<分支>] <檔案>..."
 
-#: builtin/checkout.c:190 builtin/checkout.c:229
+#: builtin/checkout.c:198 builtin/checkout.c:237
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路徑 '%s' 沒有我們的版本"
 
-#: builtin/checkout.c:192 builtin/checkout.c:231
+#: builtin/checkout.c:200 builtin/checkout.c:239
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路徑 '%s' 沒有他們的版本"
 
-#: builtin/checkout.c:208
+#: builtin/checkout.c:216
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路徑 '%s' 沒有全部必需的版本"
 
-#: builtin/checkout.c:261
+#: builtin/checkout.c:269
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路徑 '%s' 沒有必需的版本"
 
-#: builtin/checkout.c:278
+#: builtin/checkout.c:286
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：無法�併"
 
-#: builtin/checkout.c:294
+#: builtin/checkout.c:302
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "無法為 '%s' 新增�併�果"
 
-#: builtin/checkout.c:411
+#: builtin/checkout.c:419
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "�新建立了 %d 個�併��"
 
-#: builtin/checkout.c:416
+#: builtin/checkout.c:424
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "從 %2$s 更新了 %1$d 個路徑"
 
-#: builtin/checkout.c:423
+#: builtin/checkout.c:431
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "從索引�更新了 %d 個路徑"
 
-#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
-#: builtin/checkout.c:456
+#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460
+#: builtin/checkout.c:464
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' �能在更新路徑時使用"
 
-#: builtin/checkout.c:459 builtin/checkout.c:462
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "'%s' �能和 %s �時使用"
-
-#: builtin/checkout.c:466
+#: builtin/checkout.c:474
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�時更新路徑並切�到分支'%s'。"
 
-#: builtin/checkout.c:470
+#: builtin/checkout.c:478
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都沒有指定"
 
-#: builtin/checkout.c:474
+#: builtin/checkout.c:482
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
 
-#: builtin/checkout.c:479 builtin/checkout.c:484
+#: builtin/checkout.c:487 builtin/checkout.c:492
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' 或 '%s' �能和 %s 一起使用"
 
-#: builtin/checkout.c:558 builtin/checkout.c:565
+#: builtin/checkout.c:566 builtin/checkout.c:573
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路徑 '%s' 未�併"
 
-#: builtin/checkout.c:736
+#: builtin/checkout.c:747
 msgid "you need to resolve your current index first"
 msgstr "您需�先解決目�索引的��"
 
-#: builtin/checkout.c:786
+#: builtin/checkout.c:797
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -12236,51 +12200,51 @@ msgstr ""
 "�能繼續，下列檔案有暫存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:879
+#: builtin/checkout.c:890
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能� '%s' 執行 reflog 動作：%s\n"
 
-#: builtin/checkout.c:921
+#: builtin/checkout.c:934
 msgid "HEAD is now at"
 msgstr "HEAD 目��於"
 
-#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "�能更新 HEAD"
 
-#: builtin/checkout.c:929
+#: builtin/checkout.c:942
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�設分支 '%s'\n"
 
-#: builtin/checkout.c:932
+#: builtin/checkout.c:945
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已經�於 '%s'\n"
 
-#: builtin/checkout.c:936
+#: builtin/checkout.c:949
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�並�設分支 '%s'\n"
 
-#: builtin/checkout.c:938 builtin/checkout.c:1369
+#: builtin/checkout.c:951 builtin/checkout.c:1388
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一個新分支 '%s'\n"
 
-#: builtin/checkout.c:940
+#: builtin/checkout.c:953
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  譯者：請維��導空格
-#: builtin/checkout.c:991
+#: builtin/checkout.c:1004
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 個。\n"
 
-#: builtin/checkout.c:997
+#: builtin/checkout.c:1010
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -12297,7 +12261,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:1016
+#: builtin/checkout.c:1029
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12318,19 +12282,19 @@ msgstr[0] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1064
 msgid "internal error in revision walk"
 msgstr "在版本�歷時�到內部錯誤"
 
-#: builtin/checkout.c:1055
+#: builtin/checkout.c:1068
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:1095 builtin/checkout.c:1364
+#: builtin/checkout.c:1114 builtin/checkout.c:1383
 msgid "You are on a branch yet to be born"
 msgstr "您�於一個尚未�始化的分支"
 
-#: builtin/checkout.c:1177
+#: builtin/checkout.c:1196
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -12339,7 +12303,7 @@ msgstr ""
 "'%s' 既�以是一個本機檔案，也�以是一個追蹤分支。\n"
 "請使用 --（和��的 --no-guess）來消除歧義"
 
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1203
 msgid ""
 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
 "you can do so by fully qualifying the name with the --track option:\n"
@@ -12358,51 +12322,51 @@ msgstr ""
 "如果您總是喜歡使用模糊的簡短分支� <name>，而�喜歡如 'origin' 的�端\n"
 "版本庫�，�以在設定中設定 checkout.defaultRemote=origin。"
 
-#: builtin/checkout.c:1194
+#: builtin/checkout.c:1213
 #, c-format
 msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr "'%s' 符�多個 (%d) �端追蹤分支"
 
-#: builtin/checkout.c:1260
+#: builtin/checkout.c:1279
 msgid "only one reference expected"
 msgstr "�期�有一個引用"
 
-#: builtin/checkout.c:1277
+#: builtin/checkout.c:1296
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "應�有一個引用，��供了 %d 個。"
 
-#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437
+#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "無效引用：%s"
 
-#: builtin/checkout.c:1336 builtin/checkout.c:1705
+#: builtin/checkout.c:1355 builtin/checkout.c:1725
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一個樹：%s"
 
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1402
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一個分支，得到標籤 '%s'"
 
-#: builtin/checkout.c:1385
+#: builtin/checkout.c:1404
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一個分支，得到�端分支 '%s'"
 
-#: builtin/checkout.c:1386 builtin/checkout.c:1394
+#: builtin/checkout.c:1405 builtin/checkout.c:1413
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一個分支，得到 '%s'"
 
-#: builtin/checkout.c:1389
+#: builtin/checkout.c:1408
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一個分支，得到�交 '%s'"
 
-#: builtin/checkout.c:1405
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -12410,7 +12374,7 @@ msgstr ""
 "�能在�併時切�分支\n"
 "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1409
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -12418,7 +12382,7 @@ msgstr ""
 "�能在 am 工作階段期間切�分支\n"
 "考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1413
+#: builtin/checkout.c:1432
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -12426,7 +12390,7 @@ msgstr ""
 "�能在�定基底時切�分支\n"
 "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1417
+#: builtin/checkout.c:1436
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -12434,7 +12398,7 @@ msgstr ""
 "�能在��時切�分支\n"
 "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1421
+#: builtin/checkout.c:1440
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -12442,208 +12406,196 @@ msgstr ""
 "�能在還原時切�分支\n"
 "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1444
 msgid "you are switching branch while bisecting"
 msgstr "您在執行二分�尋時切�分支"
 
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1451
 msgid "paths cannot be used with switching branches"
 msgstr "路徑�能和切�分支�時使用"
 
-#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443
+#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' �能和切�分支�時使用"
 
-#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453
-#: builtin/checkout.c:1458 builtin/checkout.c:1463
+#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472
+#: builtin/checkout.c:1477 builtin/checkout.c:1482
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' �能和 '%s' �時使用"
 
-#: builtin/checkout.c:1460
+#: builtin/checkout.c:1479
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' �帶 <起始點>"
 
-#: builtin/checkout.c:1468
+#: builtin/checkout.c:1487
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一個��交 '%s'"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1494
 msgid "missing branch or commit argument"
 msgstr "缺少分支或�交�數"
 
-#: builtin/checkout.c:1518
+#: builtin/checkout.c:1537
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支執行三方�併"
 
-#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321
+#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323
 msgid "style"
 msgstr "風格"
 
-#: builtin/checkout.c:1520
-msgid "conflict style (merge or diff3)"
-msgstr "��輸出風格（merge 或 diff3）"
+#: builtin/checkout.c:1539
+msgid "conflict style (merge, diff3, or zdiff3)"
+msgstr "��輸出風格（merge�diff3 或 zdiff3）"
 
-#: builtin/checkout.c:1532 builtin/worktree.c:489
+#: builtin/checkout.c:1551 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD 從指定的�交分離"
 
-#: builtin/checkout.c:1533
-msgid "set upstream info for new branch"
-msgstr "為新的分支設定上游訊�"
+#: builtin/checkout.c:1553
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "設定追蹤模�（�見 git-pull(1)）"
 
-#: builtin/checkout.c:1535
+#: builtin/checkout.c:1556
 msgid "force checkout (throw away local modifications)"
 msgstr "強制簽出（�棄本機修改）"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1558
 msgid "new unparented branch"
 msgstr "新的沒有父�交的分支"
 
-#: builtin/checkout.c:1539 builtin/merge.c:302
+#: builtin/checkout.c:1560 builtin/merge.c:305
 msgid "update ignored files (default)"
 msgstr "更新忽略的檔案（�設）"
 
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1563
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�檢查指定的引用是�被其他工作�所�用"
 
-#: builtin/checkout.c:1555
+#: builtin/checkout.c:1576
 msgid "checkout our version for unmerged files"
 msgstr "�尚未�併的檔案簽出我們的版本"
 
-#: builtin/checkout.c:1558
+#: builtin/checkout.c:1579
 msgid "checkout their version for unmerged files"
 msgstr "�尚未�併的檔案簽出他們的版本"
 
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1583
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "�路徑��稀�簽出的�制"
 
-#: builtin/checkout.c:1620
+#: builtin/checkout.c:1640
 #, c-format
-msgid "-%c, -%c and --orphan are mutually exclusive"
-msgstr "-%c�-%c 和 --orphan 是互斥的"
-
-#: builtin/checkout.c:1624
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-p 和 --overlay 互斥"
+msgid "options '-%c', '-%c', and '%s' cannot be used together"
+msgstr "「-%c��「-%c�和「%s��項�得�時使用"
 
-#: builtin/checkout.c:1661
+#: builtin/checkout.c:1681
 msgid "--track needs a branch name"
 msgstr "--track 需�一個分支�"
 
-#: builtin/checkout.c:1666
+#: builtin/checkout.c:1686
 #, c-format
 msgid "missing branch name; try -%c"
 msgstr "缺少分支�稱，請嘗試 -%c"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1718
 #, c-format
 msgid "could not resolve %s"
 msgstr "無法解� %s"
 
-#: builtin/checkout.c:1714
+#: builtin/checkout.c:1734
 msgid "invalid path specification"
 msgstr "無效的路徑�格"
 
-#: builtin/checkout.c:1721
+#: builtin/checkout.c:1741
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' �是一個�交，�能基於它建立分支 '%s'"
 
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1745
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach �能接收路徑�數 '%s'"
 
-#: builtin/checkout.c:1734
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--pathspec-from-file 與 --detach �相容"
-
-#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--pathspec-from-file 與 --patch �相容"
-
-#: builtin/checkout.c:1750
+#: builtin/checkout.c:1770
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 "git checkout：在從索引簽出時，--ours/--theirs�--force 和 --merge �相容。"
 
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1775
 msgid "you must specify path(s) to restore"
 msgstr "您必須指定一個�復原的路徑"
 
-#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832
-#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2958
-#: builtin/submodule--helper.c:3252 builtin/worktree.c:485
-#: builtin/worktree.c:487
+#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854
+#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:3253 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1782
+#: builtin/checkout.c:1801
 msgid "create and checkout a new branch"
 msgstr "建立並簽出一個新的分支"
 
-#: builtin/checkout.c:1784
+#: builtin/checkout.c:1803
 msgid "create/reset and checkout a branch"
 msgstr "建立/�設並簽出一個分支"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1804
 msgid "create reflog for new branch"
 msgstr "為新的分支建立引用日誌"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1806
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜測 'git checkout <無此分支>'（�設）"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1807
 msgid "use overlay mode (default)"
 msgstr "使用疊加模�（�設）"
 
-#: builtin/checkout.c:1833
+#: builtin/checkout.c:1855
 msgid "create and switch to a new branch"
 msgstr "建立並切�一個新分支"
 
-#: builtin/checkout.c:1835
+#: builtin/checkout.c:1857
 msgid "create/reset and switch to a branch"
 msgstr "建立/�設並切�一個分支"
 
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1859
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜測 'git switch <無此分支>'"
 
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1861
 msgid "throw away local modifications"
 msgstr "�棄本機修改"
 
-#: builtin/checkout.c:1873
+#: builtin/checkout.c:1897
 msgid "which tree-ish to checkout from"
 msgstr "�簽出哪一個樹"
 
-#: builtin/checkout.c:1875
+#: builtin/checkout.c:1899
 msgid "restore the index"
 msgstr "復原索引"
 
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1901
 msgid "restore the working tree (default)"
 msgstr "復原工作�（�設）"
 
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1903
 msgid "ignore unmerged entries"
 msgstr "忽略未�併�目"
 
-#: builtin/checkout.c:1880
+#: builtin/checkout.c:1904
 msgid "use overlay mode"
 msgstr "使用疊加模�"
 
@@ -12678,7 +12630,15 @@ msgstr "將忽略版本庫 %s\n"
 msgid "could not lstat %s\n"
 msgstr "�能� %s 呼� lstat\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:39
+msgid "Refusing to remove current working directory\n"
+msgstr "拒絕移除目�工作目錄\n"
+
+#: builtin/clean.c:40
+msgid "Would refuse to remove current working directory\n"
+msgstr "會拒絕移除目�的工作目錄\n"
+
+#: builtin/clean.c:326 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12691,7 +12651,7 @@ msgstr ""
 "foo        - ��唯一�綴�擇一個�項\n"
 "           - （空）什麼也��擇\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:330 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -12712,33 +12672,33 @@ msgstr ""
 "*          - �擇所有�項\n"
 "           - （空）���擇\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:568
+#: builtin/clean.c:545 git-add--interactive.perl:568
 #: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:659
+#: builtin/clean.c:685
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "輸入範本以排除�目>> "
 
-#: builtin/clean.c:693
+#: builtin/clean.c:719
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：無法找到和 %s 符�的�目"
 
-#: builtin/clean.c:714
+#: builtin/clean.c:740
 msgid "Select items to delete"
 msgstr "�擇�刪除的�目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:755
+#: builtin/clean.c:781
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "移除 %s [y/N]？ "
 
-#: builtin/clean.c:786
+#: builtin/clean.c:812
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -12756,65 +12716,65 @@ msgstr ""
 "help                - 顯示本�助\n"
 "?                   - 顯示如何在�示符下�擇的�助"
 
-#: builtin/clean.c:822
+#: builtin/clean.c:848
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "將刪除如下�目："
 
-#: builtin/clean.c:838
+#: builtin/clean.c:864
 msgid "No more files to clean, exiting."
 msgstr "沒有�清�的檔案，離開。"
 
-#: builtin/clean.c:900
+#: builtin/clean.c:926
 msgid "do not print names of files removed"
 msgstr "�列�刪除檔案的�稱"
 
-#: builtin/clean.c:902
+#: builtin/clean.c:928
 msgid "force"
 msgstr "強制"
 
-#: builtin/clean.c:903
+#: builtin/clean.c:929
 msgid "interactive cleaning"
 msgstr "互動�清除"
 
-#: builtin/clean.c:905
+#: builtin/clean.c:931
 msgid "remove whole directories"
 msgstr "刪除整個目錄"
 
-#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567
 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186
-#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "模�"
 
-#: builtin/clean.c:907
+#: builtin/clean.c:933
 msgid "add <pattern> to ignore rules"
 msgstr "新增 <模�> 到忽略�則"
 
-#: builtin/clean.c:908
+#: builtin/clean.c:934
 msgid "remove ignored files, too"
 msgstr "也刪除忽略的檔案"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:936
 msgid "remove only ignored files"
 msgstr "�刪除忽略的檔案"
 
-#: builtin/clean.c:925
+#: builtin/clean.c:951
 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:928
+#: builtin/clean.c:954
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce �設為 true 且未�供 -i�-n 或 -f �項，拒絕執行清�動作"
 
-#: builtin/clean.c:940
+#: builtin/clean.c:966
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X �能�時使用"
 
@@ -12870,19 +12830,20 @@ msgstr "範本目錄"
 msgid "directory from which templates will be used"
 msgstr "範本目錄將被使用"
 
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870
-#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260
 msgid "reference repository"
 msgstr "引用版本庫"
 
-#: builtin/clone.c:123 builtin/submodule--helper.c:1872
-#: builtin/submodule--helper.c:2515
+#: builtin/clone.c:123 builtin/submodule--helper.c:1873
+#: builtin/submodule--helper.c:2516
 msgid "use --reference only while cloning"
 msgstr "僅在複製時�考 --reference 指�的本機版本庫"
 
-#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
-#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663
-#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595
+#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27
+#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290
+#: builtin/pack-objects.c:3944 builtin/repack.c:665
+#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595
 #: t/helper/test-simple-ipc.c:597
 msgid "name"
 msgstr "�稱"
@@ -12899,7 +12860,7 @@ msgstr "簽出 <分支> 而�是�端 HEAD"
 msgid "path to git-upload-pack on the remote"
 msgstr "�端 git-upload-pack 路徑"
 
-#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876
+#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876
 #: builtin/pull.c:212
 msgid "depth"
 msgstr "深度"
@@ -12908,7 +12869,7 @@ msgstr "深度"
 msgid "create a shallow clone of that depth"
 msgstr "建立一個指定深度的淺複製"
 
-#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933
+#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933
 #: builtin/pull.c:215
 msgid "time"
 msgstr "時間"
@@ -12917,17 +12878,17 @@ msgstr "時間"
 msgid "create a shallow clone since a specific time"
 msgstr "建立從指定時間到�在的淺複製"
 
-#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207
+#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208
 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022
 msgid "revision"
 msgstr "修訂版"
 
-#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219
+#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "�得更多淺複製的�去歷�記錄，除了特定版本"
 
-#: builtin/clone.c:137 builtin/submodule--helper.c:1882
-#: builtin/submodule--helper.c:2529
+#: builtin/clone.c:137 builtin/submodule--helper.c:1883
+#: builtin/submodule--helper.c:2530
 msgid "clone only one branch, HEAD or --branch"
 msgstr "�複製一個分支�HEAD 或 --branch"
 
@@ -12955,22 +12916,22 @@ msgstr "key=value"
 msgid "set config inside the new repository"
 msgstr "在新版本庫中設定設定訊�"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77
+#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77
 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201
 msgid "option to transmit"
 msgstr "傳輸�項"
 
-#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238
+#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238
 #: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "�使用 IPv4 ��"
 
-#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241
+#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241
 #: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 ��"
@@ -13062,29 +13023,25 @@ msgstr "無法執行 repack 來清�"
 msgid "cannot unlink temporary alternates file"
 msgstr "無法刪除暫時的 alternates 檔案"
 
-#: builtin/clone.c:886 builtin/receive-pack.c:2493
+#: builtin/clone.c:886
 msgid "Too many arguments."
 msgstr "太多�數。"
 
-#: builtin/clone.c:890
+#: builtin/clone.c:890 contrib/scalar/scalar.c:414
 msgid "You must specify a repository to clone."
 msgstr "您必須指定�複製的版本庫。"
 
 #: builtin/clone.c:903
 #, c-format
-msgid "--bare and --origin %s options are incompatible."
-msgstr "--bare 和 --origin %s �項�相容。"
-
-#: builtin/clone.c:906
-msgid "--bare and --separate-git-dir are incompatible."
-msgstr "--bare 和 --separate-git-dir �項�相容。"
+msgid "options '%s' and '%s %s' cannot be used together"
+msgstr "「%s�和「%s %s��項�得�時使用"
 
 #: builtin/clone.c:920
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "版本庫 '%s' �存在"
 
-#: builtin/clone.c:924 builtin/fetch.c:2029
+#: builtin/clone.c:924 builtin/fetch.c:2052
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一個正數"
@@ -13104,8 +13061,8 @@ msgstr "版本庫路徑 '%s' 已經存在，並且�是一個空目錄。"
 msgid "working tree '%s' already exists."
 msgstr "工作� '%s' 已經存在。"
 
-#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262
-#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313
+#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256
+#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "�能為 '%s' 建立先導目錄"
@@ -13222,7 +13179,7 @@ msgstr ""
 "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
 "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
 
-#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779
+#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794
 msgid "dir"
 msgstr "目錄"
 
@@ -13302,7 +13259,7 @@ msgstr "�能�時使用 --reachable�--stdin-commits 或 --stdin-packs"
 msgid "Collecting commits from input"
 msgstr "正在從輸入收集�交"
 
-#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255
+#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "未識別的�指令：%s"
@@ -13320,7 +13277,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "忽略�複的父�交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577
 #, c-format
 msgid "not a valid object name %s"
 msgstr "�是一個有效的物件� %s"
@@ -13343,13 +13300,13 @@ msgstr "父�交"
 msgid "id of a parent commit object"
 msgstr "父�交物件 ID"
 
-#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283
-#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618
+#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284
+#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677
 #: builtin/tag.c:454
 msgid "message"
 msgstr "訊�"
 
-#: builtin/commit-tree.c:113 builtin/commit.c:1626
+#: builtin/commit-tree.c:113 builtin/commit.c:1627
 msgid "commit message"
 msgstr "�交說明"
 
@@ -13357,7 +13314,7 @@ msgstr "�交說明"
 msgid "read commit log message from file"
 msgstr "從檔案中讀��交說明"
 
-#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300
+#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303
 #: builtin/pull.c:180 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG �交簽�"
@@ -13434,10 +13391,6 @@ msgstr ""
 msgid "failed to unpack HEAD tree object"
 msgstr "解包 HEAD 樹狀物件失敗"
 
-#: builtin/commit.c:361
-msgid "--pathspec-from-file with -a does not make sense"
-msgstr "--pathspec-from-file 和 -a �時使用沒有�義"
-
 #: builtin/commit.c:375
 msgid "No paths with --include/--only does not make sense."
 msgstr "�數 --include/--only �跟路徑沒有�義。"
@@ -13523,8 +13476,8 @@ msgstr "�能讀�日誌檔案 '%s'"
 
 #: builtin/commit.c:802
 #, c-format
-msgid "cannot combine -m with --fixup:%s"
-msgstr "-m 和 --fixup:%s ����使用"
+msgid "options '%s' and '%s:%s' cannot be used together"
+msgstr "「%s�和「%s:%s��項�得�時使用"
 
 #: builtin/commit.c:814 builtin/commit.c:830
 msgid "could not read SQUASH_MSG"
@@ -13634,7 +13587,7 @@ msgstr "無法將尾部署�傳�至 --trailers"
 msgid "Error building trees"
 msgstr "無法建立樹狀物件"
 
-#: builtin/commit.c:1080 builtin/tag.c:317
+#: builtin/commit.c:1080 builtin/tag.c:316
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "請使用 -m 或 -F �項�供�交說明。\n"
@@ -13649,15 +13602,11 @@ msgstr "--author '%s' �是 '姓� <信箱>' 格�，且未能在�有作者
 msgid "Invalid ignored mode '%s'"
 msgstr "無效的忽略模� '%s'"
 
-#: builtin/commit.c:1156 builtin/commit.c:1450
+#: builtin/commit.c:1156 builtin/commit.c:1451
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "無效的未追蹤檔案�數 '%s'"
 
-#: builtin/commit.c:1196
-msgid "--long and -z are incompatible"
-msgstr "--long 和 -z �項�相容"
-
 #: builtin/commit.c:1227
 msgid "You are in the middle of a merge -- cannot reword."
 msgstr "正在�併中——�能�新輸入。"
@@ -13668,110 +13617,108 @@ msgstr "正在��中——�能�新輸入。"
 
 #: builtin/commit.c:1232
 #, c-format
-msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "�能將「%s�路徑與 --fixup 的 reword �項��"
+msgid "reword option of '%s' and path '%s' cannot be used together"
+msgstr "「%s�的改寫�項和「%s�路徑�得�時使用"
 
 #: builtin/commit.c:1234
-msgid ""
-"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
-"all/--include/--only"
-msgstr ""
-"--fixup 的 reword �項與 --patch/--interactive/--all/--include/--only 互斥"
+#, c-format
+msgid "reword option of '%s' and '%s' cannot be used together"
+msgstr "「%s�的改寫�項和「%s��得�時使用"
 
-#: builtin/commit.c:1253
+#: builtin/commit.c:1254
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�時使用 --reset-author 和 --author 沒有�義"
 
-#: builtin/commit.c:1260
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "您沒有�修補的�交。"
 
-#: builtin/commit.c:1263
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正處於一個�併�程中 -- 無法修補�交。"
 
-#: builtin/commit.c:1265
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正處於一個���程中 -- 無法修補�交。"
 
-#: builtin/commit.c:1267
+#: builtin/commit.c:1268
 msgid "You are in the middle of a rebase -- cannot amend."
 msgstr "您正處於�定基底的�程中 -- 無法修訂。"
 
-#: builtin/commit.c:1270
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "�項 --squash 和 --fixup �能�時使用"
 
-#: builtin/commit.c:1280
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一個 -c/-C/-F/--fixup �項。"
 
-#: builtin/commit.c:1282
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "�項 -m �能和 -c/-C/-F �時使用。"
 
-#: builtin/commit.c:1291
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author �能和 -C�-c 或 --amend �時使用。"
 
-#: builtin/commit.c:1309
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "�能用一個 --include/--only/--all/--interactive/--patch �項。"
 
-#: builtin/commit.c:1337
+#: builtin/commit.c:1338
 #, c-format
 msgid "unknown option: --fixup=%s:%s"
 msgstr "未知�項：--fixup=%s:%s"
 
-#: builtin/commit.c:1354
+#: builtin/commit.c:1355
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路徑 '%s ...' 和 -a �項�時使用沒有�義"
 
-#: builtin/commit.c:1485 builtin/commit.c:1654
+#: builtin/commit.c:1486 builtin/commit.c:1655
 msgid "show status concisely"
 msgstr "以簡潔的格�顯示狀態"
 
-#: builtin/commit.c:1487 builtin/commit.c:1656
+#: builtin/commit.c:1488 builtin/commit.c:1657
 msgid "show branch information"
 msgstr "顯示分支訊�"
 
-#: builtin/commit.c:1489
+#: builtin/commit.c:1490
 msgid "show stash information"
 msgstr "顯示儲��訊�"
 
-#: builtin/commit.c:1491 builtin/commit.c:1658
+#: builtin/commit.c:1492 builtin/commit.c:1659
 msgid "compute full ahead/behind values"
 msgstr "計算完整的領先/�後值"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1494
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551
-#: builtin/worktree.c:691
+#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "機器�讀的輸出"
 
-#: builtin/commit.c:1496 builtin/commit.c:1662
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "show status in long format (default)"
 msgstr "以長格�顯示狀態（�設）"
 
-#: builtin/commit.c:1499 builtin/commit.c:1665
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字元�尾"
 
-#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668
-#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
-#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335
+#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669
+#: builtin/fast-export.c:1172 builtin/fast-export.c:1175
+#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337
 msgid "mode"
 msgstr "模�"
 
-#: builtin/commit.c:1502 builtin/commit.c:1668
+#: builtin/commit.c:1503 builtin/commit.c:1669
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "顯示未追蹤的檔案，「模��的���數：all�normal�no。（�設值：all）"
 
-#: builtin/commit.c:1506
+#: builtin/commit.c:1507
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -13779,201 +13726,201 @@ msgstr ""
 "顯示已忽略的檔案，��模�：traditional�matching�no。（�設值："
 "traditional）"
 
-#: builtin/commit.c:1508 parse-options.h:192
+#: builtin/commit.c:1509 parse-options.h:192
 msgid "when"
 msgstr "何時"
 
-#: builtin/commit.c:1509
+#: builtin/commit.c:1510
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模組的更改，「何時�的���數：all�dirty�untracked。（�設值：all）"
 
-#: builtin/commit.c:1511
+#: builtin/commit.c:1512
 msgid "list untracked files in columns"
 msgstr "以列的方�顯示未追蹤的檔案"
 
-#: builtin/commit.c:1512
+#: builtin/commit.c:1513
 msgid "do not detect renames"
 msgstr "�檢測�新命�"
 
-#: builtin/commit.c:1514
+#: builtin/commit.c:1515
 msgid "detect renames, optionally set similarity index"
 msgstr "檢測�新命�，�以設定索引相似度"
 
-#: builtin/commit.c:1537
+#: builtin/commit.c:1538
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�支�已忽略和未追蹤檔案�數的組�"
 
-#: builtin/commit.c:1619
+#: builtin/commit.c:1620
 msgid "suppress summary after successful commit"
 msgstr "�交�功後�顯示概述訊�"
 
-#: builtin/commit.c:1620
+#: builtin/commit.c:1621
 msgid "show diff in commit message template"
 msgstr "在�交說明範本裡顯示差異"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1623
 msgid "Commit message options"
 msgstr "�交說明�項"
 
-#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456
+#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456
 msgid "read message from file"
 msgstr "從檔案中讀��交說明"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1624
+#: builtin/commit.c:1625
 msgid "override author for commit"
 msgstr "�交時覆蓋作者"
 
-#: builtin/commit.c:1625 builtin/gc.c:550
+#: builtin/commit.c:1626 builtin/gc.c:551
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1625
+#: builtin/commit.c:1626
 msgid "override date for commit"
 msgstr "�交時覆蓋日期"
 
-#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634
-#: parse-options.h:327 ref-filter.h:92
+#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635
+#: parse-options.h:329 ref-filter.h:89
 msgid "commit"
 msgstr "�交"
 
-#: builtin/commit.c:1627
+#: builtin/commit.c:1628
 msgid "reuse and edit message from specified commit"
 msgstr "�用並編輯指定�交的�交說明"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1629
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交說明"
 
 #. TRANSLATORS: Leave "[(amend|reword):]" as-is,
 #. and only translate <commit>.
 #.
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid "[(amend|reword):]commit"
 msgstr "[(amend|reword):]commit"
 
-#: builtin/commit.c:1633
+#: builtin/commit.c:1634
 msgid ""
 "use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr "使用 autosquash 格�化後的說明來 fixup 或是 amend/reword 指定�交"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1635
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格�的�交說明用以壓縮至指定的�交"
 
-#: builtin/commit.c:1635
+#: builtin/commit.c:1636
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "�在將該�交的作者改為我（和 -C/-c/--amend �數共用）"
 
-#: builtin/commit.c:1636 builtin/interpret-trailers.c:111
+#: builtin/commit.c:1637 builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "尾部署�"
 
-#: builtin/commit.c:1636
+#: builtin/commit.c:1637
 msgid "add custom trailer(s)"
 msgstr "加入自訂尾部署�"
 
-#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303
+#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306
 #: builtin/pull.c:146 builtin/revert.c:110
 msgid "add a Signed-off-by trailer"
 msgstr "在�尾加入 Signed-off-by"
 
-#: builtin/commit.c:1638
+#: builtin/commit.c:1639
 msgid "use specified template file"
 msgstr "使用指定的範本檔案"
 
-#: builtin/commit.c:1639
+#: builtin/commit.c:1640
 msgid "force edit of commit"
 msgstr "強制編輯�交"
 
-#: builtin/commit.c:1641
+#: builtin/commit.c:1642
 msgid "include status in commit message template"
 msgstr "在�交說明範本裡包�狀態訊�"
 
-#: builtin/commit.c:1646
+#: builtin/commit.c:1647
 msgid "Commit contents options"
 msgstr "�交內容�項"
 
-#: builtin/commit.c:1647
+#: builtin/commit.c:1648
 msgid "commit all changed files"
 msgstr "�交所有改動的檔案"
 
-#: builtin/commit.c:1648
+#: builtin/commit.c:1649
 msgid "add specified files to index for commit"
 msgstr "新增指定的檔案到索引�等待�交"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1650
 msgid "interactively add files"
 msgstr "互動�新增檔案"
 
-#: builtin/commit.c:1650
+#: builtin/commit.c:1651
 msgid "interactively add changes"
 msgstr "互動�新增變更"
 
-#: builtin/commit.c:1651
+#: builtin/commit.c:1652
 msgid "commit only specified files"
 msgstr "��交指定的檔案"
 
-#: builtin/commit.c:1652
+#: builtin/commit.c:1653
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "繞� pre-commit 和 commit-msg 掛鉤"
 
-#: builtin/commit.c:1653
+#: builtin/commit.c:1654
 msgid "show what would be committed"
 msgstr "顯示將��交的內容"
 
-#: builtin/commit.c:1666
+#: builtin/commit.c:1667
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1667
+#: builtin/commit.c:1668
 msgid "bypass post-rewrite hook"
 msgstr "繞� post-rewrite 掛鉤"
 
-#: builtin/commit.c:1674
+#: builtin/commit.c:1675
 msgid "ok to record an empty change"
 msgstr "�許一個空�交"
 
-#: builtin/commit.c:1676
+#: builtin/commit.c:1677
 msgid "ok to record a change with an empty message"
 msgstr "�許空的�交說明"
 
-#: builtin/commit.c:1752
+#: builtin/commit.c:1753
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "�壞的 MERGE_HEAD 檔案（%s）"
 
-#: builtin/commit.c:1759
+#: builtin/commit.c:1760
 msgid "could not read MERGE_MODE"
 msgstr "�能讀� MERGE_MODE"
 
-#: builtin/commit.c:1780
+#: builtin/commit.c:1781
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能讀��交說明：%s"
 
-#: builtin/commit.c:1787
+#: builtin/commit.c:1788
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "終止�交因為�交說明為空。\n"
 
-#: builtin/commit.c:1792
+#: builtin/commit.c:1793
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "終止�交；您未更改來自範本的�交說明。\n"
 
-#: builtin/commit.c:1803
+#: builtin/commit.c:1804
 #, c-format
 msgid "Aborting commit due to empty commit message body.\n"
 msgstr "�交說明內文空白，中止�交作業。\n"
 
-#: builtin/commit.c:1839
+#: builtin/commit.c:1840
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -14474,7 +14421,7 @@ msgstr "�考慮符� <模�> 的標籤"
 msgid "do not consider tags matching <pattern>"
 msgstr "�考慮符� <模�> 的標籤"
 
-#: builtin/describe.c:570 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:544
 msgid "show abbreviated commit object as fallback"
 msgstr "顯示簡寫的�交號作為後備"
 
@@ -14490,25 +14437,14 @@ msgstr "�於髒工作�，追加 <標記>（�設值：�-dirty\"）"
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "�於�壞的工作�，追加 <標記>（�設值：�-broken\"）"
 
-#: builtin/describe.c:593
-msgid "--long is incompatible with --abbrev=0"
-msgstr "--long 與 --abbrev=0 �相容"
-
 #: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "沒有發��稱，無法�述任何�西。"
 
-#: builtin/describe.c:673
-msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty 與�交號�相容"
-
-#: builtin/describe.c:675
-msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken 與�交號�相容"
-
-#: builtin/diff-tree.c:155
-msgid "--stdin and --merge-base are mutually exclusive"
-msgstr "--stdin 和 --merge-base 互斥"
+#: builtin/describe.c:673 builtin/describe.c:675
+#, c-format
+msgid "option '%s' and commit-ishes cannot be used together"
+msgstr "「%s��項和�交號�得�時使用"
 
 #: builtin/diff-tree.c:157
 msgid "--merge-base only works with two commits"
@@ -14529,26 +14465,26 @@ msgstr "無效�項：%s"
 msgid "%s...%s: no merge base"
 msgstr "%s...%s: 無�併基底"
 
-#: builtin/diff.c:486
+#: builtin/diff.c:491
 msgid "Not a git repository"
 msgstr "�是一個 git 版本庫"
 
-#: builtin/diff.c:532 builtin/grep.c:698
+#: builtin/diff.c:537 builtin/grep.c:698
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "�供了無效物件 '%s'。"
 
-#: builtin/diff.c:543
+#: builtin/diff.c:548
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "�供了超�兩個資料物件：'%s'"
 
-#: builtin/diff.c:548
+#: builtin/diff.c:553
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "無法處�的物件 '%s'。"
 
-#: builtin/diff.c:582
+#: builtin/diff.c:587
 #, c-format
 msgid "%s...%s: multiple merge bases, using %s"
 msgstr "%s...%s：多個�併基底，使用 %s"
@@ -14557,22 +14493,22 @@ msgstr "%s...%s：多個�併基底，使用 %s"
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<�項>] [<�交> [<�交>]] [--] [<路徑>...]"
 
-#: builtin/difftool.c:293
+#: builtin/difftool.c:287
 #, c-format
 msgid "could not read symlink %s"
 msgstr "無法讀�符號連� %s"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:289
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "無法讀�符號連�檔案 %s"
 
-#: builtin/difftool.c:303
+#: builtin/difftool.c:297
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "無法讀�符號連� %2$s 指�的物件 %1$s"
 
-#: builtin/difftool.c:427
+#: builtin/difftool.c:421
 msgid ""
 "combined diff formats ('-c' and '--cc') are not supported in\n"
 "directory diff mode ('-d' and '--dir-diff')."
@@ -14580,88 +14516,80 @@ msgstr ""
 "�支�在目錄比較模�（'-d' 和 '--dir-diff'）中\n"
 "採用組�差異格�（'-c' 和 '--cc'）。"
 
-#: builtin/difftool.c:632
+#: builtin/difftool.c:626
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:628
 msgid "working tree file has been left."
 msgstr "工作�檔案被留了下來。"
 
-#: builtin/difftool.c:645
+#: builtin/difftool.c:639
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "暫存檔存在於 '%s'。"
 
-#: builtin/difftool.c:646
+#: builtin/difftool.c:640
 msgid "you may want to cleanup or recover these."
 msgstr "您�能想�清�或者復原它們。"
 
-#: builtin/difftool.c:651
+#: builtin/difftool.c:645
 #, c-format
 msgid "failed: %d"
 msgstr "失敗：%d"
 
-#: builtin/difftool.c:696
+#: builtin/difftool.c:690
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:692
 msgid "perform a full-directory diff"
 msgstr "執行一個全目錄差異比較"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:694
 msgid "do not prompt before launching a diff tool"
 msgstr "啟動差異比較工具之���示"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:699
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模�中使用符號連�"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:700
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:701
 msgid "use the specified diff tool"
 msgstr "使用指定的差異比較工具"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:703
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "顯示�以用在 `--tool` �數後的差異工具列表"
 
-#: builtin/difftool.c:712
+#: builtin/difftool.c:706
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit "
 "code"
 msgstr "當執行 diff 工具返回�零離開碼時，使 'git-difftool' 離開"
 
-#: builtin/difftool.c:715
+#: builtin/difftool.c:709
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一個用於檢視差異的自訂指令"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:710
 msgid "passed to `diff`"
 msgstr "傳�給 `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:726
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool �求工作�或者 --no-index"
 
-#: builtin/difftool.c:739
-msgid "--dir-diff is incompatible with --no-index"
-msgstr "--dir-diff 和 --no-index �相容"
-
-#: builtin/difftool.c:742
-msgid "--gui, --tool and --extcmd are mutually exclusive"
-msgstr "--gui�--tool 和 --extcmd 互斥"
-
-#: builtin/difftool.c:750
+#: builtin/difftool.c:744
 msgid "no <tool> given for --tool=<tool>"
 msgstr "沒有為 --tool=<工具> �數�供 <工具>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:751
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "沒有為 --extcmd=<命令> �數�供 <命令>"
 
@@ -14697,123 +14625,115 @@ msgstr "�項「--default��期收到「--type=ulong�的無號 long 數值
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:869
+#: builtin/fast-export.c:843
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "錯誤：除�指定 --mark-tags，�則無法匯出嵌套標籤。"
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1152
 msgid "--anonymize-map token cannot be empty"
 msgstr "--anonymize-map 的��能空白"
 
-#: builtin/fast-export.c:1198
+#: builtin/fast-export.c:1171
 msgid "show progress after <n> objects"
 msgstr "在 <n> 個物件之後顯示進度"
 
-#: builtin/fast-export.c:1200
+#: builtin/fast-export.c:1173
 msgid "select handling of signed tags"
 msgstr "�擇如何處�簽�標籤"
 
-#: builtin/fast-export.c:1203
+#: builtin/fast-export.c:1176
 msgid "select handling of tags that tag filtered objects"
 msgstr "�擇當標籤指�被�濾物件時該標籤的處�方�"
 
-#: builtin/fast-export.c:1206
+#: builtin/fast-export.c:1179
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "�擇使用備用編碼處��交說明"
 
-#: builtin/fast-export.c:1209
+#: builtin/fast-export.c:1182
 msgid "dump marks to this file"
 msgstr "把標記傾�到這個檔案"
 
-#: builtin/fast-export.c:1211
+#: builtin/fast-export.c:1184
 msgid "import marks from this file"
 msgstr "從這個檔案匯入標記"
 
-#: builtin/fast-export.c:1215
+#: builtin/fast-export.c:1188
 msgid "import marks from this file if it exists"
 msgstr "如果這個檔案存在，則從檔案匯入標記"
 
-#: builtin/fast-export.c:1217
+#: builtin/fast-export.c:1190
 msgid "fake a tagger when tags lack one"
 msgstr "當標籤缺少標記者欄�時��有一個"
 
-#: builtin/fast-export.c:1219
+#: builtin/fast-export.c:1192
 msgid "output full tree for each commit"
 msgstr "�次�交都輸出整棵樹"
 
-#: builtin/fast-export.c:1221
+#: builtin/fast-export.c:1194
 msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能終止串�"
 
-#: builtin/fast-export.c:1222
+#: builtin/fast-export.c:1195
 msgid "skip output of blob data"
 msgstr "略�資料物件資料的輸出"
 
-#: builtin/fast-export.c:1223 builtin/log.c:1826
+#: builtin/fast-export.c:1196 builtin/log.c:1841
 msgid "refspec"
 msgstr "引用�格"
 
-#: builtin/fast-export.c:1224
+#: builtin/fast-export.c:1197
 msgid "apply refspec to exported refs"
 msgstr "�匯出的引用套用引用�格"
 
-#: builtin/fast-export.c:1225
+#: builtin/fast-export.c:1198
 msgid "anonymize output"
 msgstr "匿�輸出"
 
-#: builtin/fast-export.c:1226
+#: builtin/fast-export.c:1199
 msgid "from:to"
 msgstr "from:to"
 
-#: builtin/fast-export.c:1227
+#: builtin/fast-export.c:1200
 msgid "convert <from> to <to> in anonymized output"
 msgstr "在匿�輸出中將 <from> 轉�為 <to>"
 
-#: builtin/fast-export.c:1230
+#: builtin/fast-export.c:1203
 msgid "reference parents which are not in fast-export stream by object id"
 msgstr "�物件 ID 引用�在 fast-export 串�中的父物件"
 
-#: builtin/fast-export.c:1232
+#: builtin/fast-export.c:1205
 msgid "show original object ids of blobs/commits"
 msgstr "顯示資料物件��交的原始物件 ID"
 
-#: builtin/fast-export.c:1234
+#: builtin/fast-export.c:1207
 msgid "label tags with mark ids"
 msgstr "為包�標記 ID 的標籤打上標記"
 
-#: builtin/fast-export.c:1257
-msgid "--anonymize-map without --anonymize does not make sense"
-msgstr "缺少 --anonymize 的 --anonymize-map 沒有�義"
-
-#: builtin/fast-export.c:1272
-msgid "Cannot pass both --import-marks and --import-marks-if-exists"
-msgstr "�能�時傳��數 --import-marks 和 --import-marks-if-exists"
-
-#: builtin/fast-import.c:3088
+#: builtin/fast-import.c:3090
 #, c-format
 msgid "Missing from marks for submodule '%s'"
 msgstr "「%s��模組缺少 from 標記"
 
-#: builtin/fast-import.c:3090
+#: builtin/fast-import.c:3092
 #, c-format
 msgid "Missing to marks for submodule '%s'"
 msgstr "「%s��模組缺少 to 標記"
 
-#: builtin/fast-import.c:3225
+#: builtin/fast-import.c:3227
 #, c-format
 msgid "Expected 'mark' command, got %s"
 msgstr "�期 'mark' 指令，得到 %s"
 
-#: builtin/fast-import.c:3230
+#: builtin/fast-import.c:3232
 #, c-format
 msgid "Expected 'to' command, got %s"
 msgstr "�期 'to' 指令，得到 %s"
 
-#: builtin/fast-import.c:3322
+#: builtin/fast-import.c:3324
 msgid "Expected format name:filename for submodule rewrite option"
 msgstr "期望�模組 rewrite �項的格�是 name:filename"
 
-#: builtin/fast-import.c:3377
+#: builtin/fast-import.c:3379
 #, c-format
 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
 msgstr "沒有 --allow-unsafe-features 時，�止在輸入中使用 '%s' 功能"
@@ -14823,254 +14743,258 @@ msgstr "沒有 --allow-unsafe-features 時，ç¦�止在輸入中使用 '%s' 功èƒ
 msgid "Lockfile created but not reported: %s"
 msgstr "已建立鎖定檔案，但尚未回報：%s"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<�項>] [<版本庫> [<引用�格>...]]"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<�項>] <組>"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<�項>] [(<版本庫> | <組>)...]"
 
-#: builtin/fetch.c:38
+#: builtin/fetch.c:39
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<�項>]"
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:123
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel �能為負數"
 
-#: builtin/fetch.c:145 builtin/pull.c:189
+#: builtin/fetch.c:146 builtin/pull.c:189
 msgid "fetch from all remotes"
 msgstr "從所有的�端抓�"
 
-#: builtin/fetch.c:147 builtin/pull.c:249
+#: builtin/fetch.c:148 builtin/pull.c:249
 msgid "set upstream for git pull/fetch"
 msgstr "為 git pull/fetch 設定上游"
 
-#: builtin/fetch.c:149 builtin/pull.c:192
+#: builtin/fetch.c:150 builtin/pull.c:192
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而�是覆蓋它"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:152
 msgid "use atomic transaction to update references"
 msgstr "使用 atomic 事務更新引用"
 
-#: builtin/fetch.c:153 builtin/pull.c:195
+#: builtin/fetch.c:154 builtin/pull.c:195
 msgid "path to upload pack on remote end"
 msgstr "上傳包到�端的路徑"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:155
 msgid "force overwrite of local reference"
 msgstr "強制覆蓋本機引用"
 
-#: builtin/fetch.c:156
+#: builtin/fetch.c:157
 msgid "fetch from multiple remotes"
 msgstr "從多個�端抓�"
 
-#: builtin/fetch.c:158 builtin/pull.c:199
+#: builtin/fetch.c:159 builtin/pull.c:199
 msgid "fetch all tags and associated objects"
 msgstr "抓�所有的標籤和關�物件"
 
-#: builtin/fetch.c:160
+#: builtin/fetch.c:161
 msgid "do not fetch all tags (--no-tags)"
 msgstr "�抓�任何標籤(--no-tags)"
 
-#: builtin/fetch.c:162
+#: builtin/fetch.c:163
 msgid "number of submodules fetched in parallel"
 msgstr "並行�得的�模組數�"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:165
 msgid "modify the refspec to place all refs within refs/prefetch/"
 msgstr "修改引用�格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中"
 
-#: builtin/fetch.c:166 builtin/pull.c:202
+#: builtin/fetch.c:167 builtin/pull.c:202
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除�端已經�存在的分支的追蹤分支"
 
-#: builtin/fetch.c:168
+#: builtin/fetch.c:169
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除�端�存在的本機標籤，並且�代變更標籤"
 
 #  譯者：��值，�能翻譯
-#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123
+#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:171
 msgid "control recursive fetching of submodules"
 msgstr "控制�模組的�迴抓�"
 
-#: builtin/fetch.c:175
+#: builtin/fetch.c:176
 msgid "write fetched references to the FETCH_HEAD file"
 msgstr "將�得的引用寫入 FETCH_HEAD 檔案"
 
-#: builtin/fetch.c:176 builtin/pull.c:210
+#: builtin/fetch.c:177 builtin/pull.c:210
 msgid "keep downloaded pack"
 msgstr "��下載包"
 
-#: builtin/fetch.c:178
+#: builtin/fetch.c:179
 msgid "allow updating of HEAD ref"
 msgstr "�許更新 HEAD 引用"
 
-#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213
+#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213
 #: builtin/pull.c:222
 msgid "deepen history of shallow clone"
 msgstr "�得淺複製的更多�去歷�記錄"
 
-#: builtin/fetch.c:183 builtin/pull.c:216
+#: builtin/fetch.c:184 builtin/pull.c:216
 msgid "deepen history of shallow repository based on time"
 msgstr "基於時間來深化淺複製的歷�"
 
-#: builtin/fetch.c:189 builtin/pull.c:225
+#: builtin/fetch.c:190 builtin/pull.c:225
 msgid "convert to a complete repository"
 msgstr "轉�為一個完整的版本庫"
 
-#: builtin/fetch.c:192
+#: builtin/fetch.c:193
 msgid "prepend this to submodule path output"
 msgstr "在�模組路徑輸出的��加上此目錄"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:196
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "�迴�得�模組的�設值（比設定檔案優先度低）"
 
-#: builtin/fetch.c:199 builtin/pull.c:228
+#: builtin/fetch.c:200 builtin/pull.c:228
 msgid "accept refs that update .git/shallow"
 msgstr "接�更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:200 builtin/pull.c:230
+#: builtin/fetch.c:201 builtin/pull.c:230
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:201 builtin/pull.c:231
+#: builtin/fetch.c:202 builtin/pull.c:231
 msgid "specify fetch refmap"
 msgstr "指定�得動作的引用映射"
 
-#: builtin/fetch.c:208 builtin/pull.c:244
+#: builtin/fetch.c:209 builtin/pull.c:244
 msgid "report that we have only objects reachable from this object"
 msgstr "報告我們��有從該物件開始�以�得的物件"
 
-#: builtin/fetch.c:210
+#: builtin/fetch.c:211
 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr "��得包檔案，而是輸出交涉的祖先�交"
 
-#: builtin/fetch.c:213 builtin/fetch.c:215
+#: builtin/fetch.c:214 builtin/fetch.c:216
 msgid "run 'maintenance --auto' after fetching"
 msgstr "�得 (fetch) 後執行 'maintenance --auto'"
 
-#: builtin/fetch.c:217 builtin/pull.c:247
+#: builtin/fetch.c:218 builtin/pull.c:247
 msgid "check for forced-updates on all updated branches"
 msgstr "在所有更新分支上檢查強制更新"
 
-#: builtin/fetch.c:219
+#: builtin/fetch.c:220
 msgid "write the commit-graph after fetching"
 msgstr "抓�後寫入分支圖"
 
-#: builtin/fetch.c:221
+#: builtin/fetch.c:222
 msgid "accept refspecs from stdin"
 msgstr "從標準輸入中接�引用�格"
 
-#: builtin/fetch.c:586
-msgid "Couldn't find remote ref HEAD"
-msgstr "無法發��端 HEAD 引用"
+#: builtin/fetch.c:592
+msgid "couldn't find remote ref HEAD"
+msgstr "找�到�端 HEAD 引用"
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:766
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "設定變數 fetch.output 包�無效值 %s"
 
-#: builtin/fetch.c:862
+#: builtin/fetch.c:867
 #, c-format
 msgid "object %s not found"
 msgstr "物件 %s 未發�"
 
-#: builtin/fetch.c:866
+#: builtin/fetch.c:871
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967
+#: builtin/fetch.c:883 builtin/fetch.c:901 builtin/fetch.c:973
 msgid "[rejected]"
 msgstr "[已拒絕]"
 
-#: builtin/fetch.c:880
+#: builtin/fetch.c:885
 msgid "can't fetch in current branch"
 msgstr "目�分支下�能執行�得動作"
 
-#: builtin/fetch.c:890
+#: builtin/fetch.c:886
+msgid "checked out in another worktree"
+msgstr "已在其他工作�簽出"
+
+#: builtin/fetch.c:896
 msgid "[tag update]"
 msgstr "[標籤更新]"
 
-#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950
-#: builtin/fetch.c:962
+#: builtin/fetch.c:897 builtin/fetch.c:934 builtin/fetch.c:956
+#: builtin/fetch.c:968
 msgid "unable to update local ref"
 msgstr "�能更新本機引用"
 
-#: builtin/fetch.c:895
+#: builtin/fetch.c:901
 msgid "would clobber existing tag"
 msgstr "會破壞�有的標籤"
 
-#: builtin/fetch.c:917
+#: builtin/fetch.c:923
 msgid "[new tag]"
 msgstr "[新標籤]"
 
-#: builtin/fetch.c:920
+#: builtin/fetch.c:926
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:923
+#: builtin/fetch.c:929
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:962
+#: builtin/fetch.c:968
 msgid "forced update"
 msgstr "強制更新"
 
-#: builtin/fetch.c:967
+#: builtin/fetch.c:973
 msgid "non-fast-forward"
 msgstr "�快轉"
 
-#: builtin/fetch.c:1070
+#: builtin/fetch.c:1076
 msgid ""
-"Fetch normally indicates which branches had a forced update,\n"
-"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
-"flag or run 'git config fetch.showForcedUpdates true'."
+"fetch normally indicates which branches had a forced update,\n"
+"but that check has been disabled; to re-enable, use '--show-forced-updates'\n"
+"flag or run 'git config fetch.showForcedUpdates true'"
 msgstr ""
-"�得動作通常顯示哪些分支發生了強制更新，但該檢查已被�用。\n"
-"��新啟用，請使用 '--show-forced-updates' �項或執行\n"
-"'git config fetch.showForcedUpdates true'。"
+"�得 (fetch) 動作通常會指示哪些分支發生了強制更新，但該檢查已被�用。\n"
+"��新啟用，請使用「--show-forced-updates��項，或執行\n"
+"「git config fetch.showForcedUpdates true�"
 
-#: builtin/fetch.c:1074
+#: builtin/fetch.c:1080
 #, c-format
 msgid ""
-"It took %.2f seconds to check forced updates. You can use\n"
+"it took %.2f seconds to check forced updates; you can use\n"
 "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
 "false'\n"
-" to avoid this check.\n"
+"to avoid this check\n"
 msgstr ""
-"花了 %.2f 秒來檢查強制更新。您�以使用 '--no-show-forced-updates'\n"
-"或執行 'git config fetch.showForcedUpdates false' 以��此項檢查。\n"
+"花了 %.2f 秒檢查強制更新。您�以使用「--no-show-forced-updates�\n"
+"或執行「git config fetch.showForcedUpdates false���此項檢查\n"
 
-#: builtin/fetch.c:1105
+#: builtin/fetch.c:1112
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未傳�所有必需的物件\n"
 
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1141
 #, c-format
 msgid "rejected %s because shallow roots are not allowed to be updated"
 msgstr "已拒絕 %s，��許更新淺複製"
 
-#: builtin/fetch.c:1223 builtin/fetch.c:1371
+#: builtin/fetch.c:1231 builtin/fetch.c:1379
 #, c-format
 msgid "From %.*s\n"
 msgstr "來自 %.*s\n"
 
-#: builtin/fetch.c:1244
+#: builtin/fetch.c:1252
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -15080,150 +15004,152 @@ msgstr ""
 " 'git remote prune %s' 來刪除舊的�有��的分支"
 
 #  譯者：請維��導空格
-#: builtin/fetch.c:1341
+#: builtin/fetch.c:1349
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 將�為懸空狀態）"
 
 #  譯者：請維��導空格
-#: builtin/fetch.c:1342
+#: builtin/fetch.c:1350
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�為懸空狀態）"
 
-#: builtin/fetch.c:1374
+#: builtin/fetch.c:1382
 msgid "[deleted]"
 msgstr "[已刪除]"
 
-#: builtin/fetch.c:1375 builtin/remote.c:1128
+#: builtin/fetch.c:1383 builtin/remote.c:1128
 msgid "(none)"
 msgstr "（無）"
 
-#: builtin/fetch.c:1398
+#: builtin/fetch.c:1405
 #, c-format
-msgid "Refusing to fetch into current branch %s of non-bare repository"
-msgstr "拒絕�得到�純版本庫的目�分支 %s"
+msgid "refusing to fetch into branch '%s' checked out at '%s'"
+msgstr "拒絕�得在「%2$s�簽出的「%1$s�分支"
 
-#: builtin/fetch.c:1417
+#: builtin/fetch.c:1425
 #, c-format
-msgid "Option \"%s\" value \"%s\" is not valid for %s"
-msgstr "�項 \"%s\" 的值 \"%s\" �於 %s 是無效的"
+msgid "option \"%s\" value \"%s\" is not valid for %s"
+msgstr "�項「%s�的值「%s�� %s 無效"
 
-#: builtin/fetch.c:1420
+#: builtin/fetch.c:1428
 #, c-format
-msgid "Option \"%s\" is ignored for %s\n"
-msgstr "�項 \"%s\" 為 %s 所忽略\n"
+msgid "option \"%s\" is ignored for %s\n"
+msgstr "�項「%s�被 %s 忽略\n"
 
-#: builtin/fetch.c:1447
+#: builtin/fetch.c:1455
 #, c-format
 msgid "the object %s does not exist"
 msgstr "%s 物件�存在"
 
-#: builtin/fetch.c:1633
+#: builtin/fetch.c:1643
 msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "檢測到多分支，和 --set-upstream �相容"
 
-#: builtin/fetch.c:1648
+#: builtin/fetch.c:1655
+#, c-format
+msgid ""
+"could not set upstream of HEAD to '%s' from '%s' when it does not point to "
+"any branch."
+msgstr ""
+"無法將 HEAD 的上游從「%2$s�設定為「%1$s�，因為 HEAD 沒有指�任何分支。"
+
+#: builtin/fetch.c:1668
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "沒有為一個�端追蹤分支設定上游"
 
-#: builtin/fetch.c:1650
+#: builtin/fetch.c:1670
 msgid "not setting upstream for a remote tag"
 msgstr "沒有為一個�端標籤設定上游"
 
-#: builtin/fetch.c:1652
+#: builtin/fetch.c:1672
 msgid "unknown branch type"
 msgstr "未知的分支類型"
 
-#: builtin/fetch.c:1654
+#: builtin/fetch.c:1674
 msgid ""
-"no source branch found.\n"
-"you need to specify exactly one branch with the --set-upstream option."
+"no source branch found;\n"
+"you need to specify exactly one branch with the --set-upstream option"
 msgstr ""
 "找�到來�分支。\n"
-"您需�使用 --set-upstream �項指定一個分支。"
+"您得使用 --set-upstream �項明確指定一個分支"
 
-#: builtin/fetch.c:1783 builtin/fetch.c:1846
+#: builtin/fetch.c:1804 builtin/fetch.c:1867
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在�得 %s\n"
 
-#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101
+#: builtin/fetch.c:1814 builtin/fetch.c:1869
 #, c-format
-msgid "Could not fetch %s"
+msgid "could not fetch %s"
 msgstr "�能�得 %s"
 
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1826
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "無法�得 '%s'（離開碼：%d）\n"
 
-#: builtin/fetch.c:1909
+#: builtin/fetch.c:1930
 msgid ""
-"No remote repository specified.  Please, specify either a URL or a\n"
-"remote name from which new revisions should be fetched."
-msgstr "未指定�端版本庫。請��一個 URL 或�端版本庫�指定，用以�得新�交。"
+"no remote repository specified; please specify either a URL or a\n"
+"remote name from which new revisions should be fetched"
+msgstr ""
+"未指定�端版本庫。請指定用以�得新修訂版本之\n"
+"來� URL 或者�端版本庫�稱"
 
-#: builtin/fetch.c:1945
-msgid "You need to specify a tag name."
-msgstr "您需�指定一個標籤�稱。"
+#: builtin/fetch.c:1966
+msgid "you need to specify a tag name"
+msgstr "您需�指定標籤�稱"
 
-#: builtin/fetch.c:2009
+#: builtin/fetch.c:2032
 msgid "--negotiate-only needs one or more --negotiate-tip=*"
 msgstr "--negotiate-only 需�一或多個 --negotiate-tip=*"
 
-#: builtin/fetch.c:2013
-msgid "Negative depth in --deepen is not supported"
+#: builtin/fetch.c:2036
+msgid "negative depth in --deepen is not supported"
 msgstr "--deepen �支�負數深度"
 
-#: builtin/fetch.c:2015
-msgid "--deepen and --depth are mutually exclusive"
-msgstr "--deepen 和 --depth 是互斥的"
-
-#: builtin/fetch.c:2020
-msgid "--depth and --unshallow cannot be used together"
-msgstr "--depth 和 --unshallow �能�時使用"
-
-#: builtin/fetch.c:2022
+#: builtin/fetch.c:2045
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "�於一個完整的版本庫，�數 --unshallow 沒有�義"
 
-#: builtin/fetch.c:2039
+#: builtin/fetch.c:2062
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能帶一個版本庫�數"
 
-#: builtin/fetch.c:2041
+#: builtin/fetch.c:2064
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 帶引用�格沒有任何�義"
 
-#: builtin/fetch.c:2050
+#: builtin/fetch.c:2073
 #, c-format
-msgid "No such remote or remote group: %s"
-msgstr "沒有這樣的�端或�端組：%s"
+msgid "no such remote or remote group: %s"
+msgstr "無此�端或�端群組：%s"
 
-#: builtin/fetch.c:2057
-msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "�得組並指定引用�格沒有�義"
+#: builtin/fetch.c:2081
+msgid "fetching a group and specifying refspecs does not make sense"
+msgstr "�得群組並指定引用�格無�義"
 
-#: builtin/fetch.c:2073
+#: builtin/fetch.c:2097
 msgid "must supply remote when using --negotiate-only"
 msgstr "使用 --negotiate-only 時必須�供�端"
 
-#: builtin/fetch.c:2078
-msgid "Protocol does not support --negotiate-only, exiting."
-msgstr "通訊�定�支� --negotiate-only，��。"
+#: builtin/fetch.c:2102
+msgid "protocol does not support --negotiate-only, exiting"
+msgstr "通訊�定�支� --negotiate-only。��"
 
-#: builtin/fetch.c:2097
+#: builtin/fetch.c:2121
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr "��以將 --filter 用於在 extensions.partialclone 中設定的�端版本庫"
 
-#: builtin/fetch.c:2101
+#: builtin/fetch.c:2125
 msgid "--atomic can only be used when fetching from one remote"
 msgstr "--atomic �能在擷� (fetch) 一個�端時使用"
 
-#: builtin/fetch.c:2105
+#: builtin/fetch.c:2129
 msgid "--stdin can only be used when fetching from one remote"
 msgstr "--stdin �能在�得一個�端時使用"
 
@@ -15232,23 +15158,27 @@ 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:18
+#: builtin/fmt-merge-msg.c:19
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "��交說明中最多複製指定�目（�併而來的�交）的簡短說明"
 
-#: builtin/fmt-merge-msg.c:21
+#: builtin/fmt-merge-msg.c:22
 msgid "alias for --log (deprecated)"
 msgstr "�數 --log 的別�（已棄用）"
 
-#: builtin/fmt-merge-msg.c:24
+#: builtin/fmt-merge-msg.c:25
 msgid "text"
 msgstr "文字"
 
-#: builtin/fmt-merge-msg.c:25
+#: builtin/fmt-merge-msg.c:26
 msgid "use <text> as start of message"
 msgstr "使用 <文字> 作為�交說明的開始"
 
-#: builtin/fmt-merge-msg.c:26
+#: builtin/fmt-merge-msg.c:28
+msgid "use <name> instead of the real target branch"
+msgstr "使用 <�稱> 而�實際目的地分支"
+
+#: builtin/fmt-merge-msg.c:29
 msgid "file to read from"
 msgstr "從檔案中讀�"
 
@@ -15268,47 +15198,47 @@ msgstr "git for-each-ref [--merged [<�交>]] [--no-merged [<�交>]]"
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<�交>]] [--no-contains [<�交>]]"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:31
 msgid "quote placeholders suitably for shells"
 msgstr "引用��符�用於 shells"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:33
 msgid "quote placeholders suitably for perl"
 msgstr "引用��符�用於 perl"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:35
 msgid "quote placeholders suitably for python"
 msgstr "引用��符�用於 python"
 
-#: builtin/for-each-ref.c:36
+#: builtin/for-each-ref.c:37
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用��符�用於 Tcl"
 
-#: builtin/for-each-ref.c:39
+#: builtin/for-each-ref.c:40
 msgid "show only <n> matched refs"
 msgstr "�顯示 <n> 個符�的引用"
 
-#: builtin/for-each-ref.c:41 builtin/tag.c:481
+#: builtin/for-each-ref.c:42 builtin/tag.c:481
 msgid "respect format colors"
 msgstr "�照格�中的�色輸出"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
 msgid "print only refs which points at the given object"
 msgstr "�列�指��供物件的引用"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are merged"
 msgstr "�列�已經�併的引用"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
 msgid "print only refs that are not merged"
 msgstr "�列�沒有�併的引用"
 
-#: builtin/for-each-ref.c:48
+#: builtin/for-each-ref.c:49
 msgid "print only refs which contain the commit"
 msgstr "�列�包�該�交的引用"
 
-#: builtin/for-each-ref.c:49
+#: builtin/for-each-ref.c:50
 msgid "print only refs which don't contain the commit"
 msgstr "�列��包�該�交的引用"
 
@@ -15459,124 +15389,124 @@ msgstr "%s：物件�壞或�失：%s"
 msgid "%s: object is of unknown type '%s': %s"
 msgstr "%s：物件屬於「%s�未知類型：%s"
 
-#: builtin/fsck.c:644
+#: builtin/fsck.c:645
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：�能解�物件：%s"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:665
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "壞的 sha1 檔案：%s"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:686
 msgid "Checking object directory"
 msgstr "正在檢查物件目錄"
 
-#: builtin/fsck.c:688
+#: builtin/fsck.c:689
 msgid "Checking object directories"
 msgstr "正在檢查物件目錄"
 
-#: builtin/fsck.c:704
+#: builtin/fsck.c:705
 #, c-format
 msgid "Checking %s link"
 msgstr "正在檢查 %s 連�"
 
-#: builtin/fsck.c:709 builtin/index-pack.c:859
+#: builtin/fsck.c:710 builtin/index-pack.c:859
 #, c-format
 msgid "invalid %s"
 msgstr "無效的 %s"
 
-#: builtin/fsck.c:716
+#: builtin/fsck.c:717
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指�奇怪的�西（%s）"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:723
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分離開頭指標的指��存在"
 
-#: builtin/fsck.c:726
+#: builtin/fsck.c:727
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注�：%s 指�一個尚未誕生的分支（%s）"
 
-#: builtin/fsck.c:738
+#: builtin/fsck.c:739
 msgid "Checking cache tree"
 msgstr "正在檢查快�樹"
 
-#: builtin/fsck.c:743
+#: builtin/fsck.c:744
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中無效的 sha1 指標"
 
-#: builtin/fsck.c:752
+#: builtin/fsck.c:753
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中�樹狀物件"
 
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<�項>] [<物件>...]"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:790
 msgid "show unreachable objects"
 msgstr "顯示無法�得的物件"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:791
 msgid "show dangling objects"
 msgstr "顯示懸空的物件"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:792
 msgid "report tags"
 msgstr "報告標籤"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:793
 msgid "report root nodes"
 msgstr "報告根節點"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:794
 msgid "make index objects head nodes"
 msgstr "將索引亦作為檢查的頭節點"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:795
 msgid "make reflogs head nodes (default)"
 msgstr "將引用日誌作為檢查的頭節點（�設）"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:796
 msgid "also consider packs and alternate objects"
 msgstr "也考慮包和備用物件"
 
-#: builtin/fsck.c:796
+#: builtin/fsck.c:797
 msgid "check only connectivity"
 msgstr "僅檢查連通性"
 
-#: builtin/fsck.c:797 builtin/mktag.c:76
+#: builtin/fsck.c:798 builtin/mktag.c:76
 msgid "enable more strict checking"
 msgstr "啟用更嚴格的檢查"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:800
 msgid "write dangling objects in .git/lost-found"
 msgstr "將懸空物件寫入 .git/lost-found 中"
 
-#: builtin/fsck.c:800 builtin/prune.c:134
+#: builtin/fsck.c:801 builtin/prune.c:146
 msgid "show progress"
 msgstr "顯示進度"
 
-#: builtin/fsck.c:801
+#: builtin/fsck.c:802
 msgid "show verbose names for reachable objects"
 msgstr "顯示�以�得物件的詳細�稱"
 
-#: builtin/fsck.c:861 builtin/index-pack.c:261
+#: builtin/fsck.c:862 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "正在檢查物件"
 
-#: builtin/fsck.c:889
+#: builtin/fsck.c:890
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：物件缺少"
 
-#: builtin/fsck.c:900
+#: builtin/fsck.c:901
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "無效的�數：期望 sha1，得到 '%s'"
@@ -15595,17 +15525,12 @@ msgstr "� %s 呼� fstat 失敗：%s"
 msgid "failed to parse '%s' value '%s'"
 msgstr "無法解� '%s' 值 '%s'"
 
-#: builtin/gc.c:487 builtin/init-db.c:57
+#: builtin/gc.c:488 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "�能� '%s' 呼� stat"
 
-#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574
-#, c-format
-msgid "cannot read '%s'"
-msgstr "�能讀� '%s'"
-
-#: builtin/gc.c:503
+#: builtin/gc.c:504
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -15619,258 +15544,258 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:551
+#: builtin/gc.c:552
 msgid "prune unreferenced objects"
 msgstr "清除未引用的物件"
 
-#: builtin/gc.c:553
+#: builtin/gc.c:554
 msgid "be more thorough (increased runtime)"
 msgstr "更徹底（增加執行時間）"
 
-#: builtin/gc.c:554
+#: builtin/gc.c:555
 msgid "enable auto-gc mode"
 msgstr "啟用自動垃圾回收模�"
 
-#: builtin/gc.c:557
+#: builtin/gc.c:558
 msgid "force running gc even if there may be another gc running"
 msgstr "強制執行 gc �使�外一個 gc 正在執行"
 
-#: builtin/gc.c:560
+#: builtin/gc.c:561
 msgid "repack all other packs except the largest pack"
 msgstr "除了最大的包之外，�所有其它包檔案�新打包"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "解� gc.logexpiry 的值 %s 失敗"
 
-#: builtin/gc.c:587
+#: builtin/gc.c:588
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "解�清除期�值 %s 失敗"
 
-#: builtin/gc.c:607
+#: builtin/gc.c:608
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自動在後�執行版本庫打包以求最佳性能。\n"
 
-#: builtin/gc.c:609
+#: builtin/gc.c:610
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自動打包版本庫以求最佳性能。\n"
 
-#: builtin/gc.c:610
+#: builtin/gc.c:611
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手動維護�見 \"git help gc\"。\n"
 
-#: builtin/gc.c:650
+#: builtin/gc.c:652
 #, 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:705
+#: builtin/gc.c:707
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多無法�得的鬆散物件，執行 'git prune' 刪除它們。"
 
-#: builtin/gc.c:715
+#: builtin/gc.c:717
 msgid ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
 msgstr ""
 "git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]"
 
-#: builtin/gc.c:745
+#: builtin/gc.c:747
 msgid "--no-schedule is not allowed"
 msgstr "��許 --no-schedule"
 
-#: builtin/gc.c:750
+#: builtin/gc.c:752
 #, c-format
 msgid "unrecognized --schedule argument '%s'"
 msgstr "無法識別的 --schedule 引數 '%s'"
 
-#: builtin/gc.c:868
+#: builtin/gc.c:870
 msgid "failed to write commit-graph"
 msgstr "無法寫入�交圖形"
 
-#: builtin/gc.c:904
+#: builtin/gc.c:906
 msgid "failed to prefetch remotes"
 msgstr "無法�先�得�端"
 
-#: builtin/gc.c:1020
+#: builtin/gc.c:1022
 msgid "failed to start 'git pack-objects' process"
 msgstr "無法啟動 ‘git pack-objects’ 處�程�"
 
-#: builtin/gc.c:1037
+#: builtin/gc.c:1039
 msgid "failed to finish 'git pack-objects' process"
 msgstr "無法完� ‘git pack-objects’ 處�程�"
 
-#: builtin/gc.c:1088
+#: builtin/gc.c:1090
 msgid "failed to write multi-pack-index"
 msgstr "無法寫入多包索引"
 
-#: builtin/gc.c:1104
+#: builtin/gc.c:1106
 msgid "'git multi-pack-index expire' failed"
 msgstr "'git multi-pack-index expire' 失敗"
 
-#: builtin/gc.c:1163
+#: builtin/gc.c:1165
 msgid "'git multi-pack-index repack' failed"
 msgstr "'git multi-pack-index repack' 失敗"
 
-#: builtin/gc.c:1172
+#: builtin/gc.c:1174
 msgid ""
 "skipping incremental-repack task because core.multiPackIndex is disabled"
 msgstr "略�增��新打包工作，因為 core.multiPackIndex 已被�用"
 
-#: builtin/gc.c:1276
+#: builtin/gc.c:1278
 #, c-format
 msgid "lock file '%s' exists, skipping maintenance"
 msgstr "已存在 '%s' 鎖定檔案，略�維護"
 
-#: builtin/gc.c:1306
+#: builtin/gc.c:1308
 #, c-format
 msgid "task '%s' failed"
 msgstr "作業 '%s' 失敗"
 
-#: builtin/gc.c:1388
+#: builtin/gc.c:1390
 #, c-format
 msgid "'%s' is not a valid task"
 msgstr "'%s' �有效作業"
 
-#: builtin/gc.c:1393
+#: builtin/gc.c:1395
 #, c-format
 msgid "task '%s' cannot be selected multiple times"
 msgstr "�能多次�� '%s' 作業"
 
-#: builtin/gc.c:1408
+#: builtin/gc.c:1410
 msgid "run tasks based on the state of the repository"
 msgstr "基於版本庫狀態執行作業"
 
-#: builtin/gc.c:1409
+#: builtin/gc.c:1411
 msgid "frequency"
 msgstr "frequency"
 
-#: builtin/gc.c:1410
+#: builtin/gc.c:1412
 msgid "run tasks based on frequency"
 msgstr "�據頻率執行工作"
 
-#: builtin/gc.c:1413
+#: builtin/gc.c:1415
 msgid "do not report progress or other information over stderr"
 msgstr "��在 stderr 輸出進度或其他資訊"
 
-#: builtin/gc.c:1414
+#: builtin/gc.c:1416
 msgid "task"
 msgstr "作業"
 
-#: builtin/gc.c:1415
+#: builtin/gc.c:1417
 msgid "run a specific task"
 msgstr "執行指定作業"
 
-#: builtin/gc.c:1432
+#: builtin/gc.c:1434
 msgid "use at most one of --auto and --schedule=<frequency>"
 msgstr "--auto 和 --schedule=<頻率> 請任�一"
 
-#: builtin/gc.c:1475
+#: builtin/gc.c:1477
 msgid "failed to run 'git config'"
 msgstr "無法執行 ‘git config’"
 
-#: builtin/gc.c:1627
+#: builtin/gc.c:1629
 #, c-format
 msgid "failed to expand path '%s'"
 msgstr "無法展開「%s�路徑"
 
-#: builtin/gc.c:1654 builtin/gc.c:1692
+#: builtin/gc.c:1656 builtin/gc.c:1694
 msgid "failed to start launchctl"
 msgstr "無法啟動 launchctl"
 
-#: builtin/gc.c:1767 builtin/gc.c:2220
+#: builtin/gc.c:1769 builtin/gc.c:2237
 #, c-format
 msgid "failed to create directories for '%s'"
 msgstr "無法建立「%s�的目錄"
 
-#: builtin/gc.c:1794
+#: builtin/gc.c:1796
 #, c-format
 msgid "failed to bootstrap service %s"
 msgstr "無法啟動載入 %s �務"
 
-#: builtin/gc.c:1887
+#: builtin/gc.c:1889
 msgid "failed to create temp xml file"
 msgstr "無法建立暫存 XML 檔案"
 
-#: builtin/gc.c:1977
+#: builtin/gc.c:1979
 msgid "failed to start schtasks"
 msgstr "無法啟動 schtasks"
 
-#: builtin/gc.c:2046
+#: builtin/gc.c:2063
 msgid "failed to run 'crontab -l'; your system might not support 'cron'"
 msgstr "無法執行 “crontab -l�；您的系統�能�支� “cron�"
 
-#: builtin/gc.c:2063
+#: builtin/gc.c:2080
 msgid "failed to run 'crontab'; your system might not support 'cron'"
 msgstr "無法執行 “crontab�；您的系統�能�支� “cron�"
 
-#: builtin/gc.c:2067
+#: builtin/gc.c:2084
 msgid "failed to open stdin of 'crontab'"
 msgstr "無法開啟 ‘crontab’ 的標準輸入"
 
-#: builtin/gc.c:2109
+#: builtin/gc.c:2126
 msgid "'crontab' died"
 msgstr "“crontab� ���作"
 
-#: builtin/gc.c:2174
+#: builtin/gc.c:2191
 msgid "failed to start systemctl"
 msgstr "無法啟動 systemctl"
 
-#: builtin/gc.c:2184
+#: builtin/gc.c:2201
 msgid "failed to run systemctl"
 msgstr "無法執行 systemctl"
 
-#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62
-#: builtin/worktree.c:945
+#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62
+#: builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "刪除 '%s' 失敗"
 
-#: builtin/gc.c:2378
+#: builtin/gc.c:2395
 #, c-format
 msgid "unrecognized --scheduler argument '%s'"
 msgstr "無法識別的 --scheduler 引數 '%s'"
 
-#: builtin/gc.c:2403
+#: builtin/gc.c:2420
 msgid "neither systemd timers nor crontab are available"
 msgstr "�支� systemd 計時器或 crontab"
 
-#: builtin/gc.c:2418
+#: builtin/gc.c:2435
 #, c-format
 msgid "%s scheduler is not available"
 msgstr "無法使用 %s 排程器"
 
-#: builtin/gc.c:2432
+#: builtin/gc.c:2449
 msgid "another process is scheduling background maintenance"
 msgstr "其他處�程�正在排定背景維護工作"
 
-#: builtin/gc.c:2454
+#: builtin/gc.c:2471
 msgid "git maintenance start [--scheduler=<scheduler>]"
 msgstr "git maintenance start [--scheduler=<scheduler>]"
 
-#: builtin/gc.c:2463
+#: builtin/gc.c:2480
 msgid "scheduler"
 msgstr "scheduler"
 
-#: builtin/gc.c:2464
+#: builtin/gc.c:2481
 msgid "scheduler to trigger git maintenance run"
 msgstr "�觸發 git maintenance run 的排程器"
 
-#: builtin/gc.c:2478
+#: builtin/gc.c:2495
 msgid "failed to add repo to global config"
 msgstr "無法將版本庫加至全域設定"
 
-#: builtin/gc.c:2487
+#: builtin/gc.c:2504
 msgid "git maintenance <subcommand> [<options>]"
 msgstr "git maintenance <�命令> [<�項>]"
 
-#: builtin/gc.c:2506
+#: builtin/gc.c:2523
 #, c-format
 msgid "invalid subcommand: %s"
 msgstr "無效�命令：%s"
@@ -16239,25 +16164,25 @@ msgstr "git help [-c|--config]"
 msgid "unrecognized help format '%s'"
 msgstr "無法識別的�助格� '%s'"
 
-#: builtin/help.c:223
+#: builtin/help.c:222
 msgid "Failed to start emacsclient."
 msgstr "無法啟動 emacsclient。"
 
-#: builtin/help.c:236
+#: builtin/help.c:235
 msgid "Failed to parse emacsclient version."
 msgstr "無法解� emacsclient 版本。"
 
-#: builtin/help.c:244
+#: builtin/help.c:243
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
-#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302
+#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "執行 '%s' 失敗"
 
-#: builtin/help.c:340
+#: builtin/help.c:339
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -16266,7 +16191,7 @@ msgstr ""
 "'%s'：�支�的 man 手冊檢視器的路徑。\n"
 "請使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:352
+#: builtin/help.c:351
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -16275,39 +16200,39 @@ msgstr ""
 "'%s': 支�的 man 手冊檢視器指令。\n"
 "請使用 'man.<工具>.path'。"
 
-#: builtin/help.c:467
+#: builtin/help.c:466
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 檢視器。"
 
-#: builtin/help.c:483
+#: builtin/help.c:482
 msgid "no man viewer handled the request"
 msgstr "沒有 man 檢視器處�此請求"
 
-#: builtin/help.c:490
+#: builtin/help.c:489
 msgid "no info viewer handled the request"
 msgstr "沒有 info 檢視器處�此請求"
 
-#: builtin/help.c:551 builtin/help.c:562 git.c:348
+#: builtin/help.c:550 builtin/help.c:561 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的別�"
 
-#: builtin/help.c:565 git.c:380
+#: builtin/help.c:564 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "壞的 alias.%s 字串：%s"
 
-#: builtin/help.c:581
+#: builtin/help.c:580
 msgid "this option doesn't take any other arguments"
 msgstr "本�項��其他引數"
 
-#: builtin/help.c:602 builtin/help.c:629
+#: builtin/help.c:601 builtin/help.c:628
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:624
+#: builtin/help.c:623
 msgid "'git help config' for more information"
 msgstr "'git help config' �得更多訊�"
 
@@ -16568,18 +16493,10 @@ msgstr "錯誤�項 %s"
 msgid "unknown hash algorithm '%s'"
 msgstr "未知的「%s�雜湊算法"
 
-#: builtin/index-pack.c:1848
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "--fix-thin �能和 --stdin �時使用"
-
 #: builtin/index-pack.c:1850
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需�一個 git 版本庫"
 
-#: builtin/index-pack.c:1852
-msgid "--object-format cannot be used with --stdin"
-msgstr "--object-format �能和 --stdin �時使用"
-
 #: builtin/index-pack.c:1867
 msgid "--verify with no packfile name given"
 msgstr "--verify 沒有�供 packfile �稱�數"
@@ -16705,10 +16622,6 @@ msgstr "雜湊"
 msgid "specify the hash algorithm to use"
 msgstr "指定�使用的雜湊算法"
 
-#: builtin/init-db.c:560
-msgid "--separate-git-dir and --bare are mutually exclusive"
-msgstr "--separate-git-dir 和 --bare 互斥"
-
 #: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
@@ -16838,85 +16751,85 @@ msgstr "追蹤 <開始>,<��> 範�中橫列或 <檔案> 中> :<函數�稱
 msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr "-L<範�>:<檔案> 和 pathspec �能�時使用"
 
-#: builtin/log.c:306
+#: builtin/log.c:321
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最終輸出：%d %s\n"
 
-#: builtin/log.c:571
+#: builtin/log.c:586
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: �壞的檔案"
 
-#: builtin/log.c:586 builtin/log.c:676
+#: builtin/log.c:601 builtin/log.c:691
 #, c-format
 msgid "could not read object %s"
 msgstr "�能讀�物件 %s"
 
-#: builtin/log.c:701
+#: builtin/log.c:716
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知類型：%d"
 
-#: builtin/log.c:846
+#: builtin/log.c:861
 #, c-format
 msgid "%s: invalid cover from description mode"
 msgstr "%s：從�述產生附函的模�無效"
 
-#: builtin/log.c:853
+#: builtin/log.c:868
 msgid "format.headers without value"
 msgstr "format.headers 沒有值"
 
-#: builtin/log.c:982
+#: builtin/log.c:997
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "無法開啟修補檔案 %s"
 
-#: builtin/log.c:999
+#: builtin/log.c:1014
 msgid "need exactly one range"
 msgstr "�需�一個範�"
 
-#: builtin/log.c:1009
+#: builtin/log.c:1024
 msgid "not a range"
 msgstr "�是一個範�"
 
-#: builtin/log.c:1173
+#: builtin/log.c:1188
 msgid "cover letter needs email format"
 msgstr "附函需�信件��格�"
 
-#: builtin/log.c:1179
+#: builtin/log.c:1194
 msgid "failed to create cover-letter file"
 msgstr "無法建立附函檔案"
 
-#: builtin/log.c:1266
+#: builtin/log.c:1281
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1293
+#: builtin/log.c:1308
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<�項>] [<從> | <版本範�>]"
 
-#: builtin/log.c:1351
+#: builtin/log.c:1366
 msgid "two output directories?"
 msgstr "兩個輸出目錄？"
 
-#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358
 #, c-format
 msgid "unknown commit %s"
 msgstr "未知�交 %s"
 
-#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "無法將 '%s' 解�為一個有效引用"
 
-#: builtin/log.c:1522
+#: builtin/log.c:1537
 msgid "could not find exact merge base"
 msgstr "�能找到準確的�併基礎"
 
-#: builtin/log.c:1532
+#: builtin/log.c:1547
 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"
@@ -16926,405 +16839,393 @@ msgstr ""
 "git branch --set-upstream-to 來追蹤一個�端分支。或者你�以��\n"
 "�數 --base=<基礎�交> 手動指定一個基礎�交"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1570
 msgid "failed to find exact merge base"
 msgstr "無法找到準確的�併基礎"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1587
 msgid "base commit should be the ancestor of revision list"
 msgstr "基礎�交應該是版本列表的祖先"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1597
 msgid "base commit shouldn't be in revision list"
 msgstr "基礎�交�應該出�在版本列表中"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1655
 msgid "cannot get patch id"
 msgstr "無法得到修補檔 id"
 
-#: builtin/log.c:1703
+#: builtin/log.c:1718
 msgid "failed to infer range-diff origin of current series"
 msgstr "無法推斷目�系列的 range-diff 起點"
 
-#: builtin/log.c:1705
+#: builtin/log.c:1720
 #, c-format
 msgid "using '%s' as range-diff origin of current series"
 msgstr "將 '%s' 當作目�系列的 range-diff 起點"
 
-#: builtin/log.c:1749
+#: builtin/log.c:1764
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一個修補檔"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1767
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多個修補檔"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1771
 msgid "print patches to standard out"
 msgstr "列�修補檔到標準輸出"
 
-#: builtin/log.c:1758
+#: builtin/log.c:1773
 msgid "generate a cover letter"
 msgstr "生�一�附函"
 
-#: builtin/log.c:1760
+#: builtin/log.c:1775
 msgid "use simple number sequence for output file names"
 msgstr "使用簡單的數字�列作為輸出檔案�"
 
-#: builtin/log.c:1761
+#: builtin/log.c:1776
 msgid "sfx"
 msgstr "後綴"
 
-#: builtin/log.c:1762
+#: builtin/log.c:1777
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <後綴> 代替 '.patch'"
 
-#: builtin/log.c:1764
+#: builtin/log.c:1779
 msgid "start numbering patches at <n> instead of 1"
 msgstr "修補檔以 <n> 開始編號，而�是1"
 
-#: builtin/log.c:1765
+#: builtin/log.c:1780
 msgid "reroll-count"
 msgstr "reroll-count"
 
-#: builtin/log.c:1766
+#: builtin/log.c:1781
 msgid "mark the series as Nth re-roll"
 msgstr "標記修補檔系列是第幾次�製"
 
-#: builtin/log.c:1768
+#: builtin/log.c:1783
 msgid "max length of output filename"
 msgstr "輸出檔�的最大長度"
 
-#: builtin/log.c:1770
+#: builtin/log.c:1785
 msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1788
 msgid "cover-from-description-mode"
 msgstr "從�述產生附函的模�"
 
-#: builtin/log.c:1774
+#: builtin/log.c:1789
 msgid "generate parts of a cover letter based on a branch's description"
 msgstr "基於分支�述產生部分附函"
 
-#: builtin/log.c:1776
+#: builtin/log.c:1791
 msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�綴>] 代替 [PATCH]"
 
-#: builtin/log.c:1779
+#: builtin/log.c:1794
 msgid "store resulting files in <dir>"
 msgstr "把�果檔案儲存在 <目錄>"
 
-#: builtin/log.c:1782
+#: builtin/log.c:1797
 msgid "don't strip/add [PATCH]"
 msgstr "�刪除/新增 [PATCH]"
 
-#: builtin/log.c:1785
+#: builtin/log.c:1800
 msgid "don't output binary diffs"
 msgstr "�輸出二進�差異"
 
-#: builtin/log.c:1787
+#: builtin/log.c:1802
 msgid "output all-zero hash in From header"
 msgstr "在 From 標頭訊�中輸出全為零的雜湊值"
 
-#: builtin/log.c:1789
+#: builtin/log.c:1804
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的修補檔"
 
-#: builtin/log.c:1791
+#: builtin/log.c:1806
 msgid "show patch format instead of default (patch + stat)"
 msgstr "顯示純修補檔格�而��設的（修補檔+狀態）"
 
-#: builtin/log.c:1793
+#: builtin/log.c:1808
 msgid "Messaging"
 msgstr "信件傳�"
 
-#: builtin/log.c:1794
+#: builtin/log.c:1809
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1795
+#: builtin/log.c:1810
 msgid "add email header"
 msgstr "新增信件頭"
 
-#: builtin/log.c:1796 builtin/log.c:1797
+#: builtin/log.c:1811 builtin/log.c:1812
 msgid "email"
 msgstr "信件��"
 
-#: builtin/log.c:1796
+#: builtin/log.c:1811
 msgid "add To: header"
 msgstr "新增收件人"
 
-#: builtin/log.c:1797
+#: builtin/log.c:1812
 msgid "add Cc: header"
 msgstr "新增抄�"
 
-#: builtin/log.c:1798
+#: builtin/log.c:1813
 msgid "ident"
 msgstr "標記"
 
-#: builtin/log.c:1799
+#: builtin/log.c:1814
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "將 From ��設定為 <標記>（如若��供，則用�交者 ID �為��）"
 
-#: builtin/log.c:1801
+#: builtin/log.c:1816
 msgid "message-id"
 msgstr "信件標記"
 
-#: builtin/log.c:1802
+#: builtin/log.c:1817
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�信件作為� <信件標記> 的回覆"
 
-#: builtin/log.c:1803 builtin/log.c:1806
+#: builtin/log.c:1818 builtin/log.c:1821
 msgid "boundary"
 msgstr "邊界"
 
-#: builtin/log.c:1804
+#: builtin/log.c:1819
 msgid "attach the patch"
 msgstr "附件方�新增修補檔"
 
-#: builtin/log.c:1807
+#: builtin/log.c:1822
 msgid "inline the patch"
 msgstr "內�顯示修補檔"
 
-#: builtin/log.c:1811
+#: builtin/log.c:1826
 msgid "enable message threading, styles: shallow, deep"
 msgstr "啟用信件線索，風格：淺，深"
 
-#: builtin/log.c:1813
+#: builtin/log.c:1828
 msgid "signature"
 msgstr "簽�"
 
-#: builtin/log.c:1814
+#: builtin/log.c:1829
 msgid "add a signature"
 msgstr "新增一個簽�"
 
-#: builtin/log.c:1815
+#: builtin/log.c:1830
 msgid "base-commit"
 msgstr "基礎�交"
 
-#: builtin/log.c:1816
+#: builtin/log.c:1831
 msgid "add prerequisite tree info to the patch series"
 msgstr "為修補檔列表新增�置樹訊�"
 
-#: builtin/log.c:1819
+#: builtin/log.c:1834
 msgid "add a signature from a file"
 msgstr "從檔案新增一個簽�"
 
-#: builtin/log.c:1820
+#: builtin/log.c:1835
 msgid "don't print the patch filenames"
 msgstr "��列�修補檔檔案�"
 
-#: builtin/log.c:1822
+#: builtin/log.c:1837
 msgid "show progress while generating patches"
 msgstr "在生�修補檔時顯示進度"
 
-#: builtin/log.c:1824
+#: builtin/log.c:1839
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
 
-#: builtin/log.c:1827
+#: builtin/log.c:1842
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
 
-#: builtin/log.c:1829 builtin/range-diff.c:28
+#: builtin/log.c:1844 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "建立權�的百分比"
 
-#: builtin/log.c:1916
+#: builtin/log.c:1931
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�無效的身份標記：%s"
 
-#: builtin/log.c:1931
-msgid "-n and -k are mutually exclusive"
-msgstr "-n 和 -k 互斥"
-
-#: builtin/log.c:1933
-msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc 和 -k 互斥"
-
-#: builtin/log.c:1941
+#: builtin/log.c:1956
 msgid "--name-only does not make sense"
 msgstr "--name-only 無�義"
 
-#: builtin/log.c:1943
+#: builtin/log.c:1958
 msgid "--name-status does not make sense"
 msgstr "--name-status 無�義"
 
-#: builtin/log.c:1945
+#: builtin/log.c:1960
 msgid "--check does not make sense"
 msgstr "--check 無�義"
 
-#: builtin/log.c:1967
-msgid "--stdout, --output, and --output-directory are mutually exclusive"
-msgstr "--stdout�--output 和 --output-directory 互斥"
-
-#: builtin/log.c:2089
+#: builtin/log.c:2104
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需� --cover-letter 或單一修補檔"
 
-#: builtin/log.c:2093
+#: builtin/log.c:2108
 msgid "Interdiff:"
 msgstr "版本間差異："
 
-#: builtin/log.c:2094
+#: builtin/log.c:2109
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "� v%d 的版本差異："
 
-#: builtin/log.c:2100
-msgid "--creation-factor requires --range-diff"
-msgstr "--creation-factor 需� --range-diff"
-
-#: builtin/log.c:2104
+#: builtin/log.c:2119
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需� --cover-letter 或單一修補檔"
 
-#: builtin/log.c:2112
+#: builtin/log.c:2127
 msgid "Range-diff:"
 msgstr "範�差異："
 
-#: builtin/log.c:2113
+#: builtin/log.c:2128
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "� v%d 的範�差異："
 
-#: builtin/log.c:2124
+#: builtin/log.c:2139
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "無法讀�簽�檔案 '%s'"
 
-#: builtin/log.c:2160
+#: builtin/log.c:2175
 msgid "Generating patches"
 msgstr "生�修補檔"
 
-#: builtin/log.c:2204
+#: builtin/log.c:2219
 msgid "failed to create output files"
 msgstr "無法建立輸出檔案"
 
-#: builtin/log.c:2263
+#: builtin/log.c:2279
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<頭> [<�制>]]]"
 
-#: builtin/log.c:2317
+#: builtin/log.c:2333
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "�能找到追蹤的�端分支，請手動指定 <上游>。\n"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:564
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<�項>] [<檔案>...]"
 
-#: builtin/ls-files.c:615
+#: builtin/ls-files.c:618
 msgid "separate paths with the NUL character"
 msgstr "用 NUL 字元分隔路徑"
 
-#: builtin/ls-files.c:617
+#: builtin/ls-files.c:620
 msgid "identify the file status with tags"
 msgstr "用標籤標記檔案的狀態"
 
-#: builtin/ls-files.c:619
+#: builtin/ls-files.c:622
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用�寫字�表示 '�設未改變的' 檔案"
 
-#: builtin/ls-files.c:621
+#: builtin/ls-files.c:624
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用�寫字�表示 'fsmonitor clean' 檔案"
 
-#: builtin/ls-files.c:623
+#: builtin/ls-files.c:626
 msgid "show cached files in the output (default)"
 msgstr "顯示快�的檔案（�設）"
 
-#: builtin/ls-files.c:625
+#: builtin/ls-files.c:628
 msgid "show deleted files in the output"
 msgstr "顯示已刪除的檔案"
 
-#: builtin/ls-files.c:627
+#: builtin/ls-files.c:630
 msgid "show modified files in the output"
 msgstr "顯示已修改的檔案"
 
-#: builtin/ls-files.c:629
+#: builtin/ls-files.c:632
 msgid "show other files in the output"
 msgstr "顯示其它檔案"
 
-#: builtin/ls-files.c:631
+#: builtin/ls-files.c:634
 msgid "show ignored files in the output"
 msgstr "顯示忽略的檔案"
 
-#: builtin/ls-files.c:634
+#: builtin/ls-files.c:637
 msgid "show staged contents' object name in the output"
 msgstr "顯示暫存�內容的物件�稱"
 
-#: builtin/ls-files.c:636
+#: builtin/ls-files.c:639
 msgid "show files on the filesystem that need to be removed"
 msgstr "顯示檔案系統需�刪除的檔案"
 
-#: builtin/ls-files.c:638
+#: builtin/ls-files.c:641
 msgid "show 'other' directories' names only"
 msgstr "�顯示「其他�目錄的�稱"
 
-#: builtin/ls-files.c:640
+#: builtin/ls-files.c:643
 msgid "show line endings of files"
 msgstr "顯示檔案�行符號格�"
 
-#: builtin/ls-files.c:642
+#: builtin/ls-files.c:645
 msgid "don't show empty directories"
 msgstr "�顯示空目錄"
 
-#: builtin/ls-files.c:645
+#: builtin/ls-files.c:648
 msgid "show unmerged files in the output"
 msgstr "顯示未�併的檔案"
 
-#: builtin/ls-files.c:647
+#: builtin/ls-files.c:650
 msgid "show resolve-undo information"
 msgstr "顯示 resolve-undo 訊�"
 
-#: builtin/ls-files.c:649
+#: builtin/ls-files.c:652
 msgid "skip files matching pattern"
 msgstr "符�排除檔案的模�"
 
-#: builtin/ls-files.c:652
+#: builtin/ls-files.c:655
 msgid "read exclude patterns from <file>"
 msgstr "從 <檔案> 讀�排除模� (pattern)"
 
-#: builtin/ls-files.c:655
+#: builtin/ls-files.c:658
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "從 <檔案> 讀��外的�個目錄的排除模�"
 
-#: builtin/ls-files.c:657
+#: builtin/ls-files.c:660
 msgid "add the standard git exclusions"
 msgstr "新增標準的 git 排除"
 
-#: builtin/ls-files.c:661
+#: builtin/ls-files.c:664
 msgid "make the output relative to the project top directory"
 msgstr "顯示相�於頂級目錄的檔案�"
 
-#: builtin/ls-files.c:664
+#: builtin/ls-files.c:667
 msgid "recurse through submodules"
 msgstr "在�模組中�迴"
 
-#: builtin/ls-files.c:666
+#: builtin/ls-files.c:669
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <檔案> 都�在索引�，視為錯誤"
 
-#: builtin/ls-files.c:667
+#: builtin/ls-files.c:670
 msgid "tree-ish"
 msgstr "樹或�交"
 
-#: builtin/ls-files.c:668
+#: builtin/ls-files.c:671
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "��自從 <樹或�交> 之後刪除的路徑�然存在"
 
-#: builtin/ls-files.c:670
+#: builtin/ls-files.c:673
 msgid "show debugging data"
 msgstr "顯示除錯資料"
 
-#: builtin/ls-files.c:672
+#: builtin/ls-files.c:675
 msgid "suppress duplicate entries"
 msgstr "�顯示�複項目"
 
+#: builtin/ls-files.c:677
+msgid "show sparse directories in the presence of a sparse index"
+msgstr "在稀�索引存在時顯示稀�目錄"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -17426,11 +17327,11 @@ msgstr "複製 Message-ID 至�交說明末尾"
 
 #: builtin/mailinfo.c:64
 msgid "re-code metadata to i18n.commitEncoding"
-msgstr "�新將中繼資料編碼為 i18n.commitEncoding 的設定值"
+msgstr "�新將中介資料編碼為 i18n.commitEncoding 的設定值"
 
 #: builtin/mailinfo.c:67
 msgid "disable charset re-coding of metadata"
-msgstr "�用中繼資料的字元�新編碼功能"
+msgstr "�用中介資料的字元�新編碼功能"
 
 #: builtin/mailinfo.c:69
 msgid "encoding"
@@ -17438,7 +17339,7 @@ msgstr "編碼"
 
 #: builtin/mailinfo.c:70
 msgid "re-code metadata to this encoding"
-msgstr "�新將中繼資料編碼為這個編碼方�"
+msgstr "�新將中介資料編碼為這個編碼方�"
 
 #: builtin/mailinfo.c:72
 msgid "use scissors"
@@ -17518,26 +17419,30 @@ msgid "use a diff3 based merge"
 msgstr "使用基於 diff3 的�併"
 
 #: builtin/merge-file.c:37
+msgid "use a zealous diff3 based merge"
+msgstr "使用基於 zealous diff3 的�併"
+
+#: builtin/merge-file.c:39
 msgid "for conflicts, use our version"
 msgstr "如果��，使用我們的版本"
 
-#: builtin/merge-file.c:39
+#: builtin/merge-file.c:41
 msgid "for conflicts, use their version"
 msgstr "如果��，使用他們的版本"
 
-#: builtin/merge-file.c:41
+#: builtin/merge-file.c:43
 msgid "for conflicts, use a union version"
 msgstr "如果��，使用��版本"
 
-#: builtin/merge-file.c:44
+#: builtin/merge-file.c:46
 msgid "for conflicts, use this marker size"
 msgstr "如果��，使用指定長度的標記"
 
-#: builtin/merge-file.c:45
+#: builtin/merge-file.c:47
 msgid "do not warn about conflicts"
 msgstr "��警告��"
 
-#: builtin/merge-file.c:47
+#: builtin/merge-file.c:49
 msgid "set labels for file1/orig-file/file2"
 msgstr "為 檔案1/�始檔案/檔案2 設定標籤"
 
@@ -17575,179 +17480,183 @@ msgstr "�併 %s 和 %s\n"
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<�項>] [<�交>...]"
 
-#: builtin/merge.c:124
+#: builtin/merge.c:125
 msgid "switch `m' requires a value"
 msgstr "開關 `m' 需�一個值"
 
-#: builtin/merge.c:147
+#: builtin/merge.c:148
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "�項 `%s' 需�一個值"
 
-#: builtin/merge.c:200
+#: builtin/merge.c:201
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�併策略 '%s'。\n"
 
-#: builtin/merge.c:201
+#: builtin/merge.c:202
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:206
+#: builtin/merge.c:207
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自訂策略有："
 
-#: builtin/merge.c:257 builtin/pull.c:134
+#: builtin/merge.c:258 builtin/pull.c:134
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在�併的最後�顯示差異統計"
 
-#: builtin/merge.c:260 builtin/pull.c:137
+#: builtin/merge.c:261 builtin/pull.c:137
 msgid "show a diffstat at the end of the merge"
 msgstr "在�併的最後顯示差異統計"
 
-#: builtin/merge.c:261 builtin/pull.c:140
+#: builtin/merge.c:262 builtin/pull.c:140
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �義）"
 
-#: builtin/merge.c:263 builtin/pull.c:143
+#: builtin/merge.c:264 builtin/pull.c:143
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在�併�交說明中新增（最多 <n> �）精簡�交記錄"
 
-#: builtin/merge.c:266 builtin/pull.c:149
+#: builtin/merge.c:267 builtin/pull.c:149
 msgid "create a single commit instead of doing a merge"
 msgstr "建立一個單�的�交而�是�一次�併"
 
-#: builtin/merge.c:268 builtin/pull.c:152
+#: builtin/merge.c:269 builtin/pull.c:152
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�併�功，執行一次�交（�設）"
 
-#: builtin/merge.c:270 builtin/pull.c:155
+#: builtin/merge.c:271 builtin/pull.c:155
 msgid "edit message before committing"
 msgstr "在�交�編輯�交說明"
 
-#: builtin/merge.c:272
+#: builtin/merge.c:273
 msgid "allow fast-forward (default)"
 msgstr "�許快轉（�設）"
 
-#: builtin/merge.c:274 builtin/pull.c:162
+#: builtin/merge.c:275 builtin/pull.c:162
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快轉就放棄�併"
 
-#: builtin/merge.c:278 builtin/pull.c:168
+#: builtin/merge.c:279 builtin/pull.c:168
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "驗證指定的�交是�包�一個有效的 GPG 簽�"
 
-#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172
+#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172
 #: builtin/rebase.c:1117 builtin/revert.c:114
 msgid "strategy"
 msgstr "ç­–ç•¥"
 
-#: builtin/merge.c:280 builtin/pull.c:173
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "merge strategy to use"
 msgstr "�使用的�併策略"
 
-#: builtin/merge.c:281 builtin/pull.c:176
+#: builtin/merge.c:282 builtin/pull.c:176
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:282 builtin/pull.c:177
+#: builtin/merge.c:283 builtin/pull.c:177
 msgid "option for selected merge strategy"
 msgstr "所�的�併策略的�項"
 
-#: builtin/merge.c:284
+#: builtin/merge.c:285
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�併的�交說明（���快轉��併）"
 
 #: builtin/merge.c:291
+msgid "use <name> instead of the real target"
+msgstr "使用 <�稱> 而�實際目的地"
+
+#: builtin/merge.c:294
 msgid "abort the current in-progress merge"
 msgstr "放棄目�正在進行的�併"
 
 #
-#: builtin/merge.c:293
+#: builtin/merge.c:296
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是�留索引和工作�"
 
-#: builtin/merge.c:295
+#: builtin/merge.c:298
 msgid "continue the current in-progress merge"
 msgstr "繼續目�正在進行的�併"
 
-#: builtin/merge.c:297 builtin/pull.c:184
+#: builtin/merge.c:300 builtin/pull.c:184
 msgid "allow merging unrelated histories"
 msgstr "�許�並�相關的歷�"
 
-#: builtin/merge.c:304
+#: builtin/merge.c:307
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "繞� pre-merge-commit 和 commit-msg 掛鉤"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:323
 msgid "could not run stash."
 msgstr "�能執行儲�。"
 
-#: builtin/merge.c:326
+#: builtin/merge.c:328
 msgid "stash failed"
 msgstr "儲�失敗"
 
-#: builtin/merge.c:331
+#: builtin/merge.c:333
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一個有效物件：%s"
 
-#: builtin/merge.c:353 builtin/merge.c:370
+#: builtin/merge.c:355 builtin/merge.c:372
 msgid "read-tree failed"
 msgstr "讀�樹失敗"
 
 #  譯者：請維��導空格
-#: builtin/merge.c:401
+#: builtin/merge.c:403
 msgid "Already up to date. (nothing to squash)"
 msgstr "已經是最新的。（無需壓縮 (squash)）"
 
-#: builtin/merge.c:415
+#: builtin/merge.c:417
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "壓縮�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:465
+#: builtin/merge.c:467
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "無�併訊� -- 未更新 HEAD\n"
 
-#: builtin/merge.c:515
+#: builtin/merge.c:517
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 沒有指�一個�交"
 
-#: builtin/merge.c:603
+#: builtin/merge.c:605
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "壞的 branch.%s.mergeoptions 字串：%s"
 
-#: builtin/merge.c:730
+#: builtin/merge.c:732
 msgid "Not handling anything other than two heads merge."
 msgstr "未處�兩個頭�併之外的任何動作。"
 
-#: builtin/merge.c:743
+#: builtin/merge.c:745
 #, c-format
 msgid "unknown strategy option: -X%s"
 msgstr "未知的策略�項：-X%s"
 
-#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "�能寫 %s"
 
-#: builtin/merge.c:814
+#: builtin/merge.c:816
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能從 '%s' 讀�"
 
-#: builtin/merge.c:823
+#: builtin/merge.c:825
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未�交�並，使用 'git commit' 完�此次�併。\n"
 
-#: builtin/merge.c:829
+#: builtin/merge.c:831
 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"
@@ -17757,83 +17666,83 @@ msgstr ""
 "�併到主題分支。\n"
 "\n"
 
-#: builtin/merge.c:834
+#: builtin/merge.c:836
 msgid "An empty message aborts the commit.\n"
 msgstr "空的�交說明會終止�交。\n"
 
-#: builtin/merge.c:837
+#: builtin/merge.c:839
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr "以 '%c' 開始的行將被忽略，而空的�交說明將終止�交。\n"
 
-#: builtin/merge.c:892
+#: builtin/merge.c:894
 msgid "Empty commit message."
 msgstr "空�交說明。"
 
-#: builtin/merge.c:907
+#: builtin/merge.c:909
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:968
+#: builtin/merge.c:970
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自動�併失敗，修正��然後�交修正的�果。\n"
 
-#: builtin/merge.c:1007
+#: builtin/merge.c:1009
 msgid "No current branch."
 msgstr "沒有目�分支。"
 
-#: builtin/merge.c:1009
+#: builtin/merge.c:1011
 msgid "No remote for the current branch."
 msgstr "目�分支沒有�應的�端版本庫。"
 
-#: builtin/merge.c:1011
+#: builtin/merge.c:1013
 msgid "No default upstream defined for the current branch."
 msgstr "目�分支沒有定義�設的上游分支。"
 
-#: builtin/merge.c:1016
+#: builtin/merge.c:1018
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�於 %s 沒有來自 %s 的�端追蹤分支"
 
-#: builtin/merge.c:1073
+#: builtin/merge.c:1075
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "環境 '%2$s' 中存在壞的�值 '%1$s'"
 
-#: builtin/merge.c:1174
+#: builtin/merge.c:1177
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�併：%s"
 
-#: builtin/merge.c:1208
+#: builtin/merge.c:1211
 msgid "not something we can merge"
 msgstr "�能�併"
 
-#: builtin/merge.c:1321
+#: builtin/merge.c:1324
 msgid "--abort expects no arguments"
 msgstr "--abort �帶�數"
 
-#: builtin/merge.c:1325
+#: builtin/merge.c:1328
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "沒有�終止的�併（MERGE_HEAD �失）。"
 
-#: builtin/merge.c:1343
+#: builtin/merge.c:1346
 msgid "--quit expects no arguments"
 msgstr "--quit �帶�數"
 
-#: builtin/merge.c:1356
+#: builtin/merge.c:1359
 msgid "--continue expects no arguments"
 msgstr "--continue �帶�數"
 
-#: builtin/merge.c:1360
+#: builtin/merge.c:1363
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "沒有進行中的�併（MERGE_HEAD �失）。"
 
-#: builtin/merge.c:1376
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17841,7 +17750,7 @@ msgstr ""
 "您尚未��您的�併（存在 MERGE_HEAD）。\n"
 "請在�併�先�交您的修改。"
 
-#: builtin/merge.c:1383
+#: builtin/merge.c:1386
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -17849,84 +17758,76 @@ msgstr ""
 "您尚未��您的��（存在 CHERRY_PICK_HEAD）。\n"
 "請在�併�先�交您的修改。"
 
-#: builtin/merge.c:1386
+#: builtin/merge.c:1389
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未��您的��（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1400
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您�能將 --squash 和 --no-ff 組�使用。"
-
-#: builtin/merge.c:1402
-msgid "You cannot combine --squash with --commit."
-msgstr "您�能將 --squash 和 --commit 組�使用。"
-
-#: builtin/merge.c:1418
+#: builtin/merge.c:1421
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交並且 merge.defaultToUpstream 未設定。"
 
-#: builtin/merge.c:1435
+#: builtin/merge.c:1438
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的壓縮�交"
 
-#: builtin/merge.c:1437
+#: builtin/merge.c:1440
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快轉��交沒有�義"
 
-#: builtin/merge.c:1442
+#: builtin/merge.c:1445
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�併"
 
-#: builtin/merge.c:1444
+#: builtin/merge.c:1447
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能將一個�交�並到空分支上"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1534
 msgid "refusing to merge unrelated histories"
 msgstr "拒絕�併無關的歷�"
 
-#: builtin/merge.c:1550
+#: builtin/merge.c:1553
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1598
+#: builtin/merge.c:1601
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "嘗試�常�的索引內�併...\n"
 
-#: builtin/merge.c:1605
+#: builtin/merge.c:1608
 #, c-format
 msgid "Nope.\n"
 msgstr "無。\n"
 
-#: builtin/merge.c:1664 builtin/merge.c:1730
+#: builtin/merge.c:1667 builtin/merge.c:1733
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "將樹回滾至原始狀態...\n"
 
-#: builtin/merge.c:1668
+#: builtin/merge.c:1671
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "嘗試�併策略 %s...\n"
 
-#: builtin/merge.c:1720
+#: builtin/merge.c:1723
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "沒有�併策略處�此�併。\n"
 
-#: builtin/merge.c:1722
+#: builtin/merge.c:1725
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �併失敗。\n"
 
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
 #, c-format
 msgid "Using the %s strategy to prepare resolving by hand.\n"
 msgstr "使用 %s 策略，準備自行解決。\n"
 
-#: builtin/merge.c:1746
+#: builtin/merge.c:1749
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自動�併進展順利，按�求在�交��止\n"
@@ -17968,7 +17869,7 @@ msgstr "stdin 上的標籤未通�我們的嚴格 fsck 檢查"
 msgid "tag on stdin did not refer to a valid object"
 msgstr "標準輸入上的標籤指�的�是有效物件"
 
-#: builtin/mktag.c:104 builtin/tag.c:243
+#: builtin/mktag.c:104 builtin/tag.c:242
 msgid "unable to write tag file"
 msgstr "無法寫標籤檔案"
 
@@ -18032,7 +17933,7 @@ msgstr "寫入�包�指定索引的多包索引"
 msgid "refs snapshot for selecting bitmap commits"
 msgstr "用來���圖�交的引用快照"
 
-#: builtin/multi-pack-index.c:202
+#: builtin/multi-pack-index.c:206
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -18129,52 +18030,52 @@ msgstr "%s，來�=%s，目的地=%s"
 msgid "Renaming %s to %s\n"
 msgstr "�新命� %s 至 %s\n"
 
-#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853
+#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�新命� '%s' 失敗"
 
-#: builtin/name-rev.c:465
+#: builtin/name-rev.c:474
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<�項>] <�交>..."
 
-#: builtin/name-rev.c:466
+#: builtin/name-rev.c:475
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<�項>] --all"
 
-#: builtin/name-rev.c:467
+#: builtin/name-rev.c:476
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<�項>] --stdin"
 
-#: builtin/name-rev.c:524
+#: builtin/name-rev.c:533
 msgid "print only ref-based names (no object names)"
 msgstr "�輸出基於引用的�稱 (沒有物件�稱)"
 
-#: builtin/name-rev.c:525
+#: builtin/name-rev.c:534
 msgid "only use tags to name the commits"
 msgstr "�使用標籤來命��交"
 
-#: builtin/name-rev.c:527
+#: builtin/name-rev.c:536
 msgid "only use refs matching <pattern>"
 msgstr "�使用和 <模�> 相符�的引用"
 
-#: builtin/name-rev.c:529
+#: builtin/name-rev.c:538
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模�> 相符�的引用"
 
-#: builtin/name-rev.c:531
+#: builtin/name-rev.c:540
 msgid "list all commits reachable from all refs"
 msgstr "列出�以從所有引用存�的�交"
 
-#: builtin/name-rev.c:532
+#: builtin/name-rev.c:541
 msgid "read from stdin"
 msgstr "從標準輸入讀�"
 
-#: builtin/name-rev.c:533
+#: builtin/name-rev.c:542
 msgid "allow to print `undefined` names (default)"
 msgstr "�許列� `未定義` 的�稱（�設）"
 
-#: builtin/name-rev.c:539
+#: builtin/name-rev.c:548
 msgid "dereference tags in the input (internal use)"
 msgstr "��解�輸入中的標籤（內部使用）"
 
@@ -18291,25 +18192,25 @@ msgstr "git notes get-ref"
 msgid "Write/edit the notes for the following object:"
 msgstr "為下�的物件寫/編輯說明："
 
-#: builtin/notes.c:150
+#: builtin/notes.c:149
 #, c-format
 msgid "unable to start 'show' for object '%s'"
 msgstr "�能為物件 '%s' 開始 'show'"
 
-#: builtin/notes.c:154
+#: builtin/notes.c:153
 msgid "could not read 'show' output"
 msgstr "�能讀� 'show' 的輸出"
 
-#: builtin/notes.c:162
+#: builtin/notes.c:161
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "無法為物件 '%s' 完� 'show'"
 
-#: builtin/notes.c:195
+#: builtin/notes.c:194
 msgid "please supply the note contents using either -m or -F option"
 msgstr "請�� -m 或 -F �項為註解�供內容"
 
-#: builtin/notes.c:204
+#: builtin/notes.c:203
 msgid "unable to write note object"
 msgstr "�能寫註解物件"
 
@@ -18318,7 +18219,7 @@ msgstr "�能寫註解物件"
 msgid "the note contents have been left in %s"
 msgstr "註解內容被留在 %s 中"
 
-#: builtin/notes.c:240 builtin/tag.c:577
+#: builtin/notes.c:240 builtin/tag.c:581
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能開啟或讀� '%s'"
@@ -18360,8 +18261,8 @@ msgstr "拒絕� %2$s（在 refs/notes/ 之外）%1$s註解"
 
 #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507
 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663
-#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983
-#: builtin/prune-packed.c:25 builtin/tag.c:587
+#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987
+#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591
 msgid "too many arguments"
 msgstr "太多�數"
 
@@ -18406,7 +18307,7 @@ msgstr "ä¸�能新增註解。發ç�¾ç‰©ä»¶ %s 已存在註解。使用 '-f' 覆è“
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆蓋物件 %s �存註解\n"
 
-#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900
+#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904
 #, c-format
 msgid "Removing note for object %s\n"
 msgstr "刪除物件 %s 的註解\n"
@@ -18524,17 +18425,17 @@ msgstr "必須指定一個註解引用來�併"
 msgid "unknown -s/--strategy: %s"
 msgstr "未知的 -s/--strategy：%s"
 
-#: builtin/notes.c:871
+#: builtin/notes.c:874
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "�於 %2$s 的一個到 %1$s 中的註解�併正在執行中"
 
-#: builtin/notes.c:874
+#: builtin/notes.c:878
 #, c-format
 msgid "failed to store link to current notes ref (%s)"
 msgstr "無法儲存連�到目�的註解引用（%s）"
 
-#: builtin/notes.c:876
+#: builtin/notes.c:880
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -18544,41 +18445,41 @@ msgstr ""
 "自動�併說明失敗。修改 %s 中的��並且使用指令 'git notes merge --commit' �"
 "交�果，或者使用指令 'git notes merge --abort' 終止�併。\n"
 
-#: builtin/notes.c:895 builtin/tag.c:590
+#: builtin/notes.c:899 builtin/tag.c:594
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "無法解� '%s' 為一個有效引用。"
 
-#: builtin/notes.c:898
+#: builtin/notes.c:902
 #, c-format
 msgid "Object %s has no note\n"
 msgstr "物件 %s 沒有註解\n"
 
-#: builtin/notes.c:910
+#: builtin/notes.c:914
 msgid "attempt to remove non-existent note is not an error"
 msgstr "嘗試刪除�存在的註解�是一個錯誤"
 
-#: builtin/notes.c:913
+#: builtin/notes.c:917
 msgid "read object names from the standard input"
 msgstr "從標準輸入讀�物件�稱"
 
-#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147
+#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147
 msgid "do not remove, show only"
 msgstr "�刪除，�顯示"
 
-#: builtin/notes.c:953
+#: builtin/notes.c:957
 msgid "report pruned notes"
 msgstr "報告清除的註解"
 
-#: builtin/notes.c:996
+#: builtin/notes.c:1000
 msgid "notes-ref"
 msgstr "註解引用"
 
-#: builtin/notes.c:997
+#: builtin/notes.c:1001
 msgid "use notes from <notes-ref>"
 msgstr "從 <註解引用> 使用註解"
 
-#: builtin/notes.c:1032 builtin/stash.c:1752
+#: builtin/notes.c:1036 builtin/stash.c:1818
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知�指令：%s"
@@ -18967,10 +18868,6 @@ msgstr "最�的包檔案大�是 1 MiB"
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin �能用於建立一個�索引包"
 
-#: builtin/pack-objects.c:4073
-msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable 和 --unpack-unreachable �相容"
-
 #: builtin/pack-objects.c:4079
 msgid "cannot use --filter without --stdout"
 msgstr "�能在沒有 --stdout 的情�下使用 --filter"
@@ -18987,7 +18884,7 @@ msgstr "無法將內部版本清單與 --stdin-packs ��使用"
 msgid "Enumerating objects"
 msgstr "枚舉物件"
 
-#: builtin/pack-objects.c:4181
+#: builtin/pack-objects.c:4180
 #, c-format
 msgid ""
 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -19030,19 +18927,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]"
 
-#: builtin/prune.c:133
+#: builtin/prune.c:145
 msgid "report pruned objects"
 msgstr "報告清除的物件"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:148
 msgid "expire objects older than <time>"
 msgstr "使早於�供時間的物件�期"
 
-#: builtin/prune.c:138
+#: builtin/prune.c:150
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "�制�歷 promisor packfile 以外的物件"
 
-#: builtin/prune.c:151
+#: builtin/prune.c:163
 msgid "cannot prune in a precious-objects repo"
 msgstr "�能在��版本庫中執行清�動作"
 
@@ -19075,7 +18972,7 @@ msgstr "�許快轉�"
 msgid "control use of pre-merge-commit and commit-msg hooks"
 msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用"
 
-#: builtin/pull.c:171 parse-options.h:338
+#: builtin/pull.c:171 parse-options.h:340
 msgid "automatically stash/stash pop before and after"
 msgstr "在動作�後執行自動儲�和彈出儲�"
 
@@ -19145,6 +19042,7 @@ msgid "<remote>"
 msgstr "<�端>"
 
 #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487
+#: contrib/scalar/scalar.c:375
 msgid "<branch>"
 msgstr "<分支>"
 
@@ -19175,13 +19073,13 @@ msgstr "無法存��交 %s"
 msgid "ignoring --verify-signatures for rebase"
 msgstr "為�定基底動作忽略 --verify-signatures"
 
-#: builtin/pull.c:942
+#: builtin/pull.c:969
 msgid ""
 "You have divergent branches and need to specify how to reconcile them.\n"
 "You can do so by running one of the following commands sometime before\n"
 "your next pull:\n"
 "\n"
-"  git config pull.rebase false  # merge (the default strategy)\n"
+"  git config pull.rebase false  # merge\n"
 "  git config pull.rebase true   # rebase\n"
 "  git config pull.ff only       # fast-forward only\n"
 "\n"
@@ -19195,7 +19093,7 @@ msgstr ""
 "您�以在下次拉��執行以下任一命令\n"
 "指定調和方�：\n"
 "\n"
-"  git config pull.rebase false  # �併（�設策略）\n"
+"  git config pull.rebase false  # �併\n"
 "  git config pull.rebase true   # �定基底\n"
 "  git config pull.ff only       # �進行快轉\n"
 "\n"
@@ -19204,19 +19102,19 @@ msgstr ""
 "pull 命令時傳� --rebase�--no-rebase 或 --ff-only 覆蓋\n"
 "設定的�設值。\n"
 
-#: builtin/pull.c:1016
+#: builtin/pull.c:1046
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未誕生的分支，變更新增至索引。"
 
-#: builtin/pull.c:1020
+#: builtin/pull.c:1050
 msgid "pull with rebase"
 msgstr "�定基底�拉�"
 
-#: builtin/pull.c:1021
+#: builtin/pull.c:1051
 msgid "please commit or stash them."
 msgstr "請�交或儲�它們。"
 
-#: builtin/pull.c:1046
+#: builtin/pull.c:1076
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -19226,7 +19124,7 @@ msgstr ""
 "fetch 更新了目�的分支。快轉您的工作�\n"
 "至�交 %s。"
 
-#: builtin/pull.c:1052
+#: builtin/pull.c:1082
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -19243,23 +19141,23 @@ msgstr ""
 "$ git reset --hard\n"
 "復原之�的狀態。"
 
-#: builtin/pull.c:1067
+#: builtin/pull.c:1097
 msgid "Cannot merge multiple branches into empty head."
 msgstr "無法將多個分支�併到空分支。"
 
-#: builtin/pull.c:1072
+#: builtin/pull.c:1102
 msgid "Cannot rebase onto multiple branches."
 msgstr "無法�定基底到多個分支。"
 
-#: builtin/pull.c:1074
+#: builtin/pull.c:1104
 msgid "Cannot fast-forward to multiple branches."
 msgstr "無法快轉至多個分支。"
 
-#: builtin/pull.c:1088
+#: builtin/pull.c:1119
 msgid "Need to specify how to reconcile divergent branches."
 msgstr "需�指定如何調和�離的分支。"
 
-#: builtin/pull.c:1102
+#: builtin/pull.c:1133
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本機�模組中有修改，無法�定基底"
 
@@ -19423,7 +19321,7 @@ msgstr "推�到 %s\n"
 msgid "failed to push some refs to '%s'"
 msgstr "推�一些引用到 '%s' 失敗"
 
-#: builtin/push.c:544 builtin/submodule--helper.c:3258
+#: builtin/push.c:544 builtin/submodule--helper.c:3259
 msgid "repository"
 msgstr "版本庫"
 
@@ -19496,10 +19394,6 @@ msgstr "用 GPG 為推�簽�"
 msgid "request atomic transaction on remote side"
 msgstr "需��端支� atomic 事務"
 
-#: builtin/push.c:592
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete 與 --all�--mirror � --tags �相容"
-
 #: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用沒有�義"
@@ -19530,26 +19424,14 @@ msgstr ""
 "\n"
 "    git push <�稱>\n"
 
-#: builtin/push.c:630
-msgid "--all and --tags are incompatible"
-msgstr "--all 和 --tags �相容"
-
 #: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all �能和引用�格�時使用"
 
-#: builtin/push.c:636
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror 和 --tags �相容"
-
 #: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror �能和引用�格�時使用"
 
-#: builtin/push.c:641
-msgid "--all and --mirror are incompatible"
-msgstr "--all 和 --mirror �相容"
-
 #: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "推��項�能有�行符號"
@@ -19965,18 +19847,6 @@ msgstr "看起來 'git am' 正在執行中。無法�定基底。"
 msgid "--preserve-merges was replaced by --rebase-merges"
 msgstr "--preserve-merges 已經被 --rebase-merges �代"
 
-#: builtin/rebase.c:1193
-msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "�能將 '--keep-base' 和 '--onto' 組�使用"
-
-#: builtin/rebase.c:1195
-msgid "cannot combine '--keep-base' with '--root'"
-msgstr "�能將 '--keep-base' 和 '--root' 組�使用"
-
-#: builtin/rebase.c:1199
-msgid "cannot combine '--root' with '--fork-point'"
-msgstr "�能將 '--root' 和 '--fork-point' ��使用"
-
 #: builtin/rebase.c:1202
 msgid "No rebase in progress?"
 msgstr "沒有正在進行的�定基底？"
@@ -20039,8 +19909,8 @@ msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需� --merge 或 --interactive"
 
 #: builtin/rebase.c:1463
-msgid "cannot combine apply options with merge options"
-msgstr "�能將 apply 套用�項與 merge �併�項一起使用"
+msgid "apply options and merge options cannot be used together"
+msgstr "套用�項與�併�項�得�時使用"
 
 #: builtin/rebase.c:1476
 #, c-format
@@ -20081,7 +19951,7 @@ msgid "no such branch/commit '%s'"
 msgstr "沒有此分支/�交 '%s'"
 
 #: builtin/rebase.c:1618 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2658
+#: builtin/submodule--helper.c:2659
 #, c-format
 msgid "No such ref: %s"
 msgstr "沒有這樣的引用：%s"
@@ -20149,7 +20019,7 @@ msgstr "快轉 %s 到 %s。\n"
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <版本庫目錄>"
 
-#: builtin/receive-pack.c:1280
+#: builtin/receive-pack.c:1275
 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"
@@ -20175,7 +20045,7 @@ msgstr ""
 "若��鎖此訊�且���設行為，設定 'receive.denyCurrentBranch'\n"
 "設定變數為 'refuse'。"
 
-#: builtin/receive-pack.c:1300
+#: builtin/receive-pack.c:1295
 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"
@@ -20194,13 +20064,13 @@ msgstr ""
 "\n"
 "若��鎖此訊�，您�以設定它為 'refuse'。"
 
-#: builtin/receive-pack.c:2480
+#: builtin/receive-pack.c:2474
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:2495
-msgid "You must specify a directory."
-msgstr "您必須指定一個目錄。"
+#: builtin/receive-pack.c:2489
+msgid "you must specify a directory"
+msgstr "您必須指定目錄"
 
 #: builtin/reflog.c:17
 msgid ""
@@ -20224,41 +20094,41 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <引用>"
 
-#: builtin/reflog.c:568 builtin/reflog.c:573
+#: builtin/reflog.c:585 builtin/reflog.c:590
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' �是一個有效的時間戳"
 
-#: builtin/reflog.c:609
+#: builtin/reflog.c:631
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "正在標記�以�得物件..."
 
-#: builtin/reflog.c:647
+#: builtin/reflog.c:675
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s 指��存在�"
 
-#: builtin/reflog.c:700
+#: builtin/reflog.c:731
 msgid "no reflog specified to delete"
 msgstr "未指定�刪除的引用日誌"
 
-#: builtin/reflog.c:708
+#: builtin/reflog.c:742
 #, c-format
 msgid "not a reflog: %s"
 msgstr "�是一個引用日誌：%s"
 
-#: builtin/reflog.c:713
+#: builtin/reflog.c:747
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "沒有 '%s' 的引用日誌"
 
-#: builtin/reflog.c:759
+#: builtin/reflog.c:794
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "無效的引用格�：%s"
 
-#: builtin/reflog.c:768
+#: builtin/reflog.c:803
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
@@ -20348,6 +20218,11 @@ msgstr "git remote update [<�項>] [<組> | <�端>]..."
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
+#: builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "�能�得 %s"
+
 #: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
@@ -20790,148 +20665,140 @@ msgstr ""
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "無法開始 pack-objects 來�新打包 promisor 物件"
 
-#: builtin/repack.c:273 builtin/repack.c:816
+#: builtin/repack.c:275 builtin/repack.c:820
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack：期望來自 pack-objects 的完整�六進�物件 ID。"
 
-#: builtin/repack.c:297
+#: builtin/repack.c:299
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "無法完� pack-objects 來�新打包 promisor 物件"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:314
 #, c-format
 msgid "cannot open index for %s"
 msgstr "無法開啟 %s 的索引"
 
-#: builtin/repack.c:371
+#: builtin/repack.c:373
 #, c-format
 msgid "pack %s too large to consider in geometric progression"
 msgstr "%s 包太大，以致�能在等比數列中考慮"
 
-#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416
+#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418
 #, c-format
 msgid "pack %s too large to roll up"
 msgstr "%s 包太大，以致�能縮�"
 
-#: builtin/repack.c:496
+#: builtin/repack.c:498
 #, c-format
 msgid "could not open tempfile %s for writing"
 msgstr "無法開啟 '%s' 暫存檔進行寫入"
 
-#: builtin/repack.c:514
+#: builtin/repack.c:516
 msgid "could not close refs snapshot tempfile"
 msgstr "無法關閉 refs 的快照暫存檔"
 
-#: builtin/repack.c:628
+#: builtin/repack.c:630
 msgid "pack everything in a single pack"
 msgstr "所有內容打包到一個包檔案中"
 
-#: builtin/repack.c:630
+#: builtin/repack.c:632
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相�，並將無法�得的物件設為鬆散物件"
 
-#: builtin/repack.c:633
+#: builtin/repack.c:635
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "刪除多餘的包，執行 git-prune-packed"
 
-#: builtin/repack.c:635
+#: builtin/repack.c:637
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --no-reuse-delta"
 
-#: builtin/repack.c:637
+#: builtin/repack.c:639
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --no-reuse-object"
 
-#: builtin/repack.c:639
+#: builtin/repack.c:641
 msgid "do not run git-update-server-info"
 msgstr "�執行 git-update-server-info"
 
-#: builtin/repack.c:642
+#: builtin/repack.c:644
 msgid "pass --local to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --local"
 
-#: builtin/repack.c:644
+#: builtin/repack.c:646
 msgid "write bitmap index"
 msgstr "寫 bitmap 索引"
 
-#: builtin/repack.c:646
+#: builtin/repack.c:648
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "� git-pack-objects 傳��數 --delta-islands"
 
-#: builtin/repack.c:647
+#: builtin/repack.c:649
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:648
+#: builtin/repack.c:650
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，��將早於�供時間的物件�期"
 
-#: builtin/repack.c:650
+#: builtin/repack.c:652
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，�新�無法�得物件打包"
 
-#: builtin/repack.c:652
+#: builtin/repack.c:654
 msgid "size of the window used for delta compression"
 msgstr "用於增�壓縮的視窗值"
 
-#: builtin/repack.c:653 builtin/repack.c:659
+#: builtin/repack.c:655 builtin/repack.c:661
 msgid "bytes"
 msgstr "�元組"
 
-#: builtin/repack.c:654
+#: builtin/repack.c:656
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上�的相似，但�制記憶體大�而��目數"
 
-#: builtin/repack.c:656
+#: builtin/repack.c:658
 msgid "limits the maximum delta depth"
 msgstr "�制最大增�深度"
 
-#: builtin/repack.c:658
+#: builtin/repack.c:660
 msgid "limits the maximum number of threads"
 msgstr "�制最大執行緒數"
 
-#: builtin/repack.c:660
+#: builtin/repack.c:662
 msgid "maximum size of each packfile"
 msgstr "�個 packfile 的最大尺寸"
 
-#: builtin/repack.c:662
+#: builtin/repack.c:664
 msgid "repack objects in packs marked with .keep"
 msgstr "�標記為 .keep 的包中的物件�新打包"
 
-#: builtin/repack.c:664
+#: builtin/repack.c:666
 msgid "do not repack this pack"
 msgstr "���該包檔案�新打包"
 
-#: builtin/repack.c:666
+#: builtin/repack.c:668
 msgid "find a geometric progression with factor <N>"
 msgstr "尋找因數是 <N> 的等比數列"
 
-#: builtin/repack.c:668
+#: builtin/repack.c:670
 msgid "write a multi-pack index of the resulting packs"
 msgstr "寫入�果包的多包索引"
 
-#: builtin/repack.c:678
+#: builtin/repack.c:680
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "�能刪除��版本庫中的打包檔案"
 
-#: builtin/repack.c:682
-msgid "--keep-unreachable and -A are incompatible"
-msgstr "--keep-unreachable 和 -A �相容"
-
-#: builtin/repack.c:713
-msgid "--geometric is incompatible with -A, -a"
-msgstr "--geometric 與 -A, -a �相容"
-
-#: builtin/repack.c:825
+#: builtin/repack.c:829
 msgid "Nothing new to pack."
 msgstr "沒有新的�打包。"
 
-#: builtin/repack.c:855
+#: builtin/repack.c:859
 #, c-format
 msgid "missing required file: %s"
 msgstr "缺少必�檔案：%s"
 
-#: builtin/repack.c:857
+#: builtin/repack.c:861
 #, c-format
 msgid "could not unlink: %s"
 msgstr "無法�消連�：%s"
@@ -21014,98 +20881,92 @@ msgstr "cat-file 報告失敗"
 msgid "unable to open %s for reading"
 msgstr "無法為讀�開啟 %s"
 
-#: builtin/replace.c:272
+#: builtin/replace.c:271
 msgid "unable to spawn mktree"
 msgstr "無法啟動 mktree"
 
-#: builtin/replace.c:276
+#: builtin/replace.c:275
 msgid "unable to read from mktree"
 msgstr "無法從 mktree 讀�"
 
-#: builtin/replace.c:285
+#: builtin/replace.c:284
 msgid "mktree reported failure"
 msgstr "mktree 報告失敗"
 
-#: builtin/replace.c:289
+#: builtin/replace.c:288
 msgid "mktree did not return an object name"
 msgstr "mktree 沒有返回一個物件�"
 
-#: builtin/replace.c:298
+#: builtin/replace.c:297
 #, c-format
 msgid "unable to fstat %s"
 msgstr "無法� %s 執行 fstat"
 
-#: builtin/replace.c:303
+#: builtin/replace.c:302
 msgid "unable to write object to database"
 msgstr "無法�資料庫寫入物件"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424
-#: builtin/replace.c:454
-#, c-format
-msgid "not a valid object name: '%s'"
-msgstr "�是一個有效的物件�：'%s'"
-
-#: builtin/replace.c:326
+#: builtin/replace.c:325
 #, c-format
 msgid "unable to get object type for %s"
 msgstr "無法得到 %s 的物件類型"
 
-#: builtin/replace.c:342
+#: builtin/replace.c:341
 msgid "editing object file failed"
 msgstr "編輯物件檔案失敗"
 
-#: builtin/replace.c:351
+#: builtin/replace.c:350
 #, c-format
 msgid "new object is the same as the old one: '%s'"
 msgstr "新物件和舊物件相�：'%s'"
 
-#: builtin/replace.c:384
+#: builtin/replace.c:383
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr "無法將 %s 解�為一個�交"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:415
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "�交 '%s' 中�有�壞的�併標籤"
 
-#: builtin/replace.c:418
+#: builtin/replace.c:417
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "�交 '%s' 中�有格�錯誤的�併標籤"
 
-#: builtin/replace.c:430
+#: builtin/replace.c:429
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始�交 '%s' 包�已經�棄的�併標籤 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:468
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "原始�交 '%s' 中有一個 gpg 簽�"
 
-#: builtin/replace.c:470
+#: builtin/replace.c:469
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在�代的�交中簽�將被移除�"
 
-#: builtin/replace.c:480
+#: builtin/replace.c:479
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "�能為 '%s' 寫�代�交"
 
-#: builtin/replace.c:488
+#: builtin/replace.c:487
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "� '%s' 移�沒有必�"
 
-#: builtin/replace.c:492
+#: builtin/replace.c:491
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "新�交和舊的一樣：'%s'"
 
-#: builtin/replace.c:527
+#: builtin/replace.c:526
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -21114,71 +20975,71 @@ msgstr ""
 "�能轉�下列移�：\n"
 "%s"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:547
 msgid "list replace refs"
 msgstr "列出�代的引用"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:548
 msgid "delete replace refs"
 msgstr "刪除�代的引用"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:549
 msgid "edit existing object"
 msgstr "編輯�存的物件"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:550
 msgid "change a commit's parents"
 msgstr "修改一個�交的父�交"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:551
 msgid "convert existing graft file"
 msgstr "轉��存的移�檔案"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:552
 msgid "replace the ref if it exists"
 msgstr "如果存在則�代引用"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:554
 msgid "do not pretty-print contents for --edit"
 msgstr "��為 --edit 動作美觀顯示內容"
 
-#: builtin/replace.c:556
+#: builtin/replace.c:555
 msgid "use this format"
 msgstr "使用此格�"
 
-#: builtin/replace.c:569
+#: builtin/replace.c:568
 msgid "--format cannot be used when not listing"
 msgstr "�列出時�能使用 --format"
 
-#: builtin/replace.c:577
+#: builtin/replace.c:576
 msgid "-f only makes sense when writing a replacement"
 msgstr "�有寫一個�代時 -f �有�義"
 
-#: builtin/replace.c:581
+#: builtin/replace.c:580
 msgid "--raw only makes sense with --edit"
 msgstr "--raw �有和 --edit 共用�有�義"
 
-#: builtin/replace.c:587
+#: builtin/replace.c:586
 msgid "-d needs at least one argument"
 msgstr "-d 需�至少一個�數"
 
-#: builtin/replace.c:593
+#: builtin/replace.c:592
 msgid "bad number of arguments"
 msgstr "錯誤的�數個數"
 
-#: builtin/replace.c:599
+#: builtin/replace.c:598
 msgid "-e needs exactly one argument"
 msgstr "-e 需�且僅需�一個�數"
 
-#: builtin/replace.c:605
+#: builtin/replace.c:604
 msgid "-g needs at least one argument"
 msgstr "-g 需�至少一個�數"
 
-#: builtin/replace.c:611
+#: builtin/replace.c:610
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file �帶�數"
 
-#: builtin/replace.c:617
+#: builtin/replace.c:616
 msgid "only one pattern can be given with -l"
 msgstr "�能為 -l �供一個模�"
 
@@ -21199,133 +21060,125 @@ msgstr "沒有路徑的 'git rerere forget' 已經�時"
 msgid "unable to generate diff for '%s'"
 msgstr "無法為 '%s' 生�差異"
 
-#: builtin/reset.c:32
+#: builtin/reset.c:33
 msgid ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<�交>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:34
 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<樹或�交>] [--] <路徑�格>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:35
 msgid ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
 msgstr ""
 "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或�交>]"
 
-#: builtin/reset.c:35
+#: builtin/reset.c:36
 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<樹或�交>] [--] [<路徑�格>...]"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "mixed"
 msgstr "混雜"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "soft"
 msgstr "軟性"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "merge"
 msgstr "�併"
 
-#: builtin/reset.c:41
+#: builtin/reset.c:42
 msgid "keep"
 msgstr "��"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:90
 msgid "You do not have a valid HEAD."
 msgstr "您沒有一個有效的 HEAD。"
 
-#: builtin/reset.c:91
+#: builtin/reset.c:92
 msgid "Failed to find tree of HEAD."
 msgstr "無法找到 HEAD 指�的樹。"
 
-#: builtin/reset.c:97
+#: builtin/reset.c:98
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "無法找到 %s 指�的樹。"
 
-#: builtin/reset.c:122
+#: builtin/reset.c:123
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD �在�於 %s"
 
 #  譯者：漢字之間無空格，故刪除%s�後空格
-#: builtin/reset.c:201
+#: builtin/reset.c:299
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�併�程中�能�%s�設動作。"
 
-#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679
-#: builtin/stash.c:703
+#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680
+#: builtin/stash.c:704
 msgid "be quiet, only report errors"
 msgstr "安�模�，�報告錯誤"
 
-#: builtin/reset.c:303
+#: builtin/reset.c:398
 msgid "reset HEAD and index"
 msgstr "�設 HEAD 和索引"
 
-#: builtin/reset.c:304
+#: builtin/reset.c:399
 msgid "reset only HEAD"
 msgstr "��設 HEAD"
 
-#: builtin/reset.c:306 builtin/reset.c:308
+#: builtin/reset.c:401 builtin/reset.c:403
 msgid "reset HEAD, index and working tree"
 msgstr "�設 HEAD�索引和工作�"
 
-#: builtin/reset.c:310
+#: builtin/reset.c:405
 msgid "reset HEAD but keep local changes"
 msgstr "�設 HEAD 但儲存本機變更"
 
-#: builtin/reset.c:316
+#: builtin/reset.c:411
 msgid "record only the fact that removed paths will be added later"
 msgstr "將刪除的路徑標記為�後新增"
 
-#: builtin/reset.c:350
+#: builtin/reset.c:445
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "無法將 '%s' 解�為一個有效的版本。"
 
-#: builtin/reset.c:358
+#: builtin/reset.c:453
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "無法將 '%s' 解�為一個有效的樹狀物件。"
 
-#: builtin/reset.c:367
-msgid "--patch is incompatible with --{hard,mixed,soft}"
-msgstr "--patch 與 --{hard�mixed�soft} �項�相容"
-
-#: builtin/reset.c:377
+#: builtin/reset.c:472
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
 
 #  譯者：漢字之間無空格，故刪除%s�後空格
-#: builtin/reset.c:379
+#: builtin/reset.c:474
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能帶路徑進行%s�設。"
 
 #  譯者：漢字之間無空格，故刪除%s�後空格
-#: builtin/reset.c:394
+#: builtin/reset.c:489
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能�純版本庫進行%s�設"
 
-#: builtin/reset.c:398
-msgid "-N can only be used with --mixed"
-msgstr "-N �能和 --mixed �時使用"
-
-#: builtin/reset.c:419
+#: builtin/reset.c:520
 msgid "Unstaged changes after reset:"
 msgstr "�設後�消暫存的變更："
 
-#: builtin/reset.c:422
+#: builtin/reset.c:523
 #, c-format
 msgid ""
 "\n"
@@ -21337,19 +21190,15 @@ msgstr ""
 "�設後，枚舉未暫存變更花費了 %.2f 秒。 您�以使用 '--quiet' ��此情�。\n"
 "將設定變數 reset.quiet 設定為 true �使其�為�設值。\n"
 
-#: builtin/reset.c:440
+#: builtin/reset.c:541
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�設索引檔案至版本 '%s'。"
 
-#: builtin/reset.c:445
+#: builtin/reset.c:546
 msgid "Could not write new index file."
 msgstr "�能寫入新的索引檔案。"
 
-#: builtin/rev-list.c:541
-msgid "cannot combine --exclude-promisor-objects and --missing"
-msgstr "�能�時使用 --exclude-promisor-objects 和 --missing �項"
-
 #: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "物件�濾需� --objects"
@@ -21359,8 +21208,9 @@ msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�顯示註解"
 
 #: builtin/rev-list.c:679
-msgid "marked counting is incompatible with --objects"
-msgstr "--objects �相容標記計數 (marked counting)"
+#, c-format
+msgid "marked counting and '%s' cannot be used together"
+msgstr "標記計數 (marked counting) 與「%s��得�時使用"
 
 #: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
@@ -21792,11 +21642,6 @@ msgstr "<n>[,<base>]"
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "顯示從起始點開始的 <n> �最近的引用日誌記錄"
 
-#: builtin/show-branch.c:710
-msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
-msgstr "--reflog 和 --all�--remotes�--independent 或 --merge-base �相容"
-
 #: builtin/show-branch.c:734
 msgid "no branches given, and HEAD is not valid"
 msgstr "未�供分支，且 HEAD 無效"
@@ -21816,18 +21661,18 @@ msgstr[0] "一次�能顯示 %d 個�目。"
 msgid "no such ref %s"
 msgstr "無此引用 %s"
 
-#: builtin/show-branch.c:828
+#: builtin/show-branch.c:830
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
 msgstr[0] "�能處� %d 個以上的版本。"
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:834
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "'%s' �是一個有效的引用。"
 
-#: builtin/show-branch.c:835
+#: builtin/show-branch.c:837
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "�能找到�交 %s（%s）"
@@ -21892,86 +21737,112 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <�項>"
 msgid "git sparse-checkout list"
 msgstr "git sparse-checkout list"
 
-#: builtin/sparse-checkout.c:72
+#: builtin/sparse-checkout.c:60
+msgid "this worktree is not sparse"
+msgstr "這�是稀�工作�"
+
+#: builtin/sparse-checkout.c:75
 msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr "這�是稀�工作�（sparse-checkout 檔案�能�存在）"
 
-#: builtin/sparse-checkout.c:173
+#: builtin/sparse-checkout.c:176
 #, c-format
 msgid ""
 "directory '%s' contains untracked files, but is not in the sparse-checkout "
 "cone"
 msgstr "「%s�目錄有未追蹤的檔案，但�在稀��交的 cone 中"
 
-#: builtin/sparse-checkout.c:181
+#: builtin/sparse-checkout.c:184
 #, c-format
 msgid "failed to remove directory '%s'"
 msgstr "無法移除 '%s' 目錄"
 
-#: builtin/sparse-checkout.c:321
+#: builtin/sparse-checkout.c:324
 msgid "failed to create directory for sparse-checkout file"
 msgstr "無法建立稀�簽出檔案的目錄"
 
-#: builtin/sparse-checkout.c:362
+#: builtin/sparse-checkout.c:365
 msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr "無法�級版本庫格�，以致無法啟用 worktreeConfig"
 
-#: builtin/sparse-checkout.c:364
+#: builtin/sparse-checkout.c:367
 msgid "failed to set extensions.worktreeConfig setting"
 msgstr "無法設定 extensions.worktreeConfig 設定"
 
-#: builtin/sparse-checkout.c:384
+#: builtin/sparse-checkout.c:411
+msgid "failed to modify sparse-index config"
+msgstr "無法修改稀�索引設定"
+
+#: builtin/sparse-checkout.c:422
 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:404
+#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729
+#: builtin/sparse-checkout.c:778
 msgid "initialize the sparse-checkout in cone mode"
 msgstr "以 cone 模��始化稀�簽出"
 
-#: builtin/sparse-checkout.c:406
+#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731
+#: builtin/sparse-checkout.c:780
 msgid "toggle the use of a sparse index"
 msgstr "切�是�使用稀�索引"
 
-#: builtin/sparse-checkout.c:434
-msgid "failed to modify sparse-index config"
-msgstr "無法修改稀�索引設定"
-
-#: builtin/sparse-checkout.c:455
+#: builtin/sparse-checkout.c:476
 #, c-format
 msgid "failed to open '%s'"
 msgstr "無法開啟「%s�"
 
-#: builtin/sparse-checkout.c:507
+#: builtin/sparse-checkout.c:528
 #, c-format
 msgid "could not normalize path %s"
 msgstr "無法標準化路徑 %s"
 
-#: builtin/sparse-checkout.c:519
-msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
-msgstr "git sparse-checkout (set|add) (--stdin | <樣�>)"
-
-#: builtin/sparse-checkout.c:544
+#: builtin/sparse-checkout.c:557
 #, c-format
 msgid "unable to unquote C-style string '%s'"
 msgstr "無法去掉 '%s' C 樣�字串的引號"
 
-#: builtin/sparse-checkout.c:598 builtin/sparse-checkout.c:622
+#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640
 msgid "unable to load existing sparse-checkout patterns"
 msgstr "無法載入�存的稀�簽出樣�"
 
-#: builtin/sparse-checkout.c:667
+#: builtin/sparse-checkout.c:616
+msgid "existing sparse-checkout patterns do not use cone mode"
+msgstr "�有的稀�簽出樣��使用 cone 模�"
+
+#: builtin/sparse-checkout.c:682
+msgid "git sparse-checkout add (--stdin | <patterns>)"
+msgstr "git sparse-checkout add (--stdin | <樣�>)"
+
+#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733
 msgid "read patterns from standard in"
 msgstr "從標準輸入讀�樣�"
 
-#: builtin/sparse-checkout.c:682
-msgid "git sparse-checkout reapply"
-msgstr "git sparse-checkout reapply"
+#: builtin/sparse-checkout.c:699
+msgid "no sparse-checkout to add to"
+msgstr "沒有�加入之稀�簽出"
+
+#: builtin/sparse-checkout.c:712
+msgid ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+msgstr ""
+"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | "
+"<patterns>)"
+
+#: builtin/sparse-checkout.c:765
+msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]"
 
-#: builtin/sparse-checkout.c:701
+#: builtin/sparse-checkout.c:785
+msgid "must be in a sparse-checkout to reapply sparsity patterns"
+msgstr "必須在稀��交�能�新套用稀�樣� (sparsity pattern)"
+
+#: builtin/sparse-checkout.c:803
 msgid "git sparse-checkout disable"
 msgstr "git sparse-checkout disable"
 
-#: builtin/sparse-checkout.c:732
+#: builtin/sparse-checkout.c:845
 msgid "error while refreshing working directory"
 msgstr "�新整�工作目錄時發生錯誤"
 
@@ -21997,23 +21868,27 @@ msgstr "git stash branch <分支�> [<stash>]"
 
 #: builtin/stash.c:30
 msgid ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
 "          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
-"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [-m|--message <訊�>]\n"
 "          [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"
 "          [--] [<路徑�格>...]]"
 
 #: builtin/stash.c:34
 msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-"          [-u|--include-untracked] [-a|--all] [<消�>]"
+"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
+"quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<訊�>]"
 
 #: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
@@ -22105,140 +21980,156 @@ msgstr "正在�併 %s 和 %s"
 msgid "Index was not unstashed."
 msgstr "索引未從儲�中復原。"
 
-#: builtin/stash.c:575
+#: builtin/stash.c:576
 msgid "could not restore untracked files from stash"
 msgstr "無法從儲��目中復原未追蹤檔案"
 
-#: builtin/stash.c:607 builtin/stash.c:705
+#: builtin/stash.c:608 builtin/stash.c:706
 msgid "attempt to recreate the index"
 msgstr "嘗試�建索引"
 
-#: builtin/stash.c:651
+#: builtin/stash.c:652
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "�棄了 %s（%s）"
 
-#: builtin/stash.c:654
+#: builtin/stash.c:655
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：無法�棄儲��目"
 
-#: builtin/stash.c:667
+#: builtin/stash.c:668
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' �是一個儲�引用"
 
-#: builtin/stash.c:717
+#: builtin/stash.c:718
 msgid "The stash entry is kept in case you need it again."
 msgstr "儲��目被�留以備您�次需�。"
 
-#: builtin/stash.c:740
+#: builtin/stash.c:741
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:825
 msgid "failed to parse tree"
 msgstr "無法解�樹"
 
-#: builtin/stash.c:835
+#: builtin/stash.c:836
 msgid "failed to unpack trees"
 msgstr "無法解包樹"
 
-#: builtin/stash.c:855
+#: builtin/stash.c:856
 msgid "include untracked files in the stash"
 msgstr "在儲��包�未追蹤檔案"
 
-#: builtin/stash.c:858
+#: builtin/stash.c:859
 msgid "only show untracked files in the stash"
 msgstr "�在儲��顯示未追蹤檔案"
 
-#: builtin/stash.c:945 builtin/stash.c:982
+#: builtin/stash.c:946 builtin/stash.c:983
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "無法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684
+#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750
 msgid "stash message"
 msgstr "儲�說明"
 
-#: builtin/stash.c:973
+#: builtin/stash.c:974
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需�一個 <�交> �數"
 
-#: builtin/stash.c:1187
+#: builtin/stash.c:1159
+msgid "No staged changes"
+msgstr "無暫存變更"
+
+#: builtin/stash.c:1220
 msgid "No changes selected"
 msgstr "沒有�擇變更"
 
-#: builtin/stash.c:1287
+#: builtin/stash.c:1320
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立�始�交"
 
-#: builtin/stash.c:1314
+#: builtin/stash.c:1347
 msgid "Cannot save the current index state"
 msgstr "無法儲存目�索引狀態"
 
-#: builtin/stash.c:1323
+#: builtin/stash.c:1356
 msgid "Cannot save the untracked files"
 msgstr "無法儲存未追蹤檔案"
 
-#: builtin/stash.c:1334 builtin/stash.c:1343
+#: builtin/stash.c:1367 builtin/stash.c:1386
 msgid "Cannot save the current worktree state"
 msgstr "無法儲存目�工作�狀態"
 
-#: builtin/stash.c:1371
+#: builtin/stash.c:1377
+msgid "Cannot save the current staged state"
+msgstr "無法儲存目�暫存狀態"
+
+#: builtin/stash.c:1414
 msgid "Cannot record working tree state"
 msgstr "�能記錄工作�狀態"
 
-#: builtin/stash.c:1420
+#: builtin/stash.c:1463
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "�能�時使用�數 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1438
+#: builtin/stash.c:1474
+msgid "Can't use --staged and --include-untracked or --all at the same time"
+msgstr "--staged 和 --include-untracked 或 --all �得�時使用"
+
+#: builtin/stash.c:1492
 msgid "Did you forget to 'git add'?"
 msgstr "您是�忘了執行 'git add'？"
 
-#: builtin/stash.c:1453
+#: builtin/stash.c:1507
 msgid "No local changes to save"
 msgstr "沒有�儲存的本機修改"
 
-#: builtin/stash.c:1460
+#: builtin/stash.c:1514
 msgid "Cannot initialize stash"
 msgstr "無法�始化儲�"
 
-#: builtin/stash.c:1475
+#: builtin/stash.c:1529
 msgid "Cannot save the current status"
 msgstr "無法儲存目�狀態"
 
-#: builtin/stash.c:1480
+#: builtin/stash.c:1534
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "儲存工作目錄和索引狀態 %s"
 
-#: builtin/stash.c:1571
+#: builtin/stash.c:1627
 msgid "Cannot remove worktree changes"
 msgstr "無法刪除工作�變更"
 
-#: builtin/stash.c:1610 builtin/stash.c:1675
+#: builtin/stash.c:1667 builtin/stash.c:1739
 msgid "keep index"
 msgstr "��索引"
 
-#: builtin/stash.c:1612 builtin/stash.c:1677
+#: builtin/stash.c:1669 builtin/stash.c:1741
+msgid "stash staged changes only"
+msgstr "�儲�暫存變更"
+
+#: builtin/stash.c:1671 builtin/stash.c:1743
 msgid "stash in patch mode"
 msgstr "以修補檔模�儲�"
 
-#: builtin/stash.c:1613 builtin/stash.c:1678
+#: builtin/stash.c:1672 builtin/stash.c:1744
 msgid "quiet mode"
 msgstr "�默模�"
 
-#: builtin/stash.c:1615 builtin/stash.c:1680
+#: builtin/stash.c:1674 builtin/stash.c:1746
 msgid "include untracked files in stash"
 msgstr "儲�中包�未追蹤檔案"
 
-#: builtin/stash.c:1617 builtin/stash.c:1682
+#: builtin/stash.c:1676 builtin/stash.c:1748
 msgid "include ignore files"
 msgstr "包�忽略的檔案"
 
-#: builtin/stash.c:1717
+#: builtin/stash.c:1783
 msgid ""
 "the stash.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -22262,7 +22153,7 @@ msgstr "略�和移除所有的備註行"
 msgid "prepend comment character and space to each line"
 msgstr "為�一行的行首新增備註符和空格"
 
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一個完整的引用�稱，�得到 %s"
@@ -22283,7 +22174,7 @@ msgid ""
 "authoritative upstream."
 msgstr "無法找到設定 '%s'。�定這個版本庫是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859
 msgid "alternative anchor for relative paths"
 msgstr "相�路徑的替代錨記（anchor）"
 
@@ -22377,7 +22268,7 @@ msgstr "無法解��模組 '%s' 的 HEAD 引用"
 msgid "failed to recurse into submodule '%s'"
 msgstr "�迴�模組 '%s' 失敗"
 
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590
 msgid "suppress submodule status output"
 msgstr "隱��模組的狀態輸出"
 
@@ -22444,10 +22335,6 @@ msgstr "git submodule--helper summary [<�項>] [<�交>] [--] [<路徑>]"
 msgid "could not fetch a revision for HEAD"
 msgstr "無法�得 HEAD 的版本"
 
-#: builtin/submodule--helper.c:1316
-msgid "--cached and --files are mutually exclusive"
-msgstr "--cached 和 --files 互斥"
-
 #: builtin/submodule--helper.c:1373
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
@@ -22476,61 +22363,60 @@ msgstr "隱��模組 URL �步的輸出"
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
 
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1508
 #, c-format
 msgid ""
-"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
-"really want to remove it including all of its history)"
+"Submodule work tree '%s' contains a .git directory. This will be replaced "
+"with a .git file by using absorbgitdirs."
 msgstr ""
-"�模組工作� '%s' 包�一個 .git 目錄（如果您確需刪除它�其全部歷�，使用 'rm "
-"-rf' 指令）"
+"�模組工作�「%s�內有 .git 目錄。使用 absorbgitdirs 會將其替�為 .git 檔案。"
 
-#: builtin/submodule--helper.c:1524
+#: builtin/submodule--helper.c:1525
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "�模組工作� '%s' 包�本機修改；使用 '-f' �棄它們"
 
-#: builtin/submodule--helper.c:1532
+#: builtin/submodule--helper.c:1533
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目錄 '%s'\n"
 
-#: builtin/submodule--helper.c:1534
+#: builtin/submodule--helper.c:1535
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "無法移除�模組工作� '%s'\n"
 
-#: builtin/submodule--helper.c:1545
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "�能建立空的�模組目錄 %s"
 
-#: builtin/submodule--helper.c:1561
+#: builtin/submodule--helper.c:1562
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "�模組 '%s'（%s）未�路徑 '%s' 註冊\n"
 
-#: builtin/submodule--helper.c:1590
+#: builtin/submodule--helper.c:1591
 msgid "remove submodule working trees even if they contain local changes"
 msgstr "�使有本機變更�移除�模組的工作�"
 
-#: builtin/submodule--helper.c:1591
+#: builtin/submodule--helper.c:1592
 msgid "unregister all submodules"
 msgstr "�消註冊所有�模組"
 
-#: builtin/submodule--helper.c:1596
+#: builtin/submodule--helper.c:1597
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]"
 
-#: builtin/submodule--helper.c:1610
+#: builtin/submodule--helper.c:1611
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您確定想��所有�模組執行�消�始化，請使用 '--all'"
 
-#: builtin/submodule--helper.c:1655
+#: builtin/submodule--helper.c:1656
 msgid ""
 "An alternate computed from a superproject's alternate is invalid.\n"
 "To allow Git to clone without an alternate in such a case, set\n"
@@ -22542,67 +22428,67 @@ msgstr ""
 "以�許 Git �用備用版本庫複製，亦�使用等效的 '--reference-if-able'\n"
 "而� '--reference' 複製。"
 
-#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703
+#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "�模組 '%s' �能新增版本庫備�：%s"
 
-#: builtin/submodule--helper.c:1739
+#: builtin/submodule--helper.c:1740
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能識別 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1746
+#: builtin/submodule--helper.c:1747
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�能識別 submodule.alternateLocation 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1771
+#: builtin/submodule--helper.c:1772
 #, c-format
 msgid "refusing to create/use '%s' in another submodule's git dir"
 msgstr "拒絕在其他�模組的 git 路徑建立�使用「%s�"
 
-#: builtin/submodule--helper.c:1812
+#: builtin/submodule--helper.c:1813
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "無法複製 '%s' 到�模組路徑 '%s'"
 
-#: builtin/submodule--helper.c:1817
+#: builtin/submodule--helper.c:1818
 #, c-format
 msgid "directory not empty: '%s'"
 msgstr "目錄�是空的：「%s�"
 
-#: builtin/submodule--helper.c:1829
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "無法得到 '%s' 的�模組目錄"
 
-#: builtin/submodule--helper.c:1861
+#: builtin/submodule--helper.c:1862
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模組將�複製的路徑"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1865
 msgid "name of the new submodule"
 msgstr "新�模組的�稱"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1868
 msgid "url where to clone the submodule from"
 msgstr "複製�模組的 url ��"
 
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264
+#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265
 msgid "depth for shallow clones"
 msgstr "淺複製的深度"
 
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525
-#: builtin/submodule--helper.c:3257
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526
+#: builtin/submodule--helper.c:3258
 msgid "force cloning progress"
 msgstr "強制顯示複製進度"
 
-#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527
+#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528
 msgid "disallow cloning into non-empty directory"
 msgstr "��許複製至�空白目錄"
 
-#: builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:1888
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -22612,269 +22498,265 @@ msgstr ""
 ">] [--name <�字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
 "徑>"
 
-#: builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1925
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "�模組 '%2$s' 的更新模� '%1$s' 無效"
 
-#: builtin/submodule--helper.c:1928
+#: builtin/submodule--helper.c:1929
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "為�模組 '%2$s' 設定的更新模� '%1$s' 無效"
 
-#: builtin/submodule--helper.c:2043
+#: builtin/submodule--helper.c:2044
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�模組 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:2047
+#: builtin/submodule--helper.c:2048
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也許您想�執行 'update --init'？"
 
-#: builtin/submodule--helper.c:2077
+#: builtin/submodule--helper.c:2078
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略�未�併的�模組 %s"
 
-#: builtin/submodule--helper.c:2106
+#: builtin/submodule--helper.c:2107
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略��模組 '%s'"
 
-#: builtin/submodule--helper.c:2256
+#: builtin/submodule--helper.c:2257
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "複製 '%s' 失敗。已排程�試作業"
 
-#: builtin/submodule--helper.c:2267
+#: builtin/submodule--helper.c:2268
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
 
-#: builtin/submodule--helper.c:2372
+#: builtin/submodule--helper.c:2373
 #, c-format
 msgid "Unable to checkout '%s' in submodule path '%s'"
 msgstr "無法在「%2$s��模組路徑簽出「%1$s�"
 
-#: builtin/submodule--helper.c:2376
+#: builtin/submodule--helper.c:2377
 #, c-format
 msgid "Unable to rebase '%s' in submodule path '%s'"
 msgstr "無法在「%2$s��模組路徑�定「%1$s�的基底"
 
-#: builtin/submodule--helper.c:2380
+#: builtin/submodule--helper.c:2381
 #, c-format
 msgid "Unable to merge '%s' in submodule path '%s'"
 msgstr "無法在「%2$s��模組路徑�併「%1$s�"
 
-#: builtin/submodule--helper.c:2384
+#: builtin/submodule--helper.c:2385
 #, c-format
 msgid "Execution of '%s %s' failed in submodule path '%s'"
 msgstr "「%s %s�在「%s��模組路徑執行失敗"
 
-#: builtin/submodule--helper.c:2408
+#: builtin/submodule--helper.c:2409
 #, c-format
 msgid "Submodule path '%s': checked out '%s'\n"
 msgstr "�模組路徑「%s�：已簽出「%s�\n"
 
-#: builtin/submodule--helper.c:2412
+#: builtin/submodule--helper.c:2413
 #, c-format
 msgid "Submodule path '%s': rebased into '%s'\n"
 msgstr "�模組路徑「%s�：已�定基底至「%s�\n"
 
-#: builtin/submodule--helper.c:2416
+#: builtin/submodule--helper.c:2417
 #, c-format
 msgid "Submodule path '%s': merged in '%s'\n"
 msgstr "�模組路徑「%s�：已在「%s��併\n"
 
-#: builtin/submodule--helper.c:2420
+#: builtin/submodule--helper.c:2421
 #, c-format
 msgid "Submodule path '%s': '%s %s'\n"
 msgstr "�模組路徑「%s�：「%s %s�\n"
 
-#: builtin/submodule--helper.c:2444
+#: builtin/submodule--helper.c:2445
 #, c-format
 msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:"
 msgstr "無法在�模組路徑 「%s�中�得。嘗試直接�得 %s："
 
-#: builtin/submodule--helper.c:2453
+#: builtin/submodule--helper.c:2454
 #, c-format
 msgid ""
 "Fetched in submodule path '%s', but it did not contain %s. Direct fetching "
 "of that commit failed."
 msgstr "已經�得「%s��模組路徑，這個路徑�未包�「%s�。直接�得該�交失敗。"
 
-#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574
-#: builtin/submodule--helper.c:2812
+#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575
+#: builtin/submodule--helper.c:2813
 msgid "path into the working tree"
 msgstr "到工作�的路徑"
 
-#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579
+#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作�中的路徑，�迴嵌套�模組"
 
-#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577
+#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578
 msgid "rebase, merge, checkout or none"
 msgstr "rebase�merge�checkout 或 none"
 
-#: builtin/submodule--helper.c:2517
+#: builtin/submodule--helper.c:2518
 msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "建立一個縮減至指定版本數的淺複製"
 
-#: builtin/submodule--helper.c:2520
+#: builtin/submodule--helper.c:2521
 msgid "parallel jobs"
 msgstr "並行任務"
 
-#: builtin/submodule--helper.c:2522
+#: builtin/submodule--helper.c:2523
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "�始複製是�應該�循建議的淺複製�項"
 
-#: builtin/submodule--helper.c:2523
+#: builtin/submodule--helper.c:2524
 msgid "don't print cloning progress"
 msgstr "��輸出複製進度"
 
-#: builtin/submodule--helper.c:2534
+#: builtin/submodule--helper.c:2535
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
 
-#: builtin/submodule--helper.c:2547
+#: builtin/submodule--helper.c:2548
 msgid "bad value for update parameter"
 msgstr "update �數�值錯誤"
 
-#: builtin/submodule--helper.c:2565
+#: builtin/submodule--helper.c:2566
 msgid "suppress output for update by rebase or merge"
 msgstr "隱� rebase 或 merge 觸發之更新的輸出"
 
-#: builtin/submodule--helper.c:2566
+#: builtin/submodule--helper.c:2567
 msgid "force checkout updates"
 msgstr "強制簽出更新"
 
-#: builtin/submodule--helper.c:2568
+#: builtin/submodule--helper.c:2569
 msgid "don't fetch new objects from the remote site"
 msgstr "�從�端站��得新物件"
 
-#: builtin/submodule--helper.c:2570
+#: builtin/submodule--helper.c:2571
 msgid "overrides update mode in case the repository is a fresh clone"
 msgstr "如果版本庫是剛複製的，就覆蓋更新模�"
 
-#: builtin/submodule--helper.c:2571
+#: builtin/submodule--helper.c:2572
 msgid "depth for shallow fetch"
 msgstr "淺 fetch 的深度"
 
-#: builtin/submodule--helper.c:2581
+#: builtin/submodule--helper.c:2582
 msgid "sha1"
 msgstr "sha1"
 
-#: builtin/submodule--helper.c:2582
+#: builtin/submodule--helper.c:2583
 msgid "SHA1 expected by superproject"
 msgstr "上層專案�期應是 SHA1"
 
-#: builtin/submodule--helper.c:2584
+#: builtin/submodule--helper.c:2585
 msgid "subsha1"
 msgstr "subsha1"
 
-#: builtin/submodule--helper.c:2585
+#: builtin/submodule--helper.c:2586
 msgid "SHA1 of submodule's HEAD"
 msgstr "�模組 HEAD 的 SHA1"
 
-#: builtin/submodule--helper.c:2591
+#: builtin/submodule--helper.c:2592
 msgid "git submodule--helper run-update-procedure [<options>] <path>"
 msgstr "git submodule--helper run-update-procedure [<�項>] [<路徑>]"
 
-#: builtin/submodule--helper.c:2662
+#: builtin/submodule--helper.c:2663
 #, 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:2780
+#: builtin/submodule--helper.c:2781
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "無法�得�模組 '%s' 的版本庫�柄"
 
-#: builtin/submodule--helper.c:2813
+#: builtin/submodule--helper.c:2814
 msgid "recurse into submodules"
 msgstr "在�模組中�迴"
 
-#: builtin/submodule--helper.c:2819
+#: builtin/submodule--helper.c:2820
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<�項>] [<路徑>...]"
 
-#: builtin/submodule--helper.c:2875
+#: builtin/submodule--helper.c:2876
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "檢查寫入 .gitmodules 檔案是�安全"
 
-#: builtin/submodule--helper.c:2878
+#: builtin/submodule--helper.c:2879
 msgid "unset the config in the .gitmodules file"
 msgstr "�消 .gitmodules 檔案中的設定"
 
-#: builtin/submodule--helper.c:2883
+#: builtin/submodule--helper.c:2884
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <�稱> [<值>]"
 
-#: builtin/submodule--helper.c:2884
+#: builtin/submodule--helper.c:2885
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <�稱>"
 
-#: builtin/submodule--helper.c:2885
+#: builtin/submodule--helper.c:2886
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120
-#: builtin/submodule--helper.c:3276
+#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121
+#: builtin/submodule--helper.c:3277
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "請確� .gitmodules 檔案在工作�裡"
 
-#: builtin/submodule--helper.c:2920
+#: builtin/submodule--helper.c:2921
 msgid "suppress output for setting url of a submodule"
 msgstr "隱��模組設定 URL 的輸出"
 
-#: builtin/submodule--helper.c:2924
+#: builtin/submodule--helper.c:2925
 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
 msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
 
-#: builtin/submodule--helper.c:2957
+#: builtin/submodule--helper.c:2958
 msgid "set the default tracking branch to master"
 msgstr "將�設的追蹤分支設為 master"
 
-#: builtin/submodule--helper.c:2959
+#: builtin/submodule--helper.c:2960
 msgid "set the default tracking branch"
 msgstr "設定�設追蹤分支"
 
-#: builtin/submodule--helper.c:2963
+#: builtin/submodule--helper.c:2964
 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
 
-#: builtin/submodule--helper.c:2964
+#: builtin/submodule--helper.c:2965
 msgid ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 msgstr ""
 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
 
-#: builtin/submodule--helper.c:2971
+#: builtin/submodule--helper.c:2972
 msgid "--branch or --default required"
 msgstr "需� --branch 或 --default"
 
-#: builtin/submodule--helper.c:2974
-msgid "--branch and --default are mutually exclusive"
-msgstr "--branch 與 --default 互斥"
-
-#: builtin/submodule--helper.c:3037
+#: builtin/submodule--helper.c:3038
 #, c-format
 msgid "Adding existing repo at '%s' to the index\n"
 msgstr "正在將�於 '%s' 的�有版本庫加入至索引\n"
 
-#: builtin/submodule--helper.c:3040
+#: builtin/submodule--helper.c:3041
 #, c-format
 msgid "'%s' already exists and is not a valid git repo"
 msgstr "「%s�已存在，且�是有效的 git 版本庫"
 
-#: builtin/submodule--helper.c:3053
+#: builtin/submodule--helper.c:3054
 #, c-format
 msgid "A git directory for '%s' is found locally with remote(s):\n"
 msgstr "在本機找到「%s�Git 目錄，與其�應的�端版本庫：\n"
 
-#: builtin/submodule--helper.c:3060
+#: builtin/submodule--helper.c:3061
 #, c-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22889,83 +22771,83 @@ msgstr ""
 "請使用 '--force' �項。如果本機 git 目錄�是正確的版本庫\n"
 "�如您�太懂��，請使用 '--name' �項輸入其他�稱。"
 
-#: builtin/submodule--helper.c:3072
+#: builtin/submodule--helper.c:3073
 #, c-format
 msgid "Reactivating local git directory for submodule '%s'\n"
 msgstr "正在�新啟用「%s��模組的本機 Git 目錄\n"
 
-#: builtin/submodule--helper.c:3109
+#: builtin/submodule--helper.c:3110
 #, c-format
 msgid "unable to checkout submodule '%s'"
 msgstr "無法簽出「%s��模組"
 
-#: builtin/submodule--helper.c:3148
+#: builtin/submodule--helper.c:3149
 #, c-format
 msgid "Failed to add submodule '%s'"
 msgstr "無法加入�模組「%s�"
 
-#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157
-#: builtin/submodule--helper.c:3165
+#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158
+#: builtin/submodule--helper.c:3166
 #, c-format
 msgid "Failed to register submodule '%s'"
 msgstr "無法註冊�模組「%s�"
 
-#: builtin/submodule--helper.c:3221
+#: builtin/submodule--helper.c:3222
 #, c-format
 msgid "'%s' already exists in the index"
 msgstr "「%s�已在索引中"
 
-#: builtin/submodule--helper.c:3224
+#: builtin/submodule--helper.c:3225
 #, c-format
 msgid "'%s' already exists in the index and is not a submodule"
 msgstr "「%s�已在索引中，且�是�模組"
 
-#: builtin/submodule--helper.c:3253
+#: builtin/submodule--helper.c:3254
 msgid "branch of repository to add as submodule"
 msgstr "�加入為�模組的版本庫分支"
 
-#: builtin/submodule--helper.c:3254
+#: builtin/submodule--helper.c:3255
 msgid "allow adding an otherwise ignored submodule path"
 msgstr "�許加入忽略的�模組路徑"
 
-#: builtin/submodule--helper.c:3256
+#: builtin/submodule--helper.c:3257
 msgid "print only error messages"
 msgstr "�輸出錯誤訊�"
 
-#: builtin/submodule--helper.c:3260
+#: builtin/submodule--helper.c:3261
 msgid "borrow the objects from reference repositories"
 msgstr "從引用的版本庫借用物件"
 
-#: builtin/submodule--helper.c:3262
+#: builtin/submodule--helper.c:3263
 msgid ""
 "sets the submodule’s name to the given string instead of defaulting to its "
 "path"
 msgstr "將�模組�稱設定為指定字串，而��設的路徑�稱"
 
-#: builtin/submodule--helper.c:3269
+#: builtin/submodule--helper.c:3270
 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]"
 msgstr "git submodule--helper add [<�項>] [--] <版本庫> [<路徑>]"
 
-#: builtin/submodule--helper.c:3297
+#: builtin/submodule--helper.c:3298
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "�能在工作�的頂級目錄中使用相�路徑"
 
-#: builtin/submodule--helper.c:3305
+#: builtin/submodule--helper.c:3306
 #, c-format
 msgid "repo URL: '%s' must be absolute or begin with ./|../"
 msgstr "版本庫 URL：「%s�必須是絕�路徑，或開頭是 ./|../"
 
-#: builtin/submodule--helper.c:3340
+#: builtin/submodule--helper.c:3341
 #, c-format
 msgid "'%s' is not a valid submodule name"
 msgstr "「%s��是有效的�模組�稱"
 
-#: builtin/submodule--helper.c:3404 git.c:449 git.c:723
+#: builtin/submodule--helper.c:3405 git.c:452 git.c:726
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s �支� --super-prefix"
 
-#: builtin/submodule--helper.c:3410
+#: builtin/submodule--helper.c:3411
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一個有效的 submodule--helper �指令"
@@ -23062,11 +22944,11 @@ msgstr ""
 "  %s\n"
 "以 '%c' 開頭的行將被�留，如果您願�也�以刪除它們。\n"
 
-#: builtin/tag.c:241
+#: builtin/tag.c:240
 msgid "unable to sign the tag"
 msgstr "無法簽署標籤"
 
-#: builtin/tag.c:259
+#: builtin/tag.c:258
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -23079,15 +22961,15 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:275
+#: builtin/tag.c:274
 msgid "bad object type."
 msgstr "壞的物件類型。"
 
-#: builtin/tag.c:326
+#: builtin/tag.c:325
 msgid "no tag message?"
 msgstr "無標籤說明？"
 
-#: builtin/tag.c:333
+#: builtin/tag.c:332
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "標籤說明被�留在 %s\n"
@@ -23168,45 +23050,22 @@ msgstr "�列�尚未�併的標籤"
 msgid "print only tags of the object"
 msgstr "�列�指�該物件的標籤"
 
-#: builtin/tag.c:525
-msgid "--column and -n are incompatible"
-msgstr "--column 和 -n �相容"
-
-#: builtin/tag.c:546
-msgid "-n option is only allowed in list mode"
-msgstr "-n �項��許用在列表顯示模�"
-
-#: builtin/tag.c:548
-msgid "--contains option is only allowed in list mode"
-msgstr "--contains �項��許用在列表顯示模�"
-
-#: builtin/tag.c:550
-msgid "--no-contains option is only allowed in list mode"
-msgstr "--no-contains �項��許用在列表顯示模�"
-
-#: builtin/tag.c:552
-msgid "--points-at option is only allowed in list mode"
-msgstr "--points-at �項��許用在列表顯示模�"
-
-#: builtin/tag.c:554
-msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "--merged 和 --no-merged �項��許用在列表顯示模�"
-
-#: builtin/tag.c:568
-msgid "only one -F or -m option is allowed."
-msgstr "��許一個 -F 或 -m �項。"
+#: builtin/tag.c:558
+#, c-format
+msgid "the '%s' option is only allowed in list mode"
+msgstr "「%s��項�能在列表顯示模�使用"
 
-#: builtin/tag.c:593
+#: builtin/tag.c:597
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一個有效的標籤�稱。"
 
-#: builtin/tag.c:598
+#: builtin/tag.c:602
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "標籤 '%s' 已存在"
 
-#: builtin/tag.c:629
+#: builtin/tag.c:633
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新標籤 '%s'（曾為 %s）\n"
@@ -23623,130 +23482,118 @@ msgstr "�能建立目錄 '%s'"
 msgid "initializing"
 msgstr "正在�始化"
 
-#: builtin/worktree.c:421 builtin/worktree.c:427
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "準備工作�（新分支 '%s'）"
 
-#: builtin/worktree.c:423
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "準備工作�（�設分支 '%s'，之�為 %s）"
 
-#: builtin/worktree.c:432
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "準備工作�（簽出 '%s'）"
 
-#: builtin/worktree.c:438
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "準備工作�（分離開頭指標 %s）"
 
-#: builtin/worktree.c:483
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "簽出 <分支>，�使已經被簽出到其它工作�"
 
-#: builtin/worktree.c:486
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "建立一個新分支"
 
-#: builtin/worktree.c:488
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "建立或�設一個分支"
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "生�新的工作�"
 
-#: builtin/worktree.c:491
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "鎖定新工作�"
 
-#: builtin/worktree.c:493 builtin/worktree.c:730
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
 msgstr "鎖定原因"
 
-#: builtin/worktree.c:496
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "設定追蹤模�（�見 git-branch(1)）"
 
-#: builtin/worktree.c:499
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "嘗試為新分支�符�一個�端追蹤分支"
 
-#: builtin/worktree.c:507
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b�-B 和 --detach 是互斥的"
-
-#: builtin/worktree.c:509
-msgid "--reason requires --lock"
-msgstr "--reason 需� --lock"
-
-#: builtin/worktree.c:513
+#: builtin/worktree.c:512
 msgid "added with --lock"
 msgstr "已使用 --lock 加入"
 
-#: builtin/worktree.c:575
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "�能在建立新分支時使用 --[no-]track �項"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:691
 msgid "show extended annotations and reasons, if available"
 msgstr "如果有則顯示延伸的註釋和原因"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:693
 msgid "add 'prunable' annotation to worktrees older than <time>"
 msgstr "�舊於 <時間> 的工作�加上 ‘prunable’ 標示"
 
-#: builtin/worktree.c:703
-msgid "--verbose and --porcelain are mutually exclusive"
-msgstr "--verbose 和 --porcelain 互斥"
-
-#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849
-#: builtin/worktree.c:973
+#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848
+#: builtin/worktree.c:972
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' �是一個工作�"
 
-#: builtin/worktree.c:744 builtin/worktree.c:777
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作�無法被加鎖或解鎖"
 
-#: builtin/worktree.c:749
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被鎖定，原因：%s"
 
-#: builtin/worktree.c:751
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被鎖定"
 
-#: builtin/worktree.c:779
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被鎖定"
 
-#: builtin/worktree.c:820
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "�能移動或刪除包��模組的工作�"
 
-#: builtin/worktree.c:828
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "強制移動，�使工作�是髒的或已鎖定"
 
-#: builtin/worktree.c:851 builtin/worktree.c:975
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一個主工作�"
 
-#: builtin/worktree.c:856
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "無法從 '%s' 算出目的地�稱"
 
-#: builtin/worktree.c:869
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -23755,7 +23602,7 @@ msgstr ""
 "無法移動一個鎖定的工作�，鎖定原因：%s\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -23763,36 +23610,36 @@ msgstr ""
 "無法移動一個鎖定的工作�，\n"
 "使用 'move -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:874
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "驗證失敗，無法移動工作�：%s"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移動 '%s' 到 '%s' 失敗"
 
-#: builtin/worktree.c:925
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中執行 'git status' 失敗"
 
-#: builtin/worktree.c:929
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包�修改或未追蹤的檔案，使用 --force 刪除"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
 
-#: builtin/worktree.c:957
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "強制刪除，�使工作�是髒的或已鎖定"
 
-#: builtin/worktree.c:980
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -23801,7 +23648,7 @@ msgstr ""
 "無法刪除一個鎖定的工作�，鎖定原因：%s\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:982
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -23809,17 +23656,17 @@ msgstr ""
 "無法刪除一個鎖定的工作�，\n"
 "使用 'remove -f -f' 覆蓋或先解鎖"
 
-#: builtin/worktree.c:985
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "驗證失敗，無法刪除工作�：%s"
 
-#: builtin/worktree.c:1009
+#: builtin/worktree.c:1008
 #, c-format
 msgid "repair: %s: %s"
 msgstr "修復：%s：%s"
 
-#: builtin/worktree.c:1012
+#: builtin/worktree.c:1011
 #, c-format
 msgid "error: %s: %s"
 msgstr "錯誤：%s：%s"
@@ -23870,21 +23717,16 @@ msgstr ""
 "說明。\n"
 "有關系統概述，檢視 'git help git'。"
 
-#: git.c:188
+#: git.c:188 git.c:216 git.c:300
 #, c-format
-msgid "no directory given for --git-dir\n"
-msgstr "沒有為 --git-dir �供目錄\n"
+msgid "no directory given for '%s' option\n"
+msgstr "未傳入目錄至「%s��項\n"
 
 #: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "沒有為 --namespace �供命�空間\n"
 
-#: git.c:216
-#, c-format
-msgid "no directory given for --work-tree\n"
-msgstr "沒有為 --work-tree �供目錄\n"
-
 #: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
@@ -23900,11 +23742,6 @@ msgstr "應為 -c �供一個設定字串\n"
 msgid "no config key given for --config-env\n"
 msgstr "未傳入設定�至 --config-env\n"
 
-#: git.c:300
-#, c-format
-msgid "no directory given for -C\n"
-msgstr "沒有為 -C �供目錄\n"
-
 #: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
@@ -23934,29 +23771,29 @@ msgstr "%s 的空別�"
 msgid "recursive alias: %s"
 msgstr "�迴的別�：%s"
 
-#: git.c:476
+#: git.c:479
 msgid "write failure on standard output"
 msgstr "在標準輸出寫入失敗"
 
-#: git.c:478
+#: git.c:481
 msgid "unknown write failure on standard output"
 msgstr "到標準輸出的未知寫入錯誤"
 
-#: git.c:480
+#: git.c:483
 msgid "close failed on standard output"
 msgstr "標準輸出關閉失敗"
 
-#: git.c:832
+#: git.c:835
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "�測到別�循環：展開後的「%s�無窮無盡：%s"
 
-#: git.c:882
+#: git.c:885
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "�能作為內建指令處� %s"
 
-#: git.c:895
+#: git.c:898
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -23965,33 +23802,25 @@ msgstr ""
 "用法：%s\n"
 "\n"
 
-#: git.c:915
+#: git.c:918
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "展開別�指令 '%s' 失敗，'%s' �是一個 git 指令\n"
 
-#: git.c:927
+#: git.c:930
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "執行指令 '%s' 失敗：%s\n"
 
-#: http-fetch.c:118
+#: http-fetch.c:128
 #, c-format
 msgid "argument to --packfile must be a valid hash (got '%s')"
 msgstr "傳入 --packfile 的�數必須是有效的雜湊 (收到 '%s')"
 
-#: http-fetch.c:128
+#: http-fetch.c:138
 msgid "not a git repository"
 msgstr "�是一個 git 版本庫"
 
-#: http-fetch.c:134
-msgid "--packfile requires --index-pack-args"
-msgstr "--packfile 需� --index-pack-args"
-
-#: http-fetch.c:143
-msgid "--index-pack-args can only be used with --packfile"
-msgstr "--index-pack-args �能與 --packfile 一起使用"
-
 #: t/helper/test-fast-rebase.c:141
 msgid "unhandled options"
 msgstr "未處��項"
@@ -24269,6 +24098,175 @@ msgstr "remote-curl：嘗試沒有本機版本庫下�得"
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl：未知的來自 git 的指令 '%s'"
 
+#: contrib/scalar/scalar.c:49
+msgid "need a working directory"
+msgstr "需�工作目錄"
+
+#: contrib/scalar/scalar.c:86
+msgid "could not find enlistment root"
+msgstr "找�到編列�單的根目錄"
+
+#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351
+#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579
+#, c-format
+msgid "could not switch to '%s'"
+msgstr "無法切�至「%s�"
+
+#: contrib/scalar/scalar.c:180
+#, c-format
+msgid "could not configure %s=%s"
+msgstr "無法設定 %s=%s"
+
+#: contrib/scalar/scalar.c:198
+msgid "could not configure log.excludeDecoration"
+msgstr "無法設定 log.excludeDecoration"
+
+#: contrib/scalar/scalar.c:219
+msgid "Scalar enlistments require a worktree"
+msgstr "純�編列�單需�工作目錄"
+
+#: contrib/scalar/scalar.c:311
+#, c-format
+msgid "remote HEAD is not a branch: '%.*s'"
+msgstr "�端 HEAD �是分支：「%.*s�"
+
+#: contrib/scalar/scalar.c:317
+msgid "failed to get default branch name from remote; using local default"
+msgstr "無法從�端�得�設分支�稱。改用本機�設�稱"
+
+#: contrib/scalar/scalar.c:330
+msgid "failed to get default branch name"
+msgstr "無法�得�設分支�稱"
+
+#: contrib/scalar/scalar.c:341
+msgid "failed to unregister repository"
+msgstr "無法�消註冊版本庫"
+
+#: contrib/scalar/scalar.c:356
+msgid "failed to delete enlistment directory"
+msgstr "無法刪除編列�單目錄"
+
+#: contrib/scalar/scalar.c:376
+msgid "branch to checkout after clone"
+msgstr "複製後�簽出的分支"
+
+#: contrib/scalar/scalar.c:378
+msgid "when cloning, create full working directory"
+msgstr "複製時建立完整的工作目錄"
+
+#: contrib/scalar/scalar.c:380
+msgid "only download metadata for the branch that will be checked out"
+msgstr "�下載會簽出的分支中介資料"
+
+#: contrib/scalar/scalar.c:385
+msgid "scalar clone [<options>] [--] <repo> [<dir>]"
+msgstr "scalar clone [<options>] [--] <repo> [<dir>]"
+
+#: contrib/scalar/scalar.c:410
+#, c-format
+msgid "cannot deduce worktree name from '%s'"
+msgstr "無法從「%s�推論工作��稱"
+
+#: contrib/scalar/scalar.c:419
+#, c-format
+msgid "directory '%s' exists already"
+msgstr "「%s�目錄已經存在"
+
+#: contrib/scalar/scalar.c:446
+#, c-format
+msgid "failed to get default branch for '%s'"
+msgstr "無法�得「%s�的�設分支"
+
+#: contrib/scalar/scalar.c:457
+#, c-format
+msgid "could not configure remote in '%s'"
+msgstr "無法設定「%s�中的�端"
+
+#: contrib/scalar/scalar.c:466
+#, c-format
+msgid "could not configure '%s'"
+msgstr "無法設定「%s�"
+
+#: contrib/scalar/scalar.c:469
+msgid "partial clone failed; attempting full clone"
+msgstr "部分複製失敗。嘗試完整複製"
+
+#: contrib/scalar/scalar.c:473
+msgid "could not configure for full clone"
+msgstr "無法設定完整複製"
+
+#: contrib/scalar/scalar.c:505
+msgid "`scalar list` does not take arguments"
+msgstr "`scalar list` 未�引數"
+
+#: contrib/scalar/scalar.c:518
+msgid "scalar register [<enlistment>]"
+msgstr "scalar register [<enlistment>]"
+
+#: contrib/scalar/scalar.c:545
+msgid "reconfigure all registered enlistments"
+msgstr "�新設定所有註冊的編列�單"
+
+#: contrib/scalar/scalar.c:549
+msgid "scalar reconfigure [--all | <enlistment>]"
+msgstr "scalar reconfigure [--all | <enlistment>]"
+
+#: contrib/scalar/scalar.c:567
+msgid "--all or <enlistment>, but not both"
+msgstr "--all 或 <enlistment> 但�能傳入兩者"
+
+#: contrib/scalar/scalar.c:582
+#, c-format
+msgid "git repository gone in '%s'"
+msgstr "git 版本庫在「%s��失"
+
+#: contrib/scalar/scalar.c:622
+msgid ""
+"scalar run <task> [<enlistment>]\n"
+"Tasks:\n"
+msgstr ""
+"scalar run <task> [<enlistment>]\n"
+"作業：\n"
+
+#: contrib/scalar/scalar.c:640
+#, c-format
+msgid "no such task: '%s'"
+msgstr "無此作業：「%s�"
+
+#: contrib/scalar/scalar.c:690
+msgid "scalar unregister [<enlistment>]"
+msgstr "scalar unregister [<enlistment>]"
+
+#: contrib/scalar/scalar.c:737
+msgid "scalar delete <enlistment>"
+msgstr "scalar delete <enlistment>"
+
+#: contrib/scalar/scalar.c:752
+msgid "refusing to delete current working directory"
+msgstr "拒絕刪除目�工作目錄"
+
+#: contrib/scalar/scalar.c:767
+msgid "include Git version"
+msgstr "包� Git 版本"
+
+#: contrib/scalar/scalar.c:769
+msgid "include Git's build options"
+msgstr "包� Git 組建�項"
+
+#: contrib/scalar/scalar.c:773
+msgid "scalar verbose [-v | --verbose] [--build-options]"
+msgstr "scalar verbose [-v | --verbose] [--build-options]"
+
+#: contrib/scalar/scalar.c:821
+msgid ""
+"scalar <command> [<options>]\n"
+"\n"
+"Commands:\n"
+msgstr ""
+"scalar <command> [<options>]\n"
+"\n"
+"命令：\n"
+
 #: compat/compiler.h:26
 msgid "no compiler information available\n"
 msgstr "沒有�用的編譯器資訊\n"
@@ -24293,36 +24291,36 @@ msgstr "到期時間"
 msgid "no-op (backward compatibility)"
 msgstr "空動作（�後相容）"
 
-#: parse-options.h:308
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "更加詳細"
 
-#: parse-options.h:310
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "更加安�"
 
-#: parse-options.h:316
+#: parse-options.h:318
 msgid "use <n> digits to display object names"
 msgstr "用 <n> �數字顯示物件�稱"
 
-#: parse-options.h:335
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "設定如何刪除�交說明裡的空格和 #備註"
 
-#: parse-options.h:336
+#: parse-options.h:338
 msgid "read pathspec from file"
 msgstr "從檔案讀� <路徑�格>"
 
-#: parse-options.h:337
+#: parse-options.h:339
 msgid ""
 "with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr "如使用 --pathspec-from-file，則 <路徑�格> 元件會使用 NUL 字元分隔"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "key"
 msgstr "key"
 
-#: ref-filter.h:101
+#: ref-filter.h:98
 msgid "field name to sort on"
 msgstr "排�的欄��"
 
@@ -24391,17 +24389,17 @@ msgid "Show canonical names and email addresses of contacts"
 msgstr "顯示�絡人的�範�稱和電�信件"
 
 #: command-list.h:65
+msgid "Ensures that a reference name is well formed"
+msgstr "確�引用�稱格�正確"
+
+#: command-list.h:66
 msgid "Switch branches or restore working tree files"
 msgstr "切�分支或復原工作�檔案"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Copy files from the index to the working tree"
 msgstr "從索引複製檔案到工作�"
 
-#: command-list.h:67
-msgid "Ensures that a reference name is well formed"
-msgstr "確�引用�稱格�正確"
-
 #: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "尋找尚未套用到上游的�交"
@@ -24595,413 +24593,413 @@ msgid "Add or parse structured information in commit messages"
 msgstr "新增或解��交說明中的�構化訊�"
 
 #: command-list.h:116
-msgid "The Git repository browser"
-msgstr "Git 版本庫�覽器"
-
-#: command-list.h:117
 msgid "Show commit logs"
 msgstr "顯示�交日誌"
 
-#: command-list.h:118
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "顯示索引和工作�中檔案的訊�"
 
-#: command-list.h:119
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "顯示一個�端版本庫的引用"
 
-#: command-list.h:120
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "顯示一個樹狀物件的內容"
 
-#: command-list.h:121
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "從單個電�信件中擷�修補檔和作者身份"
 
-#: command-list.h:122
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "簡單的 UNIX mbox 信箱切分程�"
 
-#: command-list.h:123
+#: command-list.h:122
 msgid "Run tasks to optimize Git repository data"
 msgstr "執行用來最佳化 Git 版本庫資料的作業"
 
-#: command-list.h:124
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "�併兩個或更多開發歷�"
 
-#: command-list.h:125
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "為了�併尋找儘�能好的公共祖先�交"
 
-#: command-list.h:126
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "執行一個三路檔案�併"
 
-#: command-list.h:127
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "�於需��併的檔案執行�併"
 
-#: command-list.h:128
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "與 git-merge-index 一起使用的標準嚮導程�"
 
+#: command-list.h:128
+msgid "Show three-way merge without touching index"
+msgstr "顯示三路�併而�動索引"
+
 #: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "執行�併��解決工具以解決�併��"
 
 #: command-list.h:130
-msgid "Show three-way merge without touching index"
-msgstr "顯示三路�併而�動索引"
-
-#: command-list.h:131
-msgid "Write and verify multi-pack-indexes"
-msgstr "寫入和驗證多包索引"
-
-#: command-list.h:132
 msgid "Creates a tag object with extra validation"
 msgstr "建立有�外驗證的標籤物件"
 
-#: command-list.h:133
+#: command-list.h:131
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "基於 ls-tree 的格�化文字建立一個樹狀物件"
 
-#: command-list.h:134
+#: command-list.h:132
+msgid "Write and verify multi-pack-indexes"
+msgstr "寫入和驗證多包索引"
+
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移動或�新命�一個檔案�目錄或符號連�"
 
 # 尋找�供版本的符號�稱
-#: command-list.h:135
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "尋找�供版本的符號�稱"
 
-#: command-list.h:136
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "新增或檢查物件備註"
 
-#: command-list.h:137
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "匯入和�交到 Perforce 版本庫中"
 
-#: command-list.h:138
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "建立物件的存檔包"
 
-#: command-list.h:139
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "尋找冗餘的包檔案"
 
-#: command-list.h:140
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "打包頭和標籤以實�高效的版本庫存�"
 
-#: command-list.h:141
+#: command-list.h:140
 msgid "Compute unique ID for a patch"
 msgstr "計算一個修補檔的唯一 ID"
 
-#: command-list.h:142
+#: command-list.h:141
 msgid "Prune all unreachable objects from the object database"
 msgstr "刪除物件庫中所有無法�得物件"
 
-#: command-list.h:143
+#: command-list.h:142
 msgid "Remove extra objects that are already in pack files"
 msgstr "刪除已經在包檔案中的多餘物件"
 
-#: command-list.h:144
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "�得並整��外的版本庫或一個本機分支"
 
-#: command-list.h:145
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "更新�端引用和相關的物件"
 
-#: command-list.h:146
+#: command-list.h:145
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "將一個 quilt 修補檔集�套用到目�分支"
 
-#: command-list.h:147
+#: command-list.h:146
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "比較兩個�交範�（如一個分支的兩個版本）"
 
-#: command-list.h:148
+#: command-list.h:147
 msgid "Reads tree information into the index"
 msgstr "將樹訊�讀�到索引"
 
-#: command-list.h:149
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "在�一個分支上�新套用�交"
 
-#: command-list.h:150
+#: command-list.h:149
 msgid "Receive what is pushed into the repository"
 msgstr "接收推�到版本庫中的物件"
 
-#: command-list.h:151
+#: command-list.h:150
 msgid "Manage reflog information"
 msgstr "管� reflog 訊�"
 
-#: command-list.h:152
+#: command-list.h:151
 msgid "Manage set of tracked repositories"
 msgstr "管�已追蹤版本庫"
 
-#: command-list.h:153
+#: command-list.h:152
 msgid "Pack unpacked objects in a repository"
 msgstr "打包版本庫中未打包物件"
 
-#: command-list.h:154
+#: command-list.h:153
 msgid "Create, list, delete refs to replace objects"
 msgstr "建立�列出�刪除物件�代引用"
 
-#: command-list.h:155
+#: command-list.h:154
 msgid "Generates a summary of pending changes"
 msgstr "生�待定更改的摘�"
 
-#: command-list.h:156
+#: command-list.h:155
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "�用���併的解決方案記錄"
 
-#: command-list.h:157
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "�設目� HEAD 到指定狀態"
 
-#: command-list.h:158
+#: command-list.h:157
 msgid "Restore working tree files"
 msgstr "復原工作�檔案"
 
-#: command-list.h:159
-msgid "Revert some existing commits"
-msgstr "還原一些�存�交"
-
-#: command-list.h:160
+#: command-list.h:158
 msgid "Lists commit objects in reverse chronological order"
 msgstr "按時間順�列出�交物件"
 
-#: command-list.h:161
+#: command-list.h:159
 msgid "Pick out and massage parameters"
 msgstr "�出並處��數"
 
-#: command-list.h:162
+#: command-list.h:160
+msgid "Revert some existing commits"
+msgstr "還原一些�存�交"
+
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "從工作�和索引中刪除檔案"
 
-#: command-list.h:163
+#: command-list.h:162
 msgid "Send a collection of patches as emails"
 msgstr "��電�信件傳�一組修補檔"
 
-#: command-list.h:164
+#: command-list.h:163
 msgid "Push objects over Git protocol to another repository"
 msgstr "使用 Git �定推�物件到�一個版本庫"
 
+#: command-list.h:164
+msgid "Git's i18n setup code for shell scripts"
+msgstr "為 shell 腳本準備的 Git 國際化設定程�碼"
+
 #: command-list.h:165
+msgid "Common Git shell script setup code"
+msgstr "常用的 Git shell 腳本設定程�碼"
+
+#: command-list.h:166
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "��許 Git SSH 存�的��登入shell"
 
-#: command-list.h:166
+#: command-list.h:167
 msgid "Summarize 'git log' output"
 msgstr "'git log' 輸出摘�"
 
-#: command-list.h:167
+#: command-list.h:168
 msgid "Show various types of objects"
 msgstr "顯示�種類型的物件"
 
-#: command-list.h:168
+#: command-list.h:169
 msgid "Show branches and their commits"
 msgstr "顯示分支和�交"
 
-#: command-list.h:169
+#: command-list.h:170
 msgid "Show packed archive index"
 msgstr "顯示打包歸檔索引"
 
-#: command-list.h:170
+#: command-list.h:171
 msgid "List references in a local repository"
 msgstr "顯示本機版本庫中的引用"
 
-#: command-list.h:171
-msgid "Git's i18n setup code for shell scripts"
-msgstr "為 shell 腳本準備的 Git 國際化設定程�碼"
-
 #: command-list.h:172
-msgid "Common Git shell script setup code"
-msgstr "常用的 Git shell 腳本設定程�碼"
-
-#: command-list.h:173
 msgid "Initialize and modify the sparse-checkout"
 msgstr "�始化並修改稀�簽出"
 
+#: command-list.h:173
+msgid "Add file contents to the staging area"
+msgstr "將檔案內容新增到索引"
+
 #: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "儲�髒工作�中的修改"
 
 #: command-list.h:175
-msgid "Add file contents to the staging area"
-msgstr "將檔案內容新增到索引"
-
-#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "顯示工作�狀態"
 
-#: command-list.h:177
+#: command-list.h:176
 msgid "Remove unnecessary whitespace"
 msgstr "刪除�必�的空白字元"
 
-#: command-list.h:178
+#: command-list.h:177
 msgid "Initialize, update or inspect submodules"
 msgstr "�始化�更新或檢查�模組"
 
-#: command-list.h:179
+#: command-list.h:178
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subversion 版本庫和 Git 之間的雙�動作"
 
-#: command-list.h:180
+#: command-list.h:179
 msgid "Switch branches"
 msgstr "切�分支"
 
-#: command-list.h:181
+#: command-list.h:180
 msgid "Read, modify and delete symbolic refs"
 msgstr "讀��修改和刪除符號引用"
 
-#: command-list.h:182
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "建立�列出�刪除或驗證一個 GPG 簽�的標籤物件"
 
-#: command-list.h:183
+#: command-list.h:182
 msgid "Creates a temporary file with a blob's contents"
 msgstr "用資料物件的內容建立暫存檔"
 
-#: command-list.h:184
+#: command-list.h:183
 msgid "Unpack objects from a packed archive"
 msgstr "從打包檔案中解壓縮物件"
 
-#: command-list.h:185
+#: command-list.h:184
 msgid "Register file contents in the working tree to the index"
 msgstr "將工作�的檔案內容註冊到索引"
 
-#: command-list.h:186
+#: command-list.h:185
 msgid "Update the object name stored in a ref safely"
 msgstr "安全地更新儲存於引用中的物件�稱"
 
-#: command-list.h:187
+#: command-list.h:186
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "更新輔助訊�檔案以�助啞�定�務"
 
-#: command-list.h:188
+#: command-list.h:187
 msgid "Send archive back to git-archive"
 msgstr "將存檔傳�回 git-archive"
 
-#: command-list.h:189
+#: command-list.h:188
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "將物件壓縮包傳�回 git-fetch-pack"
 
-#: command-list.h:190
+#: command-list.h:189
 msgid "Show a Git logical variable"
 msgstr "顯示 Git �輯變數"
 
-#: command-list.h:191
+#: command-list.h:190
 msgid "Check the GPG signature of commits"
 msgstr "檢查 GPG �交簽�"
 
-#: command-list.h:192
+#: command-list.h:191
 msgid "Validate packed Git archive files"
 msgstr "驗證打包的 Git �存檔案"
 
-#: command-list.h:193
+#: command-list.h:192
 msgid "Check the GPG signature of tags"
 msgstr "檢查標籤的 GPG 簽�"
 
-#: command-list.h:194
-msgid "Git web interface (web frontend to Git repositories)"
-msgstr "Git web 介�（Git 版本庫的 web �端）"
-
-#: command-list.h:195
+#: command-list.h:193
 msgid "Show logs with difference each commit introduces"
 msgstr "顯示�一個�交引入的差異日誌"
 
-#: command-list.h:196
+#: command-list.h:194
 msgid "Manage multiple working trees"
 msgstr "管�多個工作�"
 
-#: command-list.h:197
+#: command-list.h:195
 msgid "Create a tree object from the current index"
 msgstr "從目�索引建立一個樹狀物件"
 
-#: command-list.h:198
+#: command-list.h:196
 msgid "Defining attributes per path"
 msgstr "定義路徑的屬性"
 
-#: command-list.h:199
+#: command-list.h:197
 msgid "Git command-line interface and conventions"
 msgstr "Git 指令列介�和約定"
 
-#: command-list.h:200
+#: command-list.h:198
 msgid "A Git core tutorial for developers"
 msgstr "��開發人員的 Git 核心教學"
 
-#: command-list.h:201
+#: command-list.h:199
 msgid "Providing usernames and passwords to Git"
 msgstr "將使用者�稱�密碼�供給 Git"
 
-#: command-list.h:202
+#: command-list.h:200
 msgid "Git for CVS users"
 msgstr "�� CVS 使用者的 Git �助"
 
-#: command-list.h:203
+#: command-list.h:201
 msgid "Tweaking diff output"
 msgstr "調整差異輸出"
 
-#: command-list.h:204
+#: command-list.h:202
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "�一天 Git 的一組有用的最�指令集�"
 
-#: command-list.h:205
+#: command-list.h:203
 msgid "Frequently asked questions about using Git"
 msgstr "Git 使用的常見�題"
 
-#: command-list.h:206
+#: command-list.h:204
 msgid "A Git Glossary"
 msgstr "Git 詞彙表"
 
-#: command-list.h:207
+#: command-list.h:205
 msgid "Hooks used by Git"
 msgstr "Git 使用的掛鉤"
 
-#: command-list.h:208
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未追蹤檔案"
 
-#: command-list.h:209
+#: command-list.h:207
+msgid "The Git repository browser"
+msgstr "Git 版本庫�覽器"
+
+#: command-list.h:208
 msgid "Map author/committer names and/or E-Mail addresses"
 msgstr "映射作者或�交者的�稱和（或）電�信箱地�"
 
-#: command-list.h:210
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "定義�模組屬性"
 
-#: command-list.h:211
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Git �字空間"
 
-#: command-list.h:212
+#: command-list.h:211
 msgid "Helper programs to interact with remote repositories"
 msgstr "用來與�端版本庫互動的�助工具"
 
-#: command-list.h:213
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Git 版本庫�置"
 
-#: command-list.h:214
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本範�"
 
-#: command-list.h:215
+#: command-list.h:214
 msgid "Mounting one repository inside another"
 msgstr "在�個版本庫掛載�個版本庫"
 
+#: command-list.h:215
+msgid "A tutorial introduction to Git"
+msgstr "一個 Git 教學"
+
 #: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "一個 Git 教學：第二部分"
 
 #: command-list.h:217
-msgid "A tutorial introduction to Git"
-msgstr "一個 Git 教學"
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Git web 介�（Git 版本庫的 web �端）"
 
 #: command-list.h:218
 msgid "An overview of recommended workflows with Git"
@@ -25072,39 +25070,39 @@ msgstr "無法�迴進�模組路徑 '$displaypath'"
 msgid "usage: $dashless $USAGE"
 msgstr "用法：$dashless $USAGE"
 
-#: git-sh-setup.sh:191
+#: git-sh-setup.sh:183
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
 msgstr "�能切�目錄到 $cdup，工作�的頂級目錄"
 
-#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#: git-sh-setup.sh:192 git-sh-setup.sh:199
 #, sh-format
 msgid "fatal: $program_name cannot be used without a working tree."
 msgstr "致命錯誤：$program_name �能在沒有工作�的情�下使用。"
 
-#: git-sh-setup.sh:221
+#: git-sh-setup.sh:213
 msgid "Cannot rewrite branches: You have unstaged changes."
 msgstr "�能�寫分支：您有未暫存的變更。"
 
-#: git-sh-setup.sh:224
+#: git-sh-setup.sh:216
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr "�能 $action：您有未暫存的變更。"
 
-#: git-sh-setup.sh:235
+#: git-sh-setup.sh:227
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr "�能 $action：您的索引中包�未�交的變更。"
 
-#: git-sh-setup.sh:237
+#: git-sh-setup.sh:229
 msgid "Additionally, your index contains uncommitted changes."
 msgstr "而且您的索引中包�未�交的變更。"
 
-#: git-sh-setup.sh:357
+#: git-sh-setup.sh:349
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr "您需�在工作�的頂級目錄中執行這個指令。"
 
-#: git-sh-setup.sh:362
+#: git-sh-setup.sh:354
 msgid "Unable to determine absolute path of git directory"
 msgstr "�能確定 git 目錄的絕�路徑"
 
@@ -25175,7 +25173,7 @@ msgstr ""
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "無法讀��塊編輯檔案：%s"
 
-#: git-add--interactive.perl:1251
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -25189,7 +25187,7 @@ msgstr ""
 "a - 暫存此�塊和本檔案中後�的全部�塊\n"
 "d - �暫存此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1257
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -25203,7 +25201,7 @@ msgstr ""
 "a - 儲�此�塊和本檔案中後�的全部�塊\n"
 "d - �儲�此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -25217,7 +25215,7 @@ msgstr ""
 "a - �暫存此�塊和本檔案中後�的全部�塊\n"
 "d - ���暫存此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1269
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -25231,7 +25229,7 @@ msgstr ""
 "a - 套用此�塊和本檔案中後�的全部�塊\n"
 "d - ��套用此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -25245,7 +25243,7 @@ msgstr ""
 "a - �棄此�塊和本檔案中後�的全部�塊\n"
 "d - ���棄此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1281
+#: git-add--interactive.perl:1283
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -25259,7 +25257,7 @@ msgstr ""
 "a - �棄此�塊和本檔案中後�的全部�塊\n"
 "d - ���棄此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1287
+#: git-add--interactive.perl:1289
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -25273,7 +25271,7 @@ msgstr ""
 "a - 套用此�塊和本檔案中後�的全部�塊\n"
 "d - ��套用此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1299
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -25287,7 +25285,7 @@ msgstr ""
 "a - 套用此�塊和本檔案中後�的全部�塊\n"
 "d - ��套用此�塊和本檔案中後�的全部�塊"
 
-#: git-add--interactive.perl:1314
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -25309,88 +25307,88 @@ msgstr ""
 "e - 手動編輯目��塊\n"
 "? - 顯示說明\n"
 
-#: git-add--interactive.perl:1345
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "���塊�能套用到索引�\n"
 
-#: git-add--interactive.perl:1360
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未套用的：%s\n"
 
-#: git-add--interactive.perl:1479
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "將模�變更套用到工作� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1480
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "將刪除變更套用到工作� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1481
+#: git-add--interactive.perl:1483
 #, perl-format
 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr "將新增變更套用到工作� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1482
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "將此�塊套用到工作� [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1599
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "沒有其它�供跳轉的�塊\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "無效數字：'%s'\n"
 
-#: git-add--interactive.perl:1622
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "��起，�有 %d 個�用�塊。\n"
 
-#: git-add--interactive.perl:1657
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "沒有其它�供尋找的�塊\n"
 
-#: git-add--interactive.perl:1674
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "錯誤的常�表示� %s：%s\n"
 
-#: git-add--interactive.perl:1684
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "沒有和�供模�相符�的�塊\n"
 
-#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "沒有上一個�塊\n"
 
-#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "沒有下一個�塊\n"
 
-#: git-add--interactive.perl:1730
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "��起，�能分割這個�塊\n"
 
-#: git-add--interactive.perl:1736
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "分割為 %d 塊。\n"
 
-#: git-add--interactive.perl:1746
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "��起，�能編輯這個�塊\n"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1811
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -25407,56 +25405,56 @@ msgstr ""
 "diff          - 顯示 HEAD 和索引間差異\n"
 "add untracked - 新增未追蹤檔案的內容至暫存列表\n"
 
-#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
-#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
-#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
-#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1842
+#: git-add--interactive.perl:1845 git-add--interactive.perl:1852
+#: git-add--interactive.perl:1855 git-add--interactive.perl:1862
+#: git-add--interactive.perl:1866 git-add--interactive.perl:1872
 msgid "missing --"
 msgstr "缺少 --"
 
-#: git-add--interactive.perl:1866
+#: git-add--interactive.perl:1868
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模�：%s"
 
-#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#: git-add--interactive.perl:1874 git-add--interactive.perl:1880
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "無效的�數 %s，期望是 --"
 
-#: git-send-email.perl:129
+#: git-send-email.perl:159
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr "本機時間和 GMT 有�到一分�間隔\n"
 
-#: git-send-email.perl:136 git-send-email.perl:142
+#: git-send-email.perl:166 git-send-email.perl:172
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本機時間�移�大於等於 24 �時\n"
 
-#: git-send-email.perl:214
+#: git-send-email.perl:244
 #, perl-format
 msgid "fatal: command '%s' died with exit code %d"
 msgstr "致命錯誤：命令「%s�中止，��碼：%d"
 
-#: git-send-email.perl:227
+#: git-send-email.perl:257
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "編輯器�正常離開，終止所有動作"
 
-#: git-send-email.perl:316
+#: git-send-email.perl:346
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包�您正在編寫的一個中間版本的信件。\n"
 
-#: git-send-email.perl:321
+#: git-send-email.perl:351
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�編輯的信件。\n"
 
-#: git-send-email.perl:450
+#: git-send-email.perl:484
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它�項�相容\n"
 
-#: git-send-email.perl:525
+#: git-send-email.perl:561
 msgid ""
 "fatal: found configuration options for 'sendmail'\n"
 "git-send-email is configured with the sendemail.* options - note the 'e'.\n"
@@ -25466,47 +25464,47 @@ msgstr ""
 "git-send-email 已經以 sendemail.* �項設定 - 注�裡�的 'e'。\n"
 "請將 sendemail.forbidSendmailVariables 設為 false �用此檢查。\n"
 
-#: git-send-email.perl:530 git-send-email.perl:746
+#: git-send-email.perl:566 git-send-email.perl:782
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�能在版本庫之外執行 git format-patch\n"
 
-#: git-send-email.perl:533
+#: git-send-email.perl:569
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr "`batch-size` 和 `relogin` 必須�時定義（��指令列或者設定�項）\n"
 
-#: git-send-email.perl:546
+#: git-send-email.perl:582
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 欄�：'%s'\n"
 
-#: git-send-email.perl:577
+#: git-send-email.perl:613
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 設定：'%s'\n"
 
-#: git-send-email.perl:617
+#: git-send-email.perl:653
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：�支�帶引號的 sendmail 別�：%s\n"
 
-#: git-send-email.perl:619
+#: git-send-email.perl:655
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:621
+#: git-send-email.perl:657
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：�支� `/file` 或 `|pipe` �定�：%s\n"
 
-#: git-send-email.perl:626
+#: git-send-email.perl:662
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能識別的 sendmail 行：%s\n"
 
-#: git-send-email.perl:711
+#: git-send-email.perl:747
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -25521,12 +25519,12 @@ msgstr ""
 "    * 如果�義為一個檔案，使用 \"./%s\"，或者\n"
 "    * 如果�義為一個範�，使用 --format-patch �項。\n"
 
-#: git-send-email.perl:732
+#: git-send-email.perl:768
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "無法開啟目錄 %s: %s"
 
-#: git-send-email.perl:767
+#: git-send-email.perl:803
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -25536,17 +25534,17 @@ msgstr ""
 "未指定修補檔案�\n"
 "\n"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:816
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中沒有標題行？"
 
-#: git-send-email.perl:791
+#: git-send-email.perl:827
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "為寫入開啟 %s 失敗: %s"
 
-#: git-send-email.perl:802
+#: git-send-email.perl:838
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -25559,37 +25557,37 @@ msgstr ""
 "\n"
 "如果您�想傳�摘�，清除內容。\n"
 
-#: git-send-email.perl:826
+#: git-send-email.perl:862
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "無法開啟 %s: %s"
 
-#: git-send-email.perl:843
+#: git-send-email.perl:879
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "無法開啟 %s.final: %s"
 
-#: git-send-email.perl:886
+#: git-send-email.perl:922
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘�信件為空，略�\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:935
+#: git-send-email.perl:971
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您是��使用 <%s> [y/N]？ "
 
-#: git-send-email.perl:990
+#: git-send-email.perl:1026
 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:995
+#: git-send-email.perl:1031
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�宣告 8bit 為什麼樣的編碼格� [UTF-8]？ "
 
-#: git-send-email.perl:1003
+#: git-send-email.perl:1039
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -25601,20 +25599,20 @@ msgstr ""
 "\t%s\n"
 "包�範本標題 '*** SUBJECT HERE ***'。如果確定想�傳�，使用�數 --force。\n"
 
-#: git-send-email.perl:1022
+#: git-send-email.perl:1058
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "信件將�傳�給誰？"
 
-#: git-send-email.perl:1040
+#: git-send-email.perl:1076
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命錯誤：別� '%s' 展開後還是自己\n"
 
-#: git-send-email.perl:1052
+#: git-send-email.perl:1088
 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:1114 git-send-email.perl:1122
+#: git-send-email.perl:1150 git-send-email.perl:1158
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "錯誤：�能從 %s 中擷�一個有效的信件��\n"
@@ -25622,16 +25620,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:1126
+#: git-send-email.perl:1162
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何處�這個��？([q]uit|[d]rop|[e]dit)： "
 
-#: git-send-email.perl:1446
+#: git-send-email.perl:1482
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路徑 \"%s\" �存在"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1565
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -25656,112 +25654,112 @@ msgstr ""
 #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
 #. translation. The program will only accept English input
 #. at this point.
-#: git-send-email.perl:1544
+#: git-send-email.perl:1580
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "傳�這�信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1583
 msgid "Send this email reply required"
 msgstr "傳��求的信件回復"
 
-#: git-send-email.perl:1581
+#: git-send-email.perl:1617
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP 伺�器未被正確定義。"
 
-#: git-send-email.perl:1628
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "伺�器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1633 git-send-email.perl:1637
+#: git-send-email.perl:1669 git-send-email.perl:1673
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失敗�%s"
 
-#: git-send-email.perl:1646
+#: git-send-email.perl:1682
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "無法正確地�始化 SMTP。檢查設定並使用 --smtp-debug。"
 
-#: git-send-email.perl:1664
+#: git-send-email.perl:1700
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "無法傳� %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "測試執行傳� %s\n"
 
-#: git-send-email.perl:1667
+#: git-send-email.perl:1703
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正傳� %s\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "Dry-OK. Log says:\n"
 msgstr "測試執行�功。日誌說：\n"
 
-#: git-send-email.perl:1669
+#: git-send-email.perl:1705
 msgid "OK. Log says:\n"
 msgstr "OK。日誌說：\n"
 
-#: git-send-email.perl:1688
+#: git-send-email.perl:1724
 msgid "Result: "
 msgstr "�果： "
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1727
 msgid "Result: OK\n"
 msgstr "�果：OK\n"
 
-#: git-send-email.perl:1708
+#: git-send-email.perl:1744
 #, perl-format
 msgid "can't open file %s"
 msgstr "無法開啟檔案 %s"
 
-#: git-send-email.perl:1756 git-send-email.perl:1776
+#: git-send-email.perl:1792 git-send-email.perl:1812
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 新增 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1762
+#: git-send-email.perl:1798
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 新增 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1819
+#: git-send-email.perl:1855
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1854
+#: git-send-email.perl:1890
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 新增 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:1973
+#: git-send-email.perl:2009
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能執行 '%s'"
 
-#: git-send-email.perl:1980
+#: git-send-email.perl:2016
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 新增 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:1984
+#: git-send-email.perl:2020
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 無法關閉管�至 '%s'"
 
-#: git-send-email.perl:2014
+#: git-send-email.perl:2050
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形�傳�訊�"
 
-#: git-send-email.perl:2022
+#: git-send-email.perl:2058
 msgid "invalid transfer encoding"
 msgstr "無效的傳�編碼"
 
-#: git-send-email.perl:2059
+#: git-send-email.perl:2095
 #, perl-format
 msgid ""
 "fatal: %s: rejected by sendemail-validate hook\n"
@@ -25772,12 +25770,12 @@ msgstr ""
 "%s\n"
 "警告：修補檔未能傳�\n"
 
-#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132
+#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "�能開啟 %s：%s\n"
 
-#: git-send-email.perl:2072
+#: git-send-email.perl:2108
 #, perl-format
 msgid ""
 "fatal: %s:%d is longer than 998 characters\n"
@@ -25786,17 +25784,369 @@ msgstr ""
 "致命錯誤：%s:%d 的字元數超� 998\n"
 "警告：修補檔未能傳�\n"
 
-#: git-send-email.perl:2090
+#: git-send-email.perl:2126
 #, 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:2094
+#: git-send-email.perl:2130
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "您真的�傳� %s？[y|N]： "
 
+#~ msgid "--index outside a repository"
+#~ msgstr "--index 在版本庫之外"
+
+#~ msgid "--cached outside a repository"
+#~ msgstr "--cached 在版本庫之外"
+
+#~ msgid "unrecognized input"
+#~ msgstr "無法識別的輸入"
+
+#, c-format
+#~ msgid "cannot read %s"
+#~ msgstr "�能讀� %s"
+
+#~ msgid "Option --exec can only be used together with --remote"
+#~ msgstr "�項 --exec �能和 --remote �時使用"
+
+#, c-format
+#~ msgid ""
+#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+#~ msgstr "分支 '%1$s' 設定為使用�定基底來追蹤來自 '%3$s' 的�端分支 '%2$s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+#~ msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的�端分支 '%2$s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+#~ msgstr "分支 '%s' 設定為使用�定基底來追蹤本機分支 '%s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track local branch '%s'."
+#~ msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+#~ msgstr "分支 '%s' 設定為使用�定基底來追蹤�端引用 '%s'。"
+
+#, c-format
+#~ msgid "Branch '%s' set up to track remote ref '%s'."
+#~ msgstr "分支 '%s' 設定為追蹤�端引用 '%s'。"
+
+#~ msgid "Cannot force update the current branch."
+#~ msgstr "無法強制更新目�分支。"
+
+#, c-format
+#~ msgid "Not a valid object name: '%s'."
+#~ msgstr "�是一個有效的物件�：'%s'。"
+
+#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+#~ msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
+
+#~ msgid "-G, -S and --find-object are mutually exclusive"
+#~ msgstr "-G�-S 和 --find-object 是互斥的"
+
+#~ msgid ""
+#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+#~ msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex �� -S"
+
+#~ msgid ""
+#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+#~ "with -G and -S"
+#~ msgstr ""
+#~ "--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all �� -G 和 -S"
+
+#~ msgid "--stateless-rpc requires multi_ack_detailed"
+#~ msgstr "--stateless-rpc 需� multi_ack_detailed"
+
+#~ msgid "--left-only and --right-only are mutually exclusive"
+#~ msgstr "--left-only 和 --right-only 互斥"
+
+#, c-format
+#~ msgid "unrecognized %%(objectsize) argument: %s"
+#~ msgstr "無法識別的 %%(objectsize) �數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(subject) argument: %s"
+#~ msgstr "無法識別的 %%(subject) 引數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(contents) argument: %s"
+#~ msgstr "無法識別的 %%(contents) �數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(raw) argument: %s"
+#~ msgstr "無法識別的 %%(raw) 引數：%s"
+
+#, c-format
+#~ msgid "unrecognized argument '%s' in %%(%s)"
+#~ msgstr "無法識別 %%(%2$s) 中的 '%1$s' �數"
+
+#, c-format
+#~ msgid "unrecognized %%(align) argument: %s"
+#~ msgstr "無法識別的 %%(align) �數：%s"
+
+#, c-format
+#~ msgid "unrecognized %%(if) argument: %s"
+#~ msgstr "無法識別的 %%(if) �數：%s"
+
+#, c-format
+#~ msgid "format: %%(if) atom used without a %%(then) atom"
+#~ msgstr "格�：使用了 %%(if) 元素而沒有 %%(then) 元素"
+
+#, c-format
+#~ msgid "format: %%(then) atom used without an %%(if) atom"
+#~ msgstr "格�：使用了 %%(then) 元素而沒有 %%(if) 元素"
+
+#, c-format
+#~ msgid "format: %%(else) atom used without a %%(then) atom"
+#~ msgstr "格�：使用了 %%(else) 元素而沒有 %%(then) 元素"
+
+#~ msgid "--unsorted-input is incompatible with --no-walk"
+#~ msgstr "--unsorted-input 與 --no-walk �相容"
+
+#~ msgid "--no-walk is incompatible with --unsorted-input"
+#~ msgstr "--no-walk 與 --unsorted-input �相容"
+
+#~ msgid "--dry-run is incompatible with --interactive/--patch"
+#~ msgstr "--dry-run 和 --interactive/--patch �相容"
+
+#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+#~ msgstr "--pathspec-from-file 與 --interactive/--patch �相容"
+
+#~ msgid "--pathspec-from-file is incompatible with --edit"
+#~ msgstr "--pathspec-from-file 與 --edit �相容"
+
+#~ msgid "-A and -u are mutually incompatible"
+#~ msgstr "-A 和 -u �項互斥"
+
+#~ msgid "Option --ignore-missing can only be used together with --dry-run"
+#~ msgstr "�項 --ignore-missing �能和 --dry-run �時使用"
+
+#~ msgid "--pathspec-from-file is incompatible with pathspec arguments"
+#~ msgstr "--pathspec-from-file 與 <路徑�格> �數�相容"
+
+#~ msgid "--pathspec-file-nul requires --pathspec-from-file"
+#~ msgstr "--pathspec-file-nul 需� --pathspec-from-file"
+
+#, c-format
+#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+#~ msgstr "--show-current-patch=%s 與 --show-current-patch=%s �相容"
+
+#~ msgid "--column and --verbose are incompatible"
+#~ msgstr "--column 和 --verbose �相容"
+
+#, c-format
+#~ msgid "'%s' cannot be used with %s"
+#~ msgstr "'%s' �能和 %s �時使用"
+
+#~ msgid "set upstream info for new branch"
+#~ msgstr "為新的分支設定上游訊�"
+
+#, c-format
+#~ msgid "-%c, -%c and --orphan are mutually exclusive"
+#~ msgstr "-%c�-%c 和 --orphan 是互斥的"
+
+#~ msgid "-p and --overlay are mutually exclusive"
+#~ msgstr "-p 和 --overlay 互斥"
+
+#~ msgid "--pathspec-from-file is incompatible with --detach"
+#~ msgstr "--pathspec-from-file 與 --detach �相容"
+
+#~ msgid "--pathspec-from-file is incompatible with --patch"
+#~ msgstr "--pathspec-from-file 與 --patch �相容"
+
+#, c-format
+#~ msgid "--bare and --origin %s options are incompatible."
+#~ msgstr "--bare 和 --origin %s �項�相容。"
+
+#~ msgid "--bare and --separate-git-dir are incompatible."
+#~ msgstr "--bare 和 --separate-git-dir �項�相容。"
+
+#~ msgid "--pathspec-from-file with -a does not make sense"
+#~ msgstr "--pathspec-from-file 和 -a �時使用沒有�義"
+
+#, c-format
+#~ msgid "cannot combine -m with --fixup:%s"
+#~ msgstr "-m 和 --fixup:%s ����使用"
+
+#~ msgid "--long and -z are incompatible"
+#~ msgstr "--long 和 -z �項�相容"
+
+#, c-format
+#~ msgid "cannot combine reword option of --fixup with path '%s'"
+#~ msgstr "�能將「%s�路徑與 --fixup 的 reword �項��"
+
+#~ msgid ""
+#~ "reword option of --fixup is mutually exclusive with --patch/--"
+#~ "interactive/--all/--include/--only"
+#~ msgstr ""
+#~ "--fixup 的 reword �項與 --patch/--interactive/--all/--include/--only 互斥"
+
+#~ msgid "--long is incompatible with --abbrev=0"
+#~ msgstr "--long 與 --abbrev=0 �相容"
+
+#~ msgid "--dirty is incompatible with commit-ishes"
+#~ msgstr "--dirty 與�交號�相容"
+
+#~ msgid "--broken is incompatible with commit-ishes"
+#~ msgstr "--broken 與�交號�相容"
+
+#~ msgid "--stdin and --merge-base are mutually exclusive"
+#~ msgstr "--stdin 和 --merge-base 互斥"
+
+#~ msgid "--dir-diff is incompatible with --no-index"
+#~ msgstr "--dir-diff 和 --no-index �相容"
+
+#~ msgid "--gui, --tool and --extcmd are mutually exclusive"
+#~ msgstr "--gui�--tool 和 --extcmd 互斥"
+
+#~ msgid "--anonymize-map without --anonymize does not make sense"
+#~ msgstr "缺少 --anonymize 的 --anonymize-map 沒有�義"
+
+#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+#~ msgstr "�能�時傳��數 --import-marks 和 --import-marks-if-exists"
+
+#, c-format
+#~ msgid "Refusing to fetch into current branch %s of non-bare repository"
+#~ msgstr "拒絕�得到�純版本庫的目�分支 %s"
+
+#~ msgid "--deepen and --depth are mutually exclusive"
+#~ msgstr "--deepen 和 --depth 是互斥的"
+
+#~ msgid "--depth and --unshallow cannot be used together"
+#~ msgstr "--depth 和 --unshallow �能�時使用"
+
+#~ msgid "--fix-thin cannot be used without --stdin"
+#~ msgstr "--fix-thin �能和 --stdin �時使用"
+
+#~ msgid "--object-format cannot be used with --stdin"
+#~ msgstr "--object-format �能和 --stdin �時使用"
+
+#~ msgid "--separate-git-dir and --bare are mutually exclusive"
+#~ msgstr "--separate-git-dir 和 --bare 互斥"
+
+#~ msgid "-n and -k are mutually exclusive"
+#~ msgstr "-n 和 -k 互斥"
+
+#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+#~ msgstr "--subject-prefix/--rfc 和 -k 互斥"
+
+#~ msgid "--stdout, --output, and --output-directory are mutually exclusive"
+#~ msgstr "--stdout�--output 和 --output-directory 互斥"
+
+#~ msgid "--creation-factor requires --range-diff"
+#~ msgstr "--creation-factor 需� --range-diff"
+
+#~ msgid "You cannot combine --squash with --no-ff."
+#~ msgstr "您�能將 --squash 和 --no-ff 組�使用。"
+
+#~ msgid "You cannot combine --squash with --commit."
+#~ msgstr "您�能將 --squash 和 --commit 組�使用。"
+
+#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+#~ msgstr "--keep-unreachable 和 --unpack-unreachable �相容"
+
+#~ msgid "--delete is incompatible with --all, --mirror and --tags"
+#~ msgstr "--delete 與 --all�--mirror � --tags �相容"
+
+#~ msgid "--all and --tags are incompatible"
+#~ msgstr "--all 和 --tags �相容"
+
+#~ msgid "--mirror and --tags are incompatible"
+#~ msgstr "--mirror 和 --tags �相容"
+
+#~ msgid "--all and --mirror are incompatible"
+#~ msgstr "--all 和 --mirror �相容"
+
+#~ msgid "cannot combine '--keep-base' with '--onto'"
+#~ msgstr "�能將 '--keep-base' 和 '--onto' 組�使用"
+
+#~ msgid "cannot combine '--keep-base' with '--root'"
+#~ msgstr "�能將 '--keep-base' 和 '--root' 組�使用"
+
+#~ msgid "cannot combine '--root' with '--fork-point'"
+#~ msgstr "�能將 '--root' 和 '--fork-point' ��使用"
+
+#~ msgid "cannot combine apply options with merge options"
+#~ msgstr "�能將 apply 套用�項與 merge �併�項一起使用"
+
+#~ msgid "--keep-unreachable and -A are incompatible"
+#~ msgstr "--keep-unreachable 和 -A �相容"
+
+#~ msgid "--geometric is incompatible with -A, -a"
+#~ msgstr "--geometric 與 -A, -a �相容"
+
+#~ msgid "--patch is incompatible with --{hard,mixed,soft}"
+#~ msgstr "--patch 與 --{hard�mixed�soft} �項�相容"
+
+#~ msgid "-N can only be used with --mixed"
+#~ msgstr "-N �能和 --mixed �時使用"
+
+#~ msgid "cannot combine --exclude-promisor-objects and --missing"
+#~ msgstr "�能�時使用 --exclude-promisor-objects 和 --missing �項"
+
+#~ msgid "marked counting is incompatible with --objects"
+#~ msgstr "--objects �相容標記計數 (marked counting)"
+
+#~ msgid ""
+#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-"
+#~ "base"
+#~ msgstr "--reflog 和 --all�--remotes�--independent 或 --merge-base �相容"
+
+#~ msgid "git sparse-checkout reapply"
+#~ msgstr "git sparse-checkout reapply"
+
+#~ msgid "--cached and --files are mutually exclusive"
+#~ msgstr "--cached 和 --files 互斥"
+
+#~ msgid "--branch and --default are mutually exclusive"
+#~ msgstr "--branch 與 --default 互斥"
+
+#~ msgid "--column and -n are incompatible"
+#~ msgstr "--column 和 -n �相容"
+
+#~ msgid "--contains option is only allowed in list mode"
+#~ msgstr "--contains �項��許用在列表顯示模�"
+
+#~ msgid "--no-contains option is only allowed in list mode"
+#~ msgstr "--no-contains �項��許用在列表顯示模�"
+
+#~ msgid "--points-at option is only allowed in list mode"
+#~ msgstr "--points-at �項��許用在列表顯示模�"
+
+#~ msgid "--merged and --no-merged options are only allowed in list mode"
+#~ msgstr "--merged 和 --no-merged �項��許用在列表顯示模�"
+
+#~ msgid "only one -F or -m option is allowed."
+#~ msgstr "��許一個 -F 或 -m �項。"
+
+#~ msgid "-b, -B, and --detach are mutually exclusive"
+#~ msgstr "-b�-B 和 --detach 是互斥的"
+
+#~ msgid "--reason requires --lock"
+#~ msgstr "--reason 需� --lock"
+
+#~ msgid "--verbose and --porcelain are mutually exclusive"
+#~ msgstr "--verbose 和 --porcelain 互斥"
+
+#, c-format
+#~ msgid "no directory given for --git-dir\n"
+#~ msgstr "沒有為 --git-dir �供目錄\n"
+
+#, c-format
+#~ msgid "no directory given for --work-tree\n"
+#~ msgstr "沒有為 --work-tree �供目錄\n"
+
+#~ msgid "--packfile requires --index-pack-args"
+#~ msgstr "--packfile 需� --index-pack-args"
+
+#~ msgid "--index-pack-args can only be used with --packfile"
+#~ msgstr "--index-pack-args �能與 --packfile 一起使用"
+
 #~ msgid ""
 #~ "The following pathspecs didn't match any eligible path, but they do match "
 #~ "index\n"
@@ -25899,9 +26249,6 @@ msgstr "您真的�傳� %s？[y|N]： "
 #~ msgid "edit the todo list"
 #~ msgstr "�定基底待辦列表"
 
-#~ msgid "show the current patch"
-#~ msgstr "顯示目�修補檔"
-
 #~ msgid "shorten commit ids in the todo list"
 #~ msgstr "縮短待辦列表中的�交號"
 
diff --git a/pretty.c b/pretty.c
index 1af5b093ae..ee6114e3f0 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1275,28 +1275,66 @@ int format_set_trailers_options(struct process_trailer_options *opts,
 
 static size_t parse_describe_args(const char *start, struct strvec *args)
 {
-	const char *options[] = { "match", "exclude" };
+	struct {
+		char *name;
+		enum {
+			DESCRIBE_ARG_BOOL,
+			DESCRIBE_ARG_INTEGER,
+			DESCRIBE_ARG_STRING,
+		} type;
+	}  option[] = {
+		{ "tags", DESCRIBE_ARG_BOOL},
+		{ "abbrev", DESCRIBE_ARG_INTEGER },
+		{ "exclude", DESCRIBE_ARG_STRING },
+		{ "match", DESCRIBE_ARG_STRING },
+	};
 	const char *arg = start;
 
 	for (;;) {
-		const char *matched = NULL;
+		int found = 0;
 		const char *argval;
 		size_t arglen = 0;
+		int optval = 0;
 		int i;
 
-		for (i = 0; i < ARRAY_SIZE(options); i++) {
-			if (match_placeholder_arg_value(arg, options[i], &arg,
-							&argval, &arglen)) {
-				matched = options[i];
+		for (i = 0; !found && i < ARRAY_SIZE(option); i++) {
+			switch (option[i].type) {
+			case DESCRIBE_ARG_BOOL:
+				if (match_placeholder_bool_arg(arg, option[i].name, &arg, &optval)) {
+					if (optval)
+						strvec_pushf(args, "--%s", option[i].name);
+					else
+						strvec_pushf(args, "--no-%s", option[i].name);
+					found = 1;
+				}
+				break;
+			case DESCRIBE_ARG_INTEGER:
+				if (match_placeholder_arg_value(arg, option[i].name, &arg,
+								&argval, &arglen)) {
+					char *endptr;
+					if (!arglen)
+						return 0;
+					strtol(argval, &endptr, 10);
+					if (endptr - argval != arglen)
+						return 0;
+					strvec_pushf(args, "--%s=%.*s", option[i].name, (int)arglen, argval);
+					found = 1;
+				}
+				break;
+			case DESCRIBE_ARG_STRING:
+				if (match_placeholder_arg_value(arg, option[i].name, &arg,
+								&argval, &arglen)) {
+					if (!arglen)
+						return 0;
+					strvec_pushf(args, "--%s=%.*s", option[i].name, (int)arglen, argval);
+					found = 1;
+				}
 				break;
 			}
 		}
-		if (!matched)
+		if (!found)
 			break;
 
-		if (!arglen)
-			return 0;
-		strvec_pushf(args, "--%s=%.*s", matched, (int)arglen, argval);
 	}
 	return arg - start;
 }
diff --git a/prompt.c b/prompt.c
index 5ded21a017..50df17279d 100644
--- a/prompt.c
+++ b/prompt.c
@@ -8,15 +8,12 @@
 static char *do_askpass(const char *cmd, const char *prompt)
 {
 	struct child_process pass = CHILD_PROCESS_INIT;
-	const char *args[3];
 	static struct strbuf buffer = STRBUF_INIT;
 	int err = 0;
 
-	args[0] = cmd;
-	args[1]	= prompt;
-	args[2] = NULL;
+	strvec_push(&pass.args, cmd);
+	strvec_push(&pass.args, prompt);
 
-	pass.argv = args;
 	pass.out = -1;
 
 	if (start_command(&pass))
diff --git a/range-diff.c b/range-diff.c
index cac89a2f4f..30a4de5c2d 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -556,7 +556,7 @@ int show_range_diff(const char *range1, const char *range2,
 	struct string_list branch2 = STRING_LIST_INIT_DUP;
 
 	if (range_diff_opts->left_only && range_diff_opts->right_only)
-		res = error(_("--left-only and --right-only are mutually exclusive"));
+		res = error(_("options '%s' and '%s' cannot be used together"), "--left-only", "--right-only");
 
 	if (!res && read_patches(range1, &branch1, range_diff_opts->other_arg))
 		res = error(_("could not parse log for '%s'"), range1);
diff --git a/read-cache.c b/read-cache.c
index f398659662..cbe73f14e5 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -68,6 +68,11 @@
  */
 #define CACHE_ENTRY_PATH_LENGTH 80
 
+enum index_search_mode {
+	NO_EXPAND_SPARSE = 0,
+	EXPAND_SPARSE = 1
+};
+
 static inline struct cache_entry *mem_pool__ce_alloc(struct mem_pool *mem_pool, size_t len)
 {
 	struct cache_entry *ce;
@@ -551,7 +556,10 @@ int cache_name_stage_compare(const char *name1, int len1, int stage1, const char
 	return 0;
 }
 
-static int index_name_stage_pos(struct index_state *istate, const char *name, int namelen, int stage)
+static int index_name_stage_pos(struct index_state *istate,
+				const char *name, int namelen,
+				int stage,
+				enum index_search_mode search_mode)
 {
 	int first, last;
 
@@ -570,7 +578,7 @@ static int index_name_stage_pos(struct index_state *istate, const char *name, in
 		first = next+1;
 	}
 
-	if (istate->sparse_index &&
+	if (search_mode == EXPAND_SPARSE && istate->sparse_index &&
 	    first > 0) {
 		/* Note: first <= istate->cache_nr */
 		struct cache_entry *ce = istate->cache[first - 1];
@@ -586,7 +594,7 @@ static int index_name_stage_pos(struct index_state *istate, const char *name, in
 		    ce_namelen(ce) < namelen &&
 		    !strncmp(name, ce->name, ce_namelen(ce))) {
 			ensure_full_index(istate);
-			return index_name_stage_pos(istate, name, namelen, stage);
+			return index_name_stage_pos(istate, name, namelen, stage, search_mode);
 		}
 	}
 
@@ -595,7 +603,12 @@ static int index_name_stage_pos(struct index_state *istate, const char *name, in
 
 int index_name_pos(struct index_state *istate, const char *name, int namelen)
 {
-	return index_name_stage_pos(istate, name, namelen, 0);
+	return index_name_stage_pos(istate, name, namelen, 0, EXPAND_SPARSE);
+}
+
+int index_entry_exists(struct index_state *istate, const char *name, int namelen)
+{
+	return index_name_stage_pos(istate, name, namelen, 0, NO_EXPAND_SPARSE) >= 0;
 }
 
 int remove_index_entry_at(struct index_state *istate, int pos)
@@ -1237,7 +1250,7 @@ static int has_dir_name(struct index_state *istate,
 			 */
 		}
 
-		pos = index_name_stage_pos(istate, name, len, stage);
+		pos = index_name_stage_pos(istate, name, len, stage, EXPAND_SPARSE);
 		if (pos >= 0) {
 			/*
 			 * Found one, but not so fast.  This could
@@ -1337,7 +1350,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
 		strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0)
 		pos = index_pos_to_insert_pos(istate->cache_nr);
 	else
-		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
+		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
 
 	/* existing match? Just replace it. */
 	if (pos >= 0) {
@@ -1372,7 +1385,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e
 		if (!ok_to_replace)
 			return error(_("'%s' appears as both a file and as a directory"),
 				     ce->name);
-		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
+		pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce), EXPAND_SPARSE);
 		pos = -pos-1;
 	}
 	return pos + 1;
@@ -2352,9 +2365,17 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 
 	if (!istate->repo)
 		istate->repo = the_repository;
+
+	/*
+	 * If the command explicitly requires a full index, force it
+	 * to be full. Otherwise, correct the sparsity based on repository
+	 * settings and other properties of the index (if necessary).
+	 */
 	prepare_repo_settings(istate->repo);
 	if (istate->repo->settings.command_requires_full_index)
 		ensure_full_index(istate);
+	else
+		ensure_correct_sparsity(istate);
 
 	return istate->cache_nr;
 
diff --git a/ref-filter.c b/ref-filter.c
index 08a3f839c9..f7a2f17bfd 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -341,7 +341,7 @@ static int objectsize_atom_parser(struct ref_format *format, struct used_atom *a
 		else
 			oi.info.disk_sizep = &oi.disk_size;
 	} else
-		return strbuf_addf_ret(err, -1, _("unrecognized %%(objectsize) argument: %s"), arg);
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "objectsize", arg);
 	return 0;
 }
 
@@ -374,7 +374,7 @@ static int subject_atom_parser(struct ref_format *format, struct used_atom *atom
 	else if (!strcmp(arg, "sanitize"))
 		atom->u.contents.option = C_SUB_SANITIZE;
 	else
-		return strbuf_addf_ret(err, -1, _("unrecognized %%(subject) argument: %s"), arg);
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "subject", arg);
 	return 0;
 }
 
@@ -428,7 +428,7 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato
 		if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
 			return strbuf_addf_ret(err, -1, _("positive value expected contents:lines=%s"), arg);
 	} else
-		return strbuf_addf_ret(err, -1, _("unrecognized %%(contents) argument: %s"), arg);
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "contents", arg);
 	return 0;
 }
 
@@ -440,7 +440,7 @@ static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
 	else if (!strcmp(arg, "size"))
 		atom->u.raw_data.option = RAW_LENGTH;
 	else
-		return strbuf_addf_ret(err, -1, _("unrecognized %%(raw) argument: %s"), arg);
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "raw", arg);
 	return 0;
 }
 
@@ -459,7 +459,7 @@ static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
 		if (atom->u.oid.length < MINIMUM_ABBREV)
 			atom->u.oid.length = MINIMUM_ABBREV;
 	} else
-		return strbuf_addf_ret(err, -1, _("unrecognized argument '%s' in %%(%s)"), arg, atom->name);
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), atom->name, arg);
 	return 0;
 }
 
@@ -531,7 +531,7 @@ static int align_atom_parser(struct ref_format *format, struct used_atom *atom,
 		else if ((position = parse_align_position(s)) >= 0)
 			align->position = position;
 		else {
-			strbuf_addf(err, _("unrecognized %%(align) argument: %s"), s);
+			strbuf_addf(err, _("unrecognized %%(%s) argument: %s"), "align", s);
 			string_list_clear(&params, 0);
 			return -1;
 		}
@@ -557,7 +557,7 @@ static int if_atom_parser(struct ref_format *format, struct used_atom *atom,
 	} else if (skip_prefix(arg, "notequals=", &atom->u.if_then_else.str)) {
 		atom->u.if_then_else.cmp_status = COMPARE_UNEQUAL;
 	} else
-		return strbuf_addf_ret(err, -1, _("unrecognized %%(if) argument: %s"), arg);
+		return strbuf_addf_ret(err, -1, _("unrecognized %%(%s) argument: %s"), "if", arg);
 	return 0;
 }
 
@@ -841,7 +841,7 @@ static void if_then_else_handler(struct ref_formatting_stack **stack)
 	struct if_then_else *if_then_else = (struct if_then_else *)cur->at_end_data;
 
 	if (!if_then_else->then_atom_seen)
-		die(_("format: %%(if) atom used without a %%(then) atom"));
+		die(_("format: %%(%s) atom used without a %%(%s) atom"), "if", "then");
 
 	if (if_then_else->else_atom_seen) {
 		/*
@@ -907,7 +907,7 @@ static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
 	if (cur->at_end == if_then_else_handler)
 		if_then_else = (struct if_then_else *)cur->at_end_data;
 	if (!if_then_else)
-		return strbuf_addf_ret(err, -1, _("format: %%(then) atom used without an %%(if) atom"));
+		return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "then", "if");
 	if (if_then_else->then_atom_seen)
 		return strbuf_addf_ret(err, -1, _("format: %%(then) atom used more than once"));
 	if (if_then_else->else_atom_seen)
@@ -943,9 +943,9 @@ static int else_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
 	if (prev->at_end == if_then_else_handler)
 		if_then_else = (struct if_then_else *)prev->at_end_data;
 	if (!if_then_else)
-		return strbuf_addf_ret(err, -1, _("format: %%(else) atom used without an %%(if) atom"));
+		return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "else", "if");
 	if (!if_then_else->then_atom_seen)
-		return strbuf_addf_ret(err, -1, _("format: %%(else) atom used without a %%(then) atom"));
+		return strbuf_addf_ret(err, -1, _("format: %%(%s) atom used without a %%(%s) atom"), "else", "then");
 	if (if_then_else->else_atom_seen)
 		return strbuf_addf_ret(err, -1, _("format: %%(else) atom used more than once"));
 	if_then_else->else_atom_seen = 1;
@@ -2470,6 +2470,12 @@ static int memcasecmp(const void *vs1, const void *vs2, size_t n)
 	return 0;
 }
 
+struct ref_sorting {
+	struct ref_sorting *next;
+	int atom; /* index into used_atom array (internal) */
+	enum ref_sorting_order sort_flags;
+};
+
 static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
 {
 	struct atom_value *va, *vb;
@@ -2663,7 +2669,7 @@ static int parse_sorting_atom(const char *atom)
 }
 
 /*  If no sorting option is given, use refname to sort as default */
-struct ref_sorting *ref_default_sorting(void)
+static struct ref_sorting *ref_default_sorting(void)
 {
 	static const char cstr_name[] = "refname";
 
@@ -2674,7 +2680,7 @@ struct ref_sorting *ref_default_sorting(void)
 	return sorting;
 }
 
-void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
+static void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
 {
 	struct ref_sorting *s;
 
@@ -2692,17 +2698,25 @@ void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
 	s->atom = parse_sorting_atom(arg);
 }
 
-int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)
+struct ref_sorting *ref_sorting_options(struct string_list *options)
 {
+	struct string_list_item *item;
+	struct ref_sorting *sorting = NULL, **tail = &sorting;
+
+	if (!options->nr) {
+		sorting = ref_default_sorting();
+	} else {
+		for_each_string_list_item(item, options)
+			parse_ref_sorting(tail, item->string);
+	}
+
 	/*
-	 * NEEDSWORK: We should probably clear the list in this case, but we've
-	 * already munged the global used_atoms list, which would need to be
-	 * undone.
+	 * From here on, the ref_sorting list should be used to talk
+	 * about the sort order used for the output.  The caller
+	 * should not touch the string form anymore.
 	 */
-	BUG_ON_OPT_NEG(unset);
-
-	parse_ref_sorting(opt->value, arg);
-	return 0;
+	string_list_clear(options, 0);
+	return sorting;
 }
 
 void ref_sorting_release(struct ref_sorting *sorting)
diff --git a/ref-filter.h b/ref-filter.h
index 6228458d30..aa0eea4ecf 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -23,16 +23,13 @@
 #define FILTER_REFS_KIND_MASK      (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD)
 
 struct atom_value;
+struct ref_sorting;
 
-struct ref_sorting {
-	struct ref_sorting *next;
-	int atom; /* index into used_atom array (internal) */
-	enum {
-		REF_SORTING_REVERSE = 1<<0,
-		REF_SORTING_ICASE = 1<<1,
-		REF_SORTING_VERSION = 1<<2,
-		REF_SORTING_DETACHED_HEAD_FIRST = 1<<3,
-	} sort_flags;
+enum ref_sorting_order {
+	REF_SORTING_REVERSE = 1<<0,
+	REF_SORTING_ICASE = 1<<1,
+	REF_SORTING_VERSION = 1<<2,
+	REF_SORTING_DETACHED_HEAD_FIRST = 1<<3,
 };
 
 struct ref_array_item {
@@ -97,9 +94,8 @@ struct ref_format {
 #define OPT_NO_MERGED(f, h) _OPT_MERGED_NO_MERGED("no-merged", f, h)
 
 #define OPT_REF_SORT(var) \
-	OPT_CALLBACK_F(0, "sort", (var), \
-		       N_("key"), N_("field name to sort on"), \
-		       PARSE_OPT_NONEG, parse_opt_ref_sorting)
+	OPT_STRING_LIST(0, "sort", (var), \
+			N_("key"), N_("field name to sort on"))
 
 /*
  * API for filtering a set of refs. Based on the type of refs the user
@@ -121,14 +117,10 @@ int format_ref_array_item(struct ref_array_item *info,
 			  struct ref_format *format,
 			  struct strbuf *final_buf,
 			  struct strbuf *error_buf);
-/*  Parse a single sort specifier and add it to the list */
-void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *atom);
-/*  Callback function for parsing the sort option */
-int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset);
-/*  Default sort option based on refname */
-struct ref_sorting *ref_default_sorting(void);
 /* Release a "struct ref_sorting" */
 void ref_sorting_release(struct ref_sorting *);
+/*  Convert list of sort options into ref_sorting */
+struct ref_sorting *ref_sorting_options(struct string_list *);
 /*  Function to parse --merged and --no-merged options */
 int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset);
 /*  Get the current HEAD's description */
diff --git a/refs.c b/refs.c
index d7cc0a23a3..addb26293b 100644
--- a/refs.c
+++ b/refs.c
@@ -269,9 +269,10 @@ char *refs_resolve_refdup(struct ref_store *refs,
 			  struct object_id *oid, int *flags)
 {
 	const char *result;
+	int ignore_errno;
 
 	result = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
-					 oid, flags);
+					 oid, flags, &ignore_errno);
 	return xstrdup_or_null(result);
 }
 
@@ -291,20 +292,17 @@ struct ref_filter {
 	void *cb_data;
 };
 
-int refs_read_ref_full(struct ref_store *refs, const char *refname,
-		       int resolve_flags, struct object_id *oid, int *flags)
+int read_ref_full(const char *refname, int resolve_flags, struct object_id *oid, int *flags)
 {
-	if (refs_resolve_ref_unsafe(refs, refname, resolve_flags, oid, flags))
+	int ignore_errno;
+	struct ref_store *refs = get_main_ref_store(the_repository);
+
+	if (refs_resolve_ref_unsafe(refs, refname, resolve_flags,
+				    oid, flags, &ignore_errno))
 		return 0;
 	return -1;
 }
 
-int read_ref_full(const char *refname, int resolve_flags, struct object_id *oid, int *flags)
-{
-	return refs_read_ref_full(get_main_ref_store(the_repository), refname,
-				  resolve_flags, oid, flags);
-}
-
 int read_ref(const char *refname, struct object_id *oid)
 {
 	return read_ref_full(refname, RESOLVE_REF_READING, oid, NULL);
@@ -312,7 +310,9 @@ int read_ref(const char *refname, struct object_id *oid)
 
 int refs_ref_exists(struct ref_store *refs, const char *refname)
 {
-	return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING, NULL, NULL);
+	int ignore_errno;
+	return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING,
+					 NULL, NULL, &ignore_errno);
 }
 
 int ref_exists(const char *refname)
@@ -655,13 +655,16 @@ int expand_ref(struct repository *repo, const char *str, int len,
 		struct object_id oid_from_ref;
 		struct object_id *this_result;
 		int flag;
+		struct ref_store *refs = get_main_ref_store(repo);
+		int ignore_errno;
 
 		this_result = refs_found ? &oid_from_ref : oid;
 		strbuf_reset(&fullref);
 		strbuf_addf(&fullref, *p, len, str);
-		r = refs_resolve_ref_unsafe(get_main_ref_store(repo),
-					    fullref.buf, RESOLVE_REF_READING,
-					    this_result, &flag);
+		r = refs_resolve_ref_unsafe(refs, fullref.buf,
+					    RESOLVE_REF_READING,
+					    this_result, &flag,
+					    &ignore_errno);
 		if (r) {
 			if (!refs_found++)
 				*ref = xstrdup(r);
@@ -690,12 +693,14 @@ int repo_dwim_log(struct repository *r, const char *str, int len,
 	for (p = ref_rev_parse_rules; *p; p++) {
 		struct object_id hash;
 		const char *ref, *it;
+		int ignore_errno;
 
 		strbuf_reset(&path);
 		strbuf_addf(&path, *p, len, str);
 		ref = refs_resolve_ref_unsafe(refs, path.buf,
 					      RESOLVE_REF_READING,
-					      oid ? &hash : NULL, NULL);
+					      oid ? &hash : NULL, NULL,
+					      &ignore_errno);
 		if (!ref)
 			continue;
 		if (refs_reflog_exists(refs, path.buf))
@@ -1078,9 +1083,10 @@ int ref_transaction_update(struct ref_transaction *transaction,
 {
 	assert(err);
 
-	if ((new_oid && !is_null_oid(new_oid)) ?
-	    check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
-	    !refname_is_safe(refname)) {
+	if (!(flags & REF_SKIP_REFNAME_VERIFICATION) &&
+	    ((new_oid && !is_null_oid(new_oid)) ?
+		     check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
+			   !refname_is_safe(refname))) {
 		strbuf_addf(err, _("refusing to update ref with bad name '%s'"),
 			    refname);
 		return -1;
@@ -1089,6 +1095,13 @@ int ref_transaction_update(struct ref_transaction *transaction,
 	if (flags & ~REF_TRANSACTION_UPDATE_ALLOWED_FLAGS)
 		BUG("illegal flags 0x%x passed to ref_transaction_update()", flags);
 
+	/*
+	 * Clear flags outside the allowed set; this should be a noop because
+	 * of the BUG() check above, but it works around a -Wnonnull warning
+	 * with some versions of "gcc -O3".
+	 */
+	flags &= REF_TRANSACTION_UPDATE_ALLOWED_FLAGS;
+
 	flags |= (new_oid ? REF_HAVE_NEW : 0) | (old_oid ? REF_HAVE_OLD : 0);
 
 	ref_transaction_add_update(transaction, refname, flags,
@@ -1373,32 +1386,14 @@ const char *find_descendant_ref(const char *dirname,
 	return NULL;
 }
 
-int refs_rename_ref_available(struct ref_store *refs,
-			      const char *old_refname,
-			      const char *new_refname)
-{
-	struct string_list skip = STRING_LIST_INIT_NODUP;
-	struct strbuf err = STRBUF_INIT;
-	int ok;
-
-	string_list_insert(&skip, old_refname);
-	ok = !refs_verify_refname_available(refs, new_refname,
-					    NULL, &skip, &err);
-	if (!ok)
-		error("%s", err.buf);
-
-	string_list_clear(&skip, 0);
-	strbuf_release(&err);
-	return ok;
-}
-
 int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
 {
 	struct object_id oid;
 	int flag;
+	int ignore_errno;
 
-	if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING,
-				&oid, &flag))
+	if (refs_resolve_ref_unsafe(refs, "HEAD", RESOLVE_REF_READING,
+				    &oid, &flag, &ignore_errno))
 		return fn("HEAD", &oid, flag, cb_data);
 
 	return 0;
@@ -1649,7 +1644,8 @@ int for_each_fullref_in_prefixes(const char *namespace,
 
 static int refs_read_special_head(struct ref_store *ref_store,
 				  const char *refname, struct object_id *oid,
-				  struct strbuf *referent, unsigned int *type)
+				  struct strbuf *referent, unsigned int *type,
+				  int *failure_errno)
 {
 	struct strbuf full_path = STRBUF_INIT;
 	struct strbuf content = STRBUF_INIT;
@@ -1659,7 +1655,8 @@ static int refs_read_special_head(struct ref_store *ref_store,
 	if (strbuf_read_file(&content, full_path.buf, 0) < 0)
 		goto done;
 
-	result = parse_loose_ref_contents(content.buf, oid, referent, type);
+	result = parse_loose_ref_contents(content.buf, oid, referent, type,
+					  failure_errno);
 
 done:
 	strbuf_release(&full_path);
@@ -1667,30 +1664,33 @@ done:
 	return result;
 }
 
-int refs_read_raw_ref(struct ref_store *ref_store,
-		      const char *refname, struct object_id *oid,
-		      struct strbuf *referent, unsigned int *type)
+int refs_read_raw_ref(struct ref_store *ref_store, const char *refname,
+		      struct object_id *oid, struct strbuf *referent,
+		      unsigned int *type, int *failure_errno)
 {
+	assert(failure_errno);
 	if (!strcmp(refname, "FETCH_HEAD") || !strcmp(refname, "MERGE_HEAD")) {
 		return refs_read_special_head(ref_store, refname, oid, referent,
-					      type);
+					      type, failure_errno);
 	}
 
 	return ref_store->be->read_raw_ref(ref_store, refname, oid, referent,
-					   type, &errno);
+					   type, failure_errno);
 }
 
-/* This function needs to return a meaningful errno on failure */
 const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 				    const char *refname,
 				    int resolve_flags,
-				    struct object_id *oid, int *flags)
+				    struct object_id *oid,
+				    int *flags, int *failure_errno)
 {
 	static struct strbuf sb_refname = STRBUF_INIT;
 	struct object_id unused_oid;
 	int unused_flags;
 	int symref_count;
 
+	assert(failure_errno);
+
 	if (!oid)
 		oid = &unused_oid;
 	if (!flags)
@@ -1701,7 +1701,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
 		if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
 		    !refname_is_safe(refname)) {
-			errno = EINVAL;
+			*failure_errno = EINVAL;
 			return NULL;
 		}
 
@@ -1719,8 +1719,8 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 	for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
 		unsigned int read_flags = 0;
 
-		if (refs_read_raw_ref(refs, refname,
-				      oid, &sb_refname, &read_flags)) {
+		if (refs_read_raw_ref(refs, refname, oid, &sb_refname,
+				      &read_flags, failure_errno)) {
 			*flags |= read_flags;
 
 			/* In reading mode, refs must eventually resolve */
@@ -1732,9 +1732,9 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 			 * may show errors besides ENOENT if there are
 			 * similarly-named refs.
 			 */
-			if (errno != ENOENT &&
-			    errno != EISDIR &&
-			    errno != ENOTDIR)
+			if (*failure_errno != ENOENT &&
+			    *failure_errno != EISDIR &&
+			    *failure_errno != ENOTDIR)
 				return NULL;
 
 			oidclr(oid);
@@ -1761,7 +1761,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 		if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
 			if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
 			    !refname_is_safe(refname)) {
-				errno = EINVAL;
+				*failure_errno = EINVAL;
 				return NULL;
 			}
 
@@ -1769,7 +1769,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 		}
 	}
 
-	errno = ELOOP;
+	*failure_errno = ELOOP;
 	return NULL;
 }
 
@@ -1784,8 +1784,10 @@ int refs_init_db(struct strbuf *err)
 const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
 			       struct object_id *oid, int *flags)
 {
+	int ignore_errno;
+
 	return refs_resolve_ref_unsafe(get_main_ref_store(the_repository), refname,
-				       resolve_flags, oid, flags);
+				       resolve_flags, oid, flags, &ignore_errno);
 }
 
 int resolve_gitlink_ref(const char *submodule, const char *refname,
@@ -1793,14 +1795,15 @@ int resolve_gitlink_ref(const char *submodule, const char *refname,
 {
 	struct ref_store *refs;
 	int flags;
+	int ignore_errno;
 
 	refs = get_submodule_ref_store(submodule);
 
 	if (!refs)
 		return -1;
 
-	if (!refs_resolve_ref_unsafe(refs, refname, 0, oid, &flags) ||
-	    is_null_oid(oid))
+	if (!refs_resolve_ref_unsafe(refs, refname, 0, oid, &flags,
+				     &ignore_errno) || is_null_oid(oid))
 		return -1;
 	return 0;
 }
@@ -2002,10 +2005,12 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
 	return refs;
 }
 
-void base_ref_store_init(struct ref_store *refs,
-			 const struct ref_storage_be *be)
+void base_ref_store_init(struct ref_store *refs, struct repository *repo,
+			 const char *path, const struct ref_storage_be *be)
 {
 	refs->be = be;
+	refs->repo = repo;
+	refs->gitdir = xstrdup(path);
 }
 
 /* backend functions */
@@ -2102,8 +2107,11 @@ static int run_transaction_hook(struct ref_transaction *transaction,
 			    update->refname);
 
 		if (write_in_full(proc.in, buf.buf, buf.len) < 0) {
-			if (errno != EPIPE)
+			if (errno != EPIPE) {
+				/* Don't leak errno outside this API */
+				errno = 0;
 				ret = -1;
+			}
 			break;
 		}
 	}
@@ -2137,7 +2145,7 @@ int ref_transaction_prepare(struct ref_transaction *transaction,
 		break;
 	}
 
-	if (getenv(GIT_QUARANTINE_ENVIRONMENT)) {
+	if (refs->repo->objects->odb->disable_ref_updates) {
 		strbuf_addstr(err,
 			      _("ref updates forbidden inside quarantine environment"));
 		return -1;
@@ -2238,6 +2246,13 @@ int refs_verify_refname_available(struct ref_store *refs,
 
 	strbuf_grow(&dirname, strlen(refname) + 1);
 	for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) {
+		/*
+		 * Just saying "Is a directory" when we e.g. can't
+		 * lock some multi-level ref isn't very informative,
+		 * the user won't be told *what* is a directory, so
+		 * let's not use strerror() below.
+		 */
+		int ignore_errno;
 		/* Expand dirname to the new prefix, not including the trailing slash: */
 		strbuf_add(&dirname, refname + dirname.len, slash - refname - dirname.len);
 
@@ -2249,7 +2264,8 @@ int refs_verify_refname_available(struct ref_store *refs,
 		if (skip && string_list_has_string(skip, dirname.buf))
 			continue;
 
-		if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent, &type)) {
+		if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent,
+				       &type, &ignore_errno)) {
 			strbuf_addf(err, _("'%s' exists; cannot create '%s'"),
 				    dirname.buf, refname);
 			goto cleanup;
@@ -2358,16 +2374,15 @@ int reflog_exists(const char *refname)
 }
 
 int refs_create_reflog(struct ref_store *refs, const char *refname,
-		       int force_create, struct strbuf *err)
+		       struct strbuf *err)
 {
-	return refs->be->create_reflog(refs, refname, force_create, err);
+	return refs->be->create_reflog(refs, refname, err);
 }
 
-int safe_create_reflog(const char *refname, int force_create,
-		       struct strbuf *err)
+int safe_create_reflog(const char *refname, struct strbuf *err)
 {
 	return refs_create_reflog(get_main_ref_store(the_repository), refname,
-				  force_create, err);
+				  err);
 }
 
 int refs_delete_reflog(struct ref_store *refs, const char *refname)
diff --git a/refs.h b/refs.h
index d5099d4984..8f91a7f9ff 100644
--- a/refs.h
+++ b/refs.h
@@ -58,6 +58,11 @@ struct worktree;
  * resolved. The function returns NULL for such ref names.
  * Caps and underscores refers to the special refs, such as HEAD,
  * FETCH_HEAD and friends, that all live outside of the refs/ directory.
+ *
+ * Callers should not inspect "errno" on failure, but rather pass in a
+ * "failure_errno" parameter, on failure the "errno" will indicate the
+ * type of failure encountered, but not necessarily one that came from
+ * a syscall. We might have faked it up.
  */
 #define RESOLVE_REF_READING 0x01
 #define RESOLVE_REF_NO_RECURSE 0x02
@@ -67,7 +72,8 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 				    const char *refname,
 				    int resolve_flags,
 				    struct object_id *oid,
-				    int *flags);
+				    int *flags, int *failure_errno);
+
 const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
 			       struct object_id *oid, int *flags);
 
@@ -77,8 +83,6 @@ char *refs_resolve_refdup(struct ref_store *refs,
 char *resolve_refdup(const char *refname, int resolve_flags,
 		     struct object_id *oid, int *flags);
 
-int refs_read_ref_full(struct ref_store *refs, const char *refname,
-		       int resolve_flags, struct object_id *oid, int *flags);
 int read_ref_full(const char *refname, int resolve_flags,
 		  struct object_id *oid, int *flags);
 int read_ref(const char *refname, struct object_id *oid);
@@ -413,8 +417,8 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags);
  * Setup reflog before using. Fill in err and return -1 on failure.
  */
 int refs_create_reflog(struct ref_store *refs, const char *refname,
-		       int force_create, struct strbuf *err);
-int safe_create_reflog(const char *refname, int force_create, struct strbuf *err);
+		       struct strbuf *err);
+int safe_create_reflog(const char *refname, struct strbuf *err);
 
 /** Reads log for the value of ref during at_time. **/
 int read_ref_at(struct ref_store *refs,
@@ -459,7 +463,29 @@ int delete_reflog(const char *refname);
 
 /*
  * Callback to process a reflog entry found by the iteration functions (see
- * below)
+ * below).
+ *
+ * The committer parameter is a single string, in the form
+ * "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" (without double quotes).
+ *
+ * The timestamp parameter gives the time when entry was created as the number
+ * of seconds since the UNIX epoch.
+ *
+ * The tz parameter gives the timezone offset for the user who created
+ * the reflog entry, and its value gives a positive or negative offset
+ * from UTC.  Its absolute value is formed by multiplying the hour
+ * part by 100 and adding the minute part.  For example, 1 hour ahead
+ * of UTC, CET == "+0100", is represented as positive one hundred (not
+ * postiive sixty).
+ *
+ * The msg parameter is a single complete line; a reflog message given
+ * to refs_delete_ref, refs_update_ref, etc. is returned to the
+ * callback normalized---each run of whitespaces are squashed into a
+ * single whitespace, trailing whitespace, if exists, is trimmed, and
+ * then a single LF is added at the end.
+ *
+ * The cb_data is a caller-supplied pointer given to the iterator
+ * functions.
  */
 typedef int each_reflog_ent_fn(
 		struct object_id *old_oid, struct object_id *new_oid,
@@ -612,11 +638,23 @@ struct ref_transaction *ref_transaction_begin(struct strbuf *err);
 #define REF_FORCE_CREATE_REFLOG (1 << 1)
 
 /*
+ * Blindly write an object_id. This is useful for testing data corruption
+ * scenarios.
+ */
+#define REF_SKIP_OID_VERIFICATION (1 << 10)
+
+/*
+ * Skip verifying refname. This is useful for testing data corruption scenarios.
+ */
+#define REF_SKIP_REFNAME_VERIFICATION (1 << 11)
+
+/*
  * Bitmask of all of the flags that are allowed to be passed in to
  * ref_transaction_update() and friends:
  */
-#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
-	(REF_NO_DEREF | REF_FORCE_CREATE_REFLOG)
+#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS                                  \
+	(REF_NO_DEREF | REF_FORCE_CREATE_REFLOG | REF_SKIP_OID_VERIFICATION | \
+	 REF_SKIP_REFNAME_VERIFICATION)
 
 /*
  * Add a reference update to transaction. `new_oid` is the value that
@@ -782,8 +820,7 @@ enum ref_type ref_type(const char *refname);
 enum expire_reflog_flags {
 	EXPIRE_REFLOGS_DRY_RUN = 1 << 0,
 	EXPIRE_REFLOGS_UPDATE_REF = 1 << 1,
-	EXPIRE_REFLOGS_VERBOSE = 1 << 2,
-	EXPIRE_REFLOGS_REWRITE = 1 << 3
+	EXPIRE_REFLOGS_REWRITE = 1 << 2,
 };
 
 /*
diff --git a/refs/debug.c b/refs/debug.c
index 8667c64023..2b0771ca53 100644
--- a/refs/debug.c
+++ b/refs/debug.c
@@ -26,7 +26,8 @@ struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_stor
 	be_copy->name = store->be->name;
 	trace_printf_key(&trace_refs, "ref_store for %s\n", gitdir);
 	res->refs = store;
-	base_ref_store_init((struct ref_store *)res, be_copy);
+	base_ref_store_init((struct ref_store *)res, store->repo, gitdir,
+			    be_copy);
 	return (struct ref_store *)res;
 }
 
@@ -47,7 +48,8 @@ static int debug_transaction_prepare(struct ref_store *refs,
 	transaction->ref_store = drefs->refs;
 	res = drefs->refs->be->transaction_prepare(drefs->refs, transaction,
 						   err);
-	trace_printf_key(&trace_refs, "transaction_prepare: %d\n", res);
+	trace_printf_key(&trace_refs, "transaction_prepare: %d \"%s\"\n", res,
+			 err->buf);
 	return res;
 }
 
@@ -284,6 +286,7 @@ static int debug_print_reflog_ent(struct object_id *old_oid,
 	int ret;
 	char o[GIT_MAX_HEXSZ + 1] = "null";
 	char n[GIT_MAX_HEXSZ + 1] = "null";
+	char *msgend = strchrnul(msg, '\n');
 	if (old_oid)
 		oid_to_hex_r(o, old_oid);
 	if (new_oid)
@@ -291,8 +294,10 @@ static int debug_print_reflog_ent(struct object_id *old_oid,
 
 	ret = dbg->fn(old_oid, new_oid, committer, timestamp, tz, msg,
 		      dbg->cb_data);
-	trace_printf_key(&trace_refs, "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%s\"\n",
-		dbg->refname, ret, o, n, committer, (long int)timestamp, msg);
+	trace_printf_key(&trace_refs,
+			 "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%.*s\"\n",
+			 dbg->refname, ret, o, n, committer,
+			 (long int)timestamp, (int)(msgend - msg), msg);
 	return ret;
 }
 
@@ -339,11 +344,10 @@ static int debug_reflog_exists(struct ref_store *ref_store, const char *refname)
 }
 
 static int debug_create_reflog(struct ref_store *ref_store, const char *refname,
-			       int force_create, struct strbuf *err)
+			       struct strbuf *err)
 {
 	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
-	int res = drefs->refs->be->create_reflog(drefs->refs, refname,
-						 force_create, err);
+	int res = drefs->refs->be->create_reflog(drefs->refs, refname, err);
 	trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);
 	return res;
 }
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 151b0056fe..43a3b882d7 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -16,8 +16,7 @@
  * This backend uses the following flags in `ref_update::flags` for
  * internal bookkeeping purposes. Their numerical values must not
  * conflict with REF_NO_DEREF, REF_FORCE_CREATE_REFLOG, REF_HAVE_NEW,
- * REF_HAVE_OLD, or REF_IS_PRUNING, which are also stored in
- * `ref_update::flags`.
+ * or REF_HAVE_OLD, which are also stored in `ref_update::flags`.
  */
 
 /*
@@ -87,16 +86,12 @@ static struct ref_store *files_ref_store_create(struct repository *repo,
 	struct ref_store *ref_store = (struct ref_store *)refs;
 	struct strbuf sb = STRBUF_INIT;
 
-	ref_store->repo = repo;
-	ref_store->gitdir = xstrdup(gitdir);
-	base_ref_store_init(ref_store, &refs_be_files);
+	base_ref_store_init(ref_store, repo, gitdir, &refs_be_files);
 	refs->store_flags = flags;
-
 	get_common_dir_noenv(&sb, gitdir);
 	refs->gitcommondir = strbuf_detach(&sb, NULL);
-	strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir);
-	refs->packed_ref_store = packed_ref_store_create(repo, sb.buf, flags);
-	strbuf_release(&sb);
+	refs->packed_ref_store =
+		packed_ref_store_create(repo, refs->gitcommondir, flags);
 
 	chdir_notify_reparent("files-backend $GIT_DIR", &refs->base.gitdir);
 	chdir_notify_reparent("files-backend $GIT_COMMONDIR",
@@ -282,10 +277,11 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
 					 create_dir_entry(dir->cache, refname.buf,
 							  refname.len));
 		} else {
+			int ignore_errno;
 			if (!refs_resolve_ref_unsafe(&refs->base,
 						     refname.buf,
 						     RESOLVE_REF_READING,
-						     &oid, &flag)) {
+						     &oid, &flag, &ignore_errno)) {
 				oidclr(&oid);
 				flag |= REF_ISBROKEN;
 			} else if (is_null_oid(&oid)) {
@@ -357,6 +353,7 @@ static int files_read_raw_ref(struct ref_store *ref_store, const char *refname,
 	int fd;
 	int ret = -1;
 	int remaining_retries = 3;
+	int myerr = 0;
 
 	*type = 0;
 	strbuf_reset(&sb_path);
@@ -383,11 +380,13 @@ stat_ref:
 		goto out;
 
 	if (lstat(path, &st) < 0) {
-		if (errno != ENOENT)
+		int ignore_errno;
+		myerr = errno;
+		if (myerr != ENOENT)
 			goto out;
-		if (refs_read_raw_ref(refs->packed_ref_store, refname,
-				      oid, referent, type)) {
-			errno = ENOENT;
+		if (refs_read_raw_ref(refs->packed_ref_store, refname, oid,
+				      referent, type, &ignore_errno)) {
+			myerr = ENOENT;
 			goto out;
 		}
 		ret = 0;
@@ -398,7 +397,8 @@ stat_ref:
 	if (S_ISLNK(st.st_mode)) {
 		strbuf_reset(&sb_contents);
 		if (strbuf_readlink(&sb_contents, path, st.st_size) < 0) {
-			if (errno == ENOENT || errno == EINVAL)
+			myerr = errno;
+			if (myerr == ENOENT || myerr == EINVAL)
 				/* inconsistent with lstat; retry */
 				goto stat_ref;
 			else
@@ -420,14 +420,15 @@ stat_ref:
 
 	/* Is it a directory? */
 	if (S_ISDIR(st.st_mode)) {
+		int ignore_errno;
 		/*
 		 * Even though there is a directory where the loose
 		 * ref is supposed to be, there could still be a
 		 * packed ref:
 		 */
-		if (refs_read_raw_ref(refs->packed_ref_store, refname,
-				      oid, referent, type)) {
-			errno = EISDIR;
+		if (refs_read_raw_ref(refs->packed_ref_store, refname, oid,
+				      referent, type, &ignore_errno)) {
+			myerr = EISDIR;
 			goto out;
 		}
 		ret = 0;
@@ -440,7 +441,8 @@ stat_ref:
 	 */
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
-		if (errno == ENOENT && !S_ISLNK(st.st_mode))
+		myerr = errno;
+		if (myerr == ENOENT && !S_ISLNK(st.st_mode))
 			/* inconsistent with lstat; retry */
 			goto stat_ref;
 		else
@@ -448,26 +450,30 @@ stat_ref:
 	}
 	strbuf_reset(&sb_contents);
 	if (strbuf_read(&sb_contents, fd, 256) < 0) {
-		int save_errno = errno;
+		myerr = errno;
 		close(fd);
-		errno = save_errno;
 		goto out;
 	}
 	close(fd);
 	strbuf_rtrim(&sb_contents);
 	buf = sb_contents.buf;
 
-	ret = parse_loose_ref_contents(buf, oid, referent, type);
+	ret = parse_loose_ref_contents(buf, oid, referent, type, &myerr);
 
 out:
-	*failure_errno = errno;
+	if (ret && !myerr)
+		BUG("returning non-zero %d, should have set myerr!", ret);
+	*failure_errno = myerr;
+
 	strbuf_release(&sb_path);
 	strbuf_release(&sb_contents);
+	errno = 0;
 	return ret;
 }
 
 int parse_loose_ref_contents(const char *buf, struct object_id *oid,
-			     struct strbuf *referent, unsigned int *type)
+			     struct strbuf *referent, unsigned int *type,
+			     int *failure_errno)
 {
 	const char *p;
 	if (skip_prefix(buf, "ref:", &buf)) {
@@ -486,7 +492,7 @@ int parse_loose_ref_contents(const char *buf, struct object_id *oid,
 	if (parse_oid_hex(buf, oid, &p) ||
 	    (*p != '\0' && !isspace(*p))) {
 		*type |= REF_ISBROKEN;
-		errno = EINVAL;
+		*failure_errno = EINVAL;
 		return -1;
 	}
 	return 0;
@@ -995,11 +1001,12 @@ static int create_reflock(const char *path, void *cb)
  * Locks a ref returning the lock on success and NULL on failure.
  */
 static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
-					   const char *refname, int *type,
+					   const char *refname,
 					   struct strbuf *err)
 {
 	struct strbuf ref_file = STRBUF_INIT;
 	struct ref_lock *lock;
+	int ignore_errno;
 
 	files_assert_main_repository(refs, "lock_ref_oid_basic");
 	assert(err);
@@ -1007,16 +1014,6 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
 	CALLOC_ARRAY(lock, 1);
 
 	files_ref_path(refs, &ref_file, refname);
-	if (!refs_resolve_ref_unsafe(&refs->base, refname,
-				     RESOLVE_REF_NO_RECURSE,
-				     &lock->old_oid, type)) {
-		if (!refs_verify_refname_available(&refs->base, refname,
-						   NULL, NULL, err))
-			strbuf_addf(err, "unable to resolve reference '%s': %s",
-				    refname, strerror(errno));
-
-		goto error_return;
-	}
 
 	/*
 	 * If the ref did not exist and we are creating it, make sure
@@ -1036,9 +1033,8 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
 		goto error_return;
 	}
 
-	if (refs_read_ref_full(&refs->base, lock->ref_name,
-			       0,
-			       &lock->old_oid, NULL))
+	if (!refs_resolve_ref_unsafe(&refs->base, lock->ref_name, 0,
+				     &lock->old_oid, NULL, &ignore_errno))
 		oidclr(&lock->old_oid);
 	goto out;
 
@@ -1352,12 +1348,42 @@ static int rename_tmp_log(struct files_ref_store *refs, const char *newrefname)
 }
 
 static int write_ref_to_lockfile(struct ref_lock *lock,
-				 const struct object_id *oid, struct strbuf *err);
+				 const struct object_id *oid,
+				 int skip_oid_verification, struct strbuf *err);
 static int commit_ref_update(struct files_ref_store *refs,
 			     struct ref_lock *lock,
 			     const struct object_id *oid, const char *logmsg,
 			     struct strbuf *err);
 
+/*
+ * Emit a better error message than lockfile.c's
+ * unable_to_lock_message() would in case there is a D/F conflict with
+ * another existing reference. If there would be a conflict, emit an error
+ * message and return false; otherwise, return true.
+ *
+ * Note that this function is not safe against all races with other
+ * processes, and that's not its job. We'll emit a more verbose error on D/f
+ * conflicts if we get past it into lock_ref_oid_basic().
+ */
+static int refs_rename_ref_available(struct ref_store *refs,
+			      const char *old_refname,
+			      const char *new_refname)
+{
+	struct string_list skip = STRING_LIST_INIT_NODUP;
+	struct strbuf err = STRBUF_INIT;
+	int ok;
+
+	string_list_insert(&skip, old_refname);
+	ok = !refs_verify_refname_available(refs, new_refname,
+					    NULL, &skip, &err);
+	if (!ok)
+		error("%s", err.buf);
+
+	string_list_clear(&skip, 0);
+	strbuf_release(&err);
+	return ok;
+}
+
 static int files_copy_or_rename_ref(struct ref_store *ref_store,
 			    const char *oldrefname, const char *newrefname,
 			    const char *logmsg, int copy)
@@ -1373,6 +1399,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	struct strbuf tmp_renamed_log = STRBUF_INIT;
 	int log, ret;
 	struct strbuf err = STRBUF_INIT;
+	int ignore_errno;
 
 	files_reflog_path(refs, &sb_oldref, oldrefname);
 	files_reflog_path(refs, &sb_newref, newrefname);
@@ -1386,7 +1413,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 
 	if (!refs_resolve_ref_unsafe(&refs->base, oldrefname,
 				     RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
-				&orig_oid, &flag)) {
+				     &orig_oid, &flag, &ignore_errno)) {
 		ret = error("refname %s not found", oldrefname);
 		goto out;
 	}
@@ -1430,9 +1457,9 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	 * the safety anyway; we want to delete the reference whatever
 	 * its current value.
 	 */
-	if (!copy && !refs_read_ref_full(&refs->base, newrefname,
-				RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
-				NULL, NULL) &&
+	if (!copy && refs_resolve_ref_unsafe(&refs->base, newrefname,
+					     RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
+					     NULL, NULL, &ignore_errno) &&
 	    refs_delete_ref(&refs->base, NULL, newrefname,
 			    NULL, REF_NO_DEREF)) {
 		if (errno == EISDIR) {
@@ -1458,7 +1485,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 
 	logmoved = log;
 
-	lock = lock_ref_oid_basic(refs, newrefname, NULL, &err);
+	lock = lock_ref_oid_basic(refs, newrefname, &err);
 	if (!lock) {
 		if (copy)
 			error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf);
@@ -1469,7 +1496,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	}
 	oidcpy(&lock->old_oid, &orig_oid);
 
-	if (write_ref_to_lockfile(lock, &orig_oid, &err) ||
+	if (write_ref_to_lockfile(lock, &orig_oid, 0, &err) ||
 	    commit_ref_update(refs, lock, &orig_oid, logmsg, &err)) {
 		error("unable to write current sha1 into %s: %s", newrefname, err.buf);
 		strbuf_release(&err);
@@ -1480,7 +1507,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	goto out;
 
  rollback:
-	lock = lock_ref_oid_basic(refs, oldrefname, NULL, &err);
+	lock = lock_ref_oid_basic(refs, oldrefname, &err);
 	if (!lock) {
 		error("unable to lock %s for rollback: %s", oldrefname, err.buf);
 		strbuf_release(&err);
@@ -1489,7 +1516,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 
 	flag = log_all_ref_updates;
 	log_all_ref_updates = LOG_REFS_NONE;
-	if (write_ref_to_lockfile(lock, &orig_oid, &err) ||
+	if (write_ref_to_lockfile(lock, &orig_oid, 0, &err) ||
 	    commit_ref_update(refs, lock, &orig_oid, NULL, &err)) {
 		error("unable to write current sha1 into %s: %s", oldrefname, err.buf);
 		strbuf_release(&err);
@@ -1639,15 +1666,14 @@ error:
 	return -1;
 }
 
-static int files_create_reflog(struct ref_store *ref_store,
-			       const char *refname, int force_create,
+static int files_create_reflog(struct ref_store *ref_store, const char *refname,
 			       struct strbuf *err)
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_WRITE, "create_reflog");
 	int fd;
 
-	if (log_ref_setup(refs, refname, force_create, &fd, err))
+	if (log_ref_setup(refs, refname, 1, &fd, err))
 		return -1;
 
 	if (fd >= 0)
@@ -1725,26 +1751,31 @@ static int files_log_ref_write(struct files_ref_store *refs,
  * errors, rollback the lockfile, fill in *err and return -1.
  */
 static int write_ref_to_lockfile(struct ref_lock *lock,
-				 const struct object_id *oid, struct strbuf *err)
+				 const struct object_id *oid,
+				 int skip_oid_verification, struct strbuf *err)
 {
 	static char term = '\n';
 	struct object *o;
 	int fd;
 
-	o = parse_object(the_repository, oid);
-	if (!o) {
-		strbuf_addf(err,
-			    "trying to write ref '%s' with nonexistent object %s",
-			    lock->ref_name, oid_to_hex(oid));
-		unlock_ref(lock);
-		return -1;
-	}
-	if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
-		strbuf_addf(err,
-			    "trying to write non-commit object %s to branch '%s'",
-			    oid_to_hex(oid), lock->ref_name);
-		unlock_ref(lock);
-		return -1;
+	if (!skip_oid_verification) {
+		o = parse_object(the_repository, oid);
+		if (!o) {
+			strbuf_addf(
+				err,
+				"trying to write ref '%s' with nonexistent object %s",
+				lock->ref_name, oid_to_hex(oid));
+			unlock_ref(lock);
+			return -1;
+		}
+		if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
+			strbuf_addf(
+				err,
+				"trying to write non-commit object %s to branch '%s'",
+				oid_to_hex(oid), lock->ref_name);
+			unlock_ref(lock);
+			return -1;
+		}
 	}
 	fd = get_lock_file_fd(&lock->lk);
 	if (write_in_full(fd, oid_to_hex(oid), the_hash_algo->hexsz) < 0 ||
@@ -1797,10 +1828,12 @@ static int commit_ref_update(struct files_ref_store *refs,
 		 */
 		int head_flag;
 		const char *head_ref;
+		int ignore_errno;
 
 		head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD",
 						   RESOLVE_REF_READING,
-						   NULL, &head_flag);
+						   NULL, &head_flag,
+						   &ignore_errno);
 		if (head_ref && (head_flag & REF_ISSYMREF) &&
 		    !strcmp(head_ref, lock->ref_name)) {
 			struct strbuf log_err = STRBUF_INIT;
@@ -1844,9 +1877,12 @@ static void update_symref_reflog(struct files_ref_store *refs,
 {
 	struct strbuf err = STRBUF_INIT;
 	struct object_id new_oid;
+	int ignore_errno;
+
 	if (logmsg &&
-	    !refs_read_ref_full(&refs->base, target,
-				RESOLVE_REF_READING, &new_oid, NULL) &&
+	    refs_resolve_ref_unsafe(&refs->base, target,
+				    RESOLVE_REF_READING, &new_oid, NULL,
+				    &ignore_errno) &&
 	    files_log_ref_write(refs, refname, &lock->old_oid,
 				&new_oid, logmsg, 0, &err)) {
 		error("%s", err.buf);
@@ -1887,7 +1923,7 @@ static int files_create_symref(struct ref_store *ref_store,
 	struct ref_lock *lock;
 	int ret;
 
-	lock = lock_ref_oid_basic(refs, refname, NULL, &err);
+	lock = lock_ref_oid_basic(refs, refname, &err);
 	if (!lock) {
 		error("%s", err.buf);
 		strbuf_release(&err);
@@ -2120,6 +2156,7 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
 		(struct files_reflog_iterator *)ref_iterator;
 	struct dir_iterator *diter = iter->dir_iterator;
 	int ok;
+	int ignore_errno;
 
 	while ((ok = dir_iterator_advance(diter)) == ITER_OK) {
 		int flags;
@@ -2131,9 +2168,10 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
 		if (ends_with(diter->basename, ".lock"))
 			continue;
 
-		if (refs_read_ref_full(iter->ref_store,
-				       diter->relative_path, 0,
-				       &iter->oid, &flags)) {
+		if (!refs_resolve_ref_unsafe(iter->ref_store,
+					     diter->relative_path, 0,
+					     &iter->oid, &flags,
+					     &ignore_errno)) {
 			error("bad ref for %s", diter->path.buf);
 			continue;
 		}
@@ -2151,7 +2189,7 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
 }
 
 static int files_reflog_iterator_peel(struct ref_iterator *ref_iterator,
-				   struct object_id *peeled)
+				      struct object_id *peeled)
 {
 	BUG("ref_iterator_peel() called for reflog_iterator");
 }
@@ -2477,9 +2515,11 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 			 * the transaction, so we have to read it here
 			 * to record and possibly check old_oid:
 			 */
-			if (refs_read_ref_full(&refs->base,
-					       referent.buf, 0,
-					       &lock->old_oid, NULL)) {
+			int ignore_errno;
+			if (!refs_resolve_ref_unsafe(&refs->base,
+						     referent.buf, 0,
+						     &lock->old_oid, NULL,
+						     &ignore_errno)) {
 				if (update->flags & REF_HAVE_OLD) {
 					strbuf_addf(err, "cannot lock ref '%s': "
 						    "error reading reference",
@@ -2535,8 +2575,10 @@ static int lock_ref_for_update(struct files_ref_store *refs,
 			 * The reference already has the desired
 			 * value, so we don't need to write it.
 			 */
-		} else if (write_ref_to_lockfile(lock, &update->new_oid,
-						 err)) {
+		} else if (write_ref_to_lockfile(
+				   lock, &update->new_oid,
+				   update->flags & REF_SKIP_OID_VERIFICATION,
+				   err)) {
 			char *write_err = strbuf_detach(err, NULL);
 
 			/*
@@ -3039,11 +3081,12 @@ cleanup:
 }
 
 struct expire_reflog_cb {
-	unsigned int flags;
 	reflog_expiry_should_prune_fn *should_prune_fn;
 	void *policy_cb;
 	FILE *newlog;
 	struct object_id last_kept_oid;
+	unsigned int rewrite:1,
+		     dry_run:1;
 };
 
 static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
@@ -3051,33 +3094,27 @@ static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
 			     const char *message, void *cb_data)
 {
 	struct expire_reflog_cb *cb = cb_data;
-	struct expire_reflog_policy_cb *policy_cb = cb->policy_cb;
+	reflog_expiry_should_prune_fn *fn = cb->should_prune_fn;
 
-	if (cb->flags & EXPIRE_REFLOGS_REWRITE)
+	if (cb->rewrite)
 		ooid = &cb->last_kept_oid;
 
-	if ((*cb->should_prune_fn)(ooid, noid, email, timestamp, tz,
-				   message, policy_cb)) {
-		if (!cb->newlog)
-			printf("would prune %s", message);
-		else if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
-			printf("prune %s", message);
-	} else {
-		if (cb->newlog) {
-			fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s",
-				oid_to_hex(ooid), oid_to_hex(noid),
-				email, timestamp, tz, message);
-			oidcpy(&cb->last_kept_oid, noid);
-		}
-		if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
-			printf("keep %s", message);
-	}
+	if (fn(ooid, noid, email, timestamp, tz, message, cb->policy_cb))
+		return 0;
+
+	if (cb->dry_run)
+		return 0; /* --dry-run */
+
+	fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s", oid_to_hex(ooid),
+		oid_to_hex(noid), email, timestamp, tz, message);
+	oidcpy(&cb->last_kept_oid, noid);
+
 	return 0;
 }
 
 static int files_reflog_expire(struct ref_store *ref_store,
 			       const char *refname,
-			       unsigned int flags,
+			       unsigned int expire_flags,
 			       reflog_expiry_prepare_fn prepare_fn,
 			       reflog_expiry_should_prune_fn should_prune_fn,
 			       reflog_expiry_cleanup_fn cleanup_fn,
@@ -3091,12 +3128,12 @@ static int files_reflog_expire(struct ref_store *ref_store,
 	struct strbuf log_file_sb = STRBUF_INIT;
 	char *log_file;
 	int status = 0;
-	int type;
 	struct strbuf err = STRBUF_INIT;
 	const struct object_id *oid;
 
 	memset(&cb, 0, sizeof(cb));
-	cb.flags = flags;
+	cb.rewrite = !!(expire_flags & EXPIRE_REFLOGS_REWRITE);
+	cb.dry_run = !!(expire_flags & EXPIRE_REFLOGS_DRY_RUN);
 	cb.policy_cb = policy_cb_data;
 	cb.should_prune_fn = should_prune_fn;
 
@@ -3105,7 +3142,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
 	 * reference itself, plus we might need to update the
 	 * reference if --updateref was specified:
 	 */
-	lock = lock_ref_oid_basic(refs, refname, &type, &err);
+	lock = lock_ref_oid_basic(refs, refname, &err);
 	if (!lock) {
 		error("cannot lock ref '%s': %s", refname, err.buf);
 		strbuf_release(&err);
@@ -3132,7 +3169,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
 
 	files_reflog_path(refs, &log_file_sb, refname);
 	log_file = strbuf_detach(&log_file_sb, NULL);
-	if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
+	if (!cb.dry_run) {
 		/*
 		 * Even though holding $GIT_DIR/logs/$reflog.lock has
 		 * no locking implications, we use the lock_file
@@ -3159,7 +3196,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
 	refs_for_each_reflog_ent(ref_store, refname, expire_reflog_ent, &cb);
 	(*cleanup_fn)(cb.policy_cb);
 
-	if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
+	if (!cb.dry_run) {
 		/*
 		 * It doesn't make sense to adjust a reference pointed
 		 * to by a symbolic ref based on expiring entries in
@@ -3167,9 +3204,20 @@ static int files_reflog_expire(struct ref_store *ref_store,
 		 * a reference if there are no remaining reflog
 		 * entries.
 		 */
-		int update = (flags & EXPIRE_REFLOGS_UPDATE_REF) &&
-			!(type & REF_ISSYMREF) &&
-			!is_null_oid(&cb.last_kept_oid);
+		int update = 0;
+
+		if ((expire_flags & EXPIRE_REFLOGS_UPDATE_REF) &&
+		    !is_null_oid(&cb.last_kept_oid)) {
+			int ignore_errno;
+			int type;
+			const char *ref;
+
+			ref = refs_resolve_ref_unsafe(&refs->base, refname,
+						      RESOLVE_REF_NO_RECURSE,
+						      NULL, &type,
+						      &ignore_errno);
+			update = !!(ref && !(type & REF_ISSYMREF));
+		}
 
 		if (close_lock_file_gently(&reflog_lock)) {
 			status |= error("couldn't write %s: %s", log_file,
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 1c5211b03e..d91a2018f6 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -194,20 +194,19 @@ static int release_snapshot(struct snapshot *snapshot)
 }
 
 struct ref_store *packed_ref_store_create(struct repository *repo,
-					  const char *path,
+					  const char *gitdir,
 					  unsigned int store_flags)
 {
 	struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
 	struct ref_store *ref_store = (struct ref_store *)refs;
+	struct strbuf sb = STRBUF_INIT;
 
-	base_ref_store_init(ref_store, &refs_be_packed);
-	ref_store->repo = repo;
-	ref_store->gitdir = xstrdup(path);
+	base_ref_store_init(ref_store, repo, gitdir, &refs_be_packed);
 	refs->store_flags = store_flags;
 
-	refs->path = xstrdup(path);
+	strbuf_addf(&sb, "%s/packed-refs", gitdir);
+	refs->path = strbuf_detach(&sb, NULL);
 	chdir_notify_reparent("packed-refs", &refs->path);
-
 	return ref_store;
 }
 
@@ -1354,6 +1353,7 @@ int is_packed_transaction_needed(struct ref_store *ref_store,
 	ret = 0;
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
+		int failure_errno;
 		unsigned int type;
 		struct object_id oid;
 
@@ -1364,9 +1364,9 @@ int is_packed_transaction_needed(struct ref_store *ref_store,
 			 */
 			continue;
 
-		if (!refs_read_raw_ref(ref_store, update->refname,
-				       &oid, &referent, &type) ||
-		    errno != ENOENT) {
+		if (!refs_read_raw_ref(ref_store, update->refname, &oid,
+				       &referent, &type, &failure_errno) ||
+		    failure_errno != ENOENT) {
 			/*
 			 * We have to actually delete that reference
 			 * -> this transaction is needed.
@@ -1628,8 +1628,7 @@ static int packed_reflog_exists(struct ref_store *ref_store,
 }
 
 static int packed_create_reflog(struct ref_store *ref_store,
-			       const char *refname, int force_create,
-			       struct strbuf *err)
+				const char *refname, struct strbuf *err)
 {
 	BUG("packed reference store does not support reflogs");
 }
diff --git a/refs/packed-backend.h b/refs/packed-backend.h
index f61a73ec25..9dd8a344c3 100644
--- a/refs/packed-backend.h
+++ b/refs/packed-backend.h
@@ -14,7 +14,7 @@ struct ref_transaction;
  */
 
 struct ref_store *packed_ref_store_create(struct repository *repo,
-					  const char *path,
+					  const char *gitdir,
 					  unsigned int store_flags);
 
 /*
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 12224742ed..7ff6fba4f0 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -150,9 +150,9 @@ struct ref_update {
 	const char refname[FLEX_ARRAY];
 };
 
-int refs_read_raw_ref(struct ref_store *ref_store,
-		      const char *refname, struct object_id *oid,
-		      struct strbuf *referent, unsigned int *type);
+int refs_read_raw_ref(struct ref_store *ref_store, const char *refname,
+		      struct object_id *oid, struct strbuf *referent,
+		      unsigned int *type, int *failure_errno);
 
 /*
  * Write an error to `err` and return a nonzero value iff the same
@@ -229,20 +229,6 @@ const char *find_descendant_ref(const char *dirname,
 				const struct string_list *extras,
 				const struct string_list *skip);
 
-/*
- * Check whether an attempt to rename old_refname to new_refname would
- * cause a D/F conflict with any existing reference (other than
- * possibly old_refname). If there would be a conflict, emit an error
- * message and return false; otherwise, return true.
- *
- * Note that this function is not safe against all races with other
- * processes (though rename_ref() catches some races that might get by
- * this check).
- */
-int refs_rename_ref_available(struct ref_store *refs,
-			      const char *old_refname,
-			      const char *new_refname);
-
 /* We allow "recursive" symbolic refs. Only within reason, though */
 #define SYMREF_MAXDEPTH 5
 
@@ -606,7 +592,7 @@ typedef int for_each_reflog_ent_reverse_fn(struct ref_store *ref_store,
 					   void *cb_data);
 typedef int reflog_exists_fn(struct ref_store *ref_store, const char *refname);
 typedef int create_reflog_fn(struct ref_store *ref_store, const char *refname,
-			     int force_create, struct strbuf *err);
+			     struct strbuf *err);
 typedef int delete_reflog_fn(struct ref_store *ref_store, const char *refname);
 typedef int reflog_expire_fn(struct ref_store *ref_store,
 			     const char *refname,
@@ -713,17 +699,19 @@ struct ref_store {
 };
 
 /*
- * Parse contents of a loose ref file.
+ * Parse contents of a loose ref file. *failure_errno maybe be set to EINVAL for
+ * invalid contents.
  */
 int parse_loose_ref_contents(const char *buf, struct object_id *oid,
-			     struct strbuf *referent, unsigned int *type);
+			     struct strbuf *referent, unsigned int *type,
+			     int *failure_errno);
 
 /*
  * Fill in the generic part of refs and add it to our collection of
  * reference stores.
  */
-void base_ref_store_init(struct ref_store *refs,
-			 const struct ref_storage_be *be);
+void base_ref_store_init(struct ref_store *refs, struct repository *repo,
+			 const char *path, const struct ref_storage_be *be);
 
 /*
  * Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance.
diff --git a/reftable/LICENSE b/reftable/LICENSE
new file mode 100644
index 0000000000..402e0f9356
--- /dev/null
+++ b/reftable/LICENSE
@@ -0,0 +1,31 @@
+BSD License
+
+Copyright (c) 2020, Google LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+* Neither the name of Google LLC nor the names of its contributors may
+be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/reftable/basics.c b/reftable/basics.c
new file mode 100644
index 0000000000..f761e48028
--- /dev/null
+++ b/reftable/basics.c
@@ -0,0 +1,128 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+
+void put_be24(uint8_t *out, uint32_t i)
+{
+	out[0] = (uint8_t)((i >> 16) & 0xff);
+	out[1] = (uint8_t)((i >> 8) & 0xff);
+	out[2] = (uint8_t)(i & 0xff);
+}
+
+uint32_t get_be24(uint8_t *in)
+{
+	return (uint32_t)(in[0]) << 16 | (uint32_t)(in[1]) << 8 |
+	       (uint32_t)(in[2]);
+}
+
+void put_be16(uint8_t *out, uint16_t i)
+{
+	out[0] = (uint8_t)((i >> 8) & 0xff);
+	out[1] = (uint8_t)(i & 0xff);
+}
+
+int binsearch(size_t sz, int (*f)(size_t k, void *args), void *args)
+{
+	size_t lo = 0;
+	size_t hi = sz;
+
+	/* Invariants:
+	 *
+	 *  (hi == sz) || f(hi) == true
+	 *  (lo == 0 && f(0) == true) || fi(lo) == false
+	 */
+	while (hi - lo > 1) {
+		size_t mid = lo + (hi - lo) / 2;
+
+		if (f(mid, args))
+			hi = mid;
+		else
+			lo = mid;
+	}
+
+	if (lo)
+		return hi;
+
+	return f(0, args) ? 0 : 1;
+}
+
+void free_names(char **a)
+{
+	char **p;
+	if (!a) {
+		return;
+	}
+	for (p = a; *p; p++) {
+		reftable_free(*p);
+	}
+	reftable_free(a);
+}
+
+int names_length(char **names)
+{
+	char **p = names;
+	for (; *p; p++) {
+		/* empty */
+	}
+	return p - names;
+}
+
+void parse_names(char *buf, int size, char ***namesp)
+{
+	char **names = NULL;
+	size_t names_cap = 0;
+	size_t names_len = 0;
+
+	char *p = buf;
+	char *end = buf + size;
+	while (p < end) {
+		char *next = strchr(p, '\n');
+		if (next && next < end) {
+			*next = 0;
+		} else {
+			next = end;
+		}
+		if (p < next) {
+			if (names_len == names_cap) {
+				names_cap = 2 * names_cap + 1;
+				names = reftable_realloc(
+					names, names_cap * sizeof(*names));
+			}
+			names[names_len++] = xstrdup(p);
+		}
+		p = next + 1;
+	}
+
+	names = reftable_realloc(names, (names_len + 1) * sizeof(*names));
+	names[names_len] = NULL;
+	*namesp = names;
+}
+
+int names_equal(char **a, char **b)
+{
+	int i = 0;
+	for (; a[i] && b[i]; i++) {
+		if (strcmp(a[i], b[i])) {
+			return 0;
+		}
+	}
+
+	return a[i] == b[i];
+}
+
+int common_prefix_size(struct strbuf *a, struct strbuf *b)
+{
+	int p = 0;
+	for (; p < a->len && p < b->len; p++) {
+		if (a->buf[p] != b->buf[p])
+			break;
+	}
+
+	return p;
+}
diff --git a/reftable/basics.h b/reftable/basics.h
new file mode 100644
index 0000000000..096b36862b
--- /dev/null
+++ b/reftable/basics.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef BASICS_H
+#define BASICS_H
+
+/*
+ * miscellaneous utilities that are not provided by Git.
+ */
+
+#include "system.h"
+
+/* Bigendian en/decoding of integers */
+
+void put_be24(uint8_t *out, uint32_t i);
+uint32_t get_be24(uint8_t *in);
+void put_be16(uint8_t *out, uint16_t i);
+
+/*
+ * find smallest index i in [0, sz) at which f(i) is true, assuming
+ * that f is ascending. Return sz if f(i) is false for all indices.
+ *
+ * Contrary to bsearch(3), this returns something useful if the argument is not
+ * found.
+ */
+int binsearch(size_t sz, int (*f)(size_t k, void *args), void *args);
+
+/*
+ * Frees a NULL terminated array of malloced strings. The array itself is also
+ * freed.
+ */
+void free_names(char **a);
+
+/* parse a newline separated list of names. `size` is the length of the buffer,
+ * without terminating '\0'. Empty names are discarded. */
+void parse_names(char *buf, int size, char ***namesp);
+
+/* compares two NULL-terminated arrays of strings. */
+int names_equal(char **a, char **b);
+
+/* returns the array size of a NULL-terminated array of strings. */
+int names_length(char **names);
+
+/* Allocation routines; they invoke the functions set through
+ * reftable_set_alloc() */
+void *reftable_malloc(size_t sz);
+void *reftable_realloc(void *p, size_t sz);
+void reftable_free(void *p);
+void *reftable_calloc(size_t sz);
+
+/* Find the longest shared prefix size of `a` and `b` */
+struct strbuf;
+int common_prefix_size(struct strbuf *a, struct strbuf *b);
+
+#endif
diff --git a/reftable/basics_test.c b/reftable/basics_test.c
new file mode 100644
index 0000000000..1fcd229725
--- /dev/null
+++ b/reftable/basics_test.c
@@ -0,0 +1,98 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+struct binsearch_args {
+	int key;
+	int *arr;
+};
+
+static int binsearch_func(size_t i, void *void_args)
+{
+	struct binsearch_args *args = void_args;
+
+	return args->key < args->arr[i];
+}
+
+static void test_binsearch(void)
+{
+	int arr[] = { 2, 4, 6, 8, 10 };
+	size_t sz = ARRAY_SIZE(arr);
+	struct binsearch_args args = {
+		.arr = arr,
+	};
+
+	int i = 0;
+	for (i = 1; i < 11; i++) {
+		int res;
+		args.key = i;
+		res = binsearch(sz, &binsearch_func, &args);
+
+		if (res < sz) {
+			EXPECT(args.key < arr[res]);
+			if (res > 0) {
+				EXPECT(args.key >= arr[res - 1]);
+			}
+		} else {
+			EXPECT(args.key == 10 || args.key == 11);
+		}
+	}
+}
+
+static void test_names_length(void)
+{
+	char *a[] = { "a", "b", NULL };
+	EXPECT(names_length(a) == 2);
+}
+
+static void test_parse_names_normal(void)
+{
+	char in[] = "a\nb\n";
+	char **out = NULL;
+	parse_names(in, strlen(in), &out);
+	EXPECT(!strcmp(out[0], "a"));
+	EXPECT(!strcmp(out[1], "b"));
+	EXPECT(!out[2]);
+	free_names(out);
+}
+
+static void test_parse_names_drop_empty(void)
+{
+	char in[] = "a\n\n";
+	char **out = NULL;
+	parse_names(in, strlen(in), &out);
+	EXPECT(!strcmp(out[0], "a"));
+	EXPECT(!out[1]);
+	free_names(out);
+}
+
+static void test_common_prefix(void)
+{
+	struct strbuf s1 = STRBUF_INIT;
+	struct strbuf s2 = STRBUF_INIT;
+	strbuf_addstr(&s1, "abcdef");
+	strbuf_addstr(&s2, "abc");
+	EXPECT(common_prefix_size(&s1, &s2) == 3);
+	strbuf_release(&s1);
+	strbuf_release(&s2);
+}
+
+int basics_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_common_prefix);
+	RUN_TEST(test_parse_names_normal);
+	RUN_TEST(test_parse_names_drop_empty);
+	RUN_TEST(test_binsearch);
+	RUN_TEST(test_names_length);
+	return 0;
+}
diff --git a/reftable/block.c b/reftable/block.c
new file mode 100644
index 0000000000..855e3f5c94
--- /dev/null
+++ b/reftable/block.c
@@ -0,0 +1,437 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "block.h"
+
+#include "blocksource.h"
+#include "constants.h"
+#include "record.h"
+#include "reftable-error.h"
+#include "system.h"
+#include <zlib.h>
+
+int header_size(int version)
+{
+	switch (version) {
+	case 1:
+		return 24;
+	case 2:
+		return 28;
+	}
+	abort();
+}
+
+int footer_size(int version)
+{
+	switch (version) {
+	case 1:
+		return 68;
+	case 2:
+		return 72;
+	}
+	abort();
+}
+
+static int block_writer_register_restart(struct block_writer *w, int n,
+					 int is_restart, struct strbuf *key)
+{
+	int rlen = w->restart_len;
+	if (rlen >= MAX_RESTARTS) {
+		is_restart = 0;
+	}
+
+	if (is_restart) {
+		rlen++;
+	}
+	if (2 + 3 * rlen + n > w->block_size - w->next)
+		return -1;
+	if (is_restart) {
+		if (w->restart_len == w->restart_cap) {
+			w->restart_cap = w->restart_cap * 2 + 1;
+			w->restarts = reftable_realloc(
+				w->restarts, sizeof(uint32_t) * w->restart_cap);
+		}
+
+		w->restarts[w->restart_len++] = w->next;
+	}
+
+	w->next += n;
+
+	strbuf_reset(&w->last_key);
+	strbuf_addbuf(&w->last_key, key);
+	w->entries++;
+	return 0;
+}
+
+void block_writer_init(struct block_writer *bw, uint8_t typ, uint8_t *buf,
+		       uint32_t block_size, uint32_t header_off, int hash_size)
+{
+	bw->buf = buf;
+	bw->hash_size = hash_size;
+	bw->block_size = block_size;
+	bw->header_off = header_off;
+	bw->buf[header_off] = typ;
+	bw->next = header_off + 4;
+	bw->restart_interval = 16;
+	bw->entries = 0;
+	bw->restart_len = 0;
+	bw->last_key.len = 0;
+}
+
+uint8_t block_writer_type(struct block_writer *bw)
+{
+	return bw->buf[bw->header_off];
+}
+
+/* adds the reftable_record to the block. Returns -1 if it does not fit, 0 on
+   success */
+int block_writer_add(struct block_writer *w, struct reftable_record *rec)
+{
+	struct strbuf empty = STRBUF_INIT;
+	struct strbuf last =
+		w->entries % w->restart_interval == 0 ? empty : w->last_key;
+	struct string_view out = {
+		.buf = w->buf + w->next,
+		.len = w->block_size - w->next,
+	};
+
+	struct string_view start = out;
+
+	int is_restart = 0;
+	struct strbuf key = STRBUF_INIT;
+	int n = 0;
+
+	reftable_record_key(rec, &key);
+	n = reftable_encode_key(&is_restart, out, last, key,
+				reftable_record_val_type(rec));
+	if (n < 0)
+		goto done;
+	string_view_consume(&out, n);
+
+	n = reftable_record_encode(rec, out, w->hash_size);
+	if (n < 0)
+		goto done;
+	string_view_consume(&out, n);
+
+	if (block_writer_register_restart(w, start.len - out.len, is_restart,
+					  &key) < 0)
+		goto done;
+
+	strbuf_release(&key);
+	return 0;
+
+done:
+	strbuf_release(&key);
+	return -1;
+}
+
+int block_writer_finish(struct block_writer *w)
+{
+	int i;
+	for (i = 0; i < w->restart_len; i++) {
+		put_be24(w->buf + w->next, w->restarts[i]);
+		w->next += 3;
+	}
+
+	put_be16(w->buf + w->next, w->restart_len);
+	w->next += 2;
+	put_be24(w->buf + 1 + w->header_off, w->next);
+
+	if (block_writer_type(w) == BLOCK_TYPE_LOG) {
+		int block_header_skip = 4 + w->header_off;
+		uLongf src_len = w->next - block_header_skip;
+		uLongf dest_cap = src_len * 1.001 + 12;
+
+		uint8_t *compressed = reftable_malloc(dest_cap);
+		while (1) {
+			uLongf out_dest_len = dest_cap;
+			int zresult = compress2(compressed, &out_dest_len,
+						w->buf + block_header_skip,
+						src_len, 9);
+			if (zresult == Z_BUF_ERROR && dest_cap < LONG_MAX) {
+				dest_cap *= 2;
+				compressed =
+					reftable_realloc(compressed, dest_cap);
+				if (compressed)
+					continue;
+			}
+
+			if (Z_OK != zresult) {
+				reftable_free(compressed);
+				return REFTABLE_ZLIB_ERROR;
+			}
+
+			memcpy(w->buf + block_header_skip, compressed,
+			       out_dest_len);
+			w->next = out_dest_len + block_header_skip;
+			reftable_free(compressed);
+			break;
+		}
+	}
+	return w->next;
+}
+
+uint8_t block_reader_type(struct block_reader *r)
+{
+	return r->block.data[r->header_off];
+}
+
+int block_reader_init(struct block_reader *br, struct reftable_block *block,
+		      uint32_t header_off, uint32_t table_block_size,
+		      int hash_size)
+{
+	uint32_t full_block_size = table_block_size;
+	uint8_t typ = block->data[header_off];
+	uint32_t sz = get_be24(block->data + header_off + 1);
+
+	uint16_t restart_count = 0;
+	uint32_t restart_start = 0;
+	uint8_t *restart_bytes = NULL;
+
+	if (!reftable_is_block_type(typ))
+		return REFTABLE_FORMAT_ERROR;
+
+	if (typ == BLOCK_TYPE_LOG) {
+		int block_header_skip = 4 + header_off;
+		uLongf dst_len = sz - block_header_skip; /* total size of dest
+							    buffer. */
+		uLongf src_len = block->len - block_header_skip;
+		/* Log blocks specify the *uncompressed* size in their header.
+		 */
+		uint8_t *uncompressed = reftable_malloc(sz);
+
+		/* Copy over the block header verbatim. It's not compressed. */
+		memcpy(uncompressed, block->data, block_header_skip);
+
+		/* Uncompress */
+		if (Z_OK !=
+		    uncompress2(uncompressed + block_header_skip, &dst_len,
+				block->data + block_header_skip, &src_len)) {
+			reftable_free(uncompressed);
+			return REFTABLE_ZLIB_ERROR;
+		}
+
+		if (dst_len + block_header_skip != sz)
+			return REFTABLE_FORMAT_ERROR;
+
+		/* We're done with the input data. */
+		reftable_block_done(block);
+		block->data = uncompressed;
+		block->len = sz;
+		block->source = malloc_block_source();
+		full_block_size = src_len + block_header_skip;
+	} else if (full_block_size == 0) {
+		full_block_size = sz;
+	} else if (sz < full_block_size && sz < block->len &&
+		   block->data[sz] != 0) {
+		/* If the block is smaller than the full block size, it is
+		   padded (data followed by '\0') or the next block is
+		   unaligned. */
+		full_block_size = sz;
+	}
+
+	restart_count = get_be16(block->data + sz - 2);
+	restart_start = sz - 2 - 3 * restart_count;
+	restart_bytes = block->data + restart_start;
+
+	/* transfer ownership. */
+	br->block = *block;
+	block->data = NULL;
+	block->len = 0;
+
+	br->hash_size = hash_size;
+	br->block_len = restart_start;
+	br->full_block_size = full_block_size;
+	br->header_off = header_off;
+	br->restart_count = restart_count;
+	br->restart_bytes = restart_bytes;
+
+	return 0;
+}
+
+static uint32_t block_reader_restart_offset(struct block_reader *br, int i)
+{
+	return get_be24(br->restart_bytes + 3 * i);
+}
+
+void block_reader_start(struct block_reader *br, struct block_iter *it)
+{
+	it->br = br;
+	strbuf_reset(&it->last_key);
+	it->next_off = br->header_off + 4;
+}
+
+struct restart_find_args {
+	int error;
+	struct strbuf key;
+	struct block_reader *r;
+};
+
+static int restart_key_less(size_t idx, void *args)
+{
+	struct restart_find_args *a = args;
+	uint32_t off = block_reader_restart_offset(a->r, idx);
+	struct string_view in = {
+		.buf = a->r->block.data + off,
+		.len = a->r->block_len - off,
+	};
+
+	/* the restart key is verbatim in the block, so this could avoid the
+	   alloc for decoding the key */
+	struct strbuf rkey = STRBUF_INIT;
+	struct strbuf last_key = STRBUF_INIT;
+	uint8_t unused_extra;
+	int n = reftable_decode_key(&rkey, &unused_extra, last_key, in);
+	int result;
+	if (n < 0) {
+		a->error = 1;
+		return -1;
+	}
+
+	result = strbuf_cmp(&a->key, &rkey);
+	strbuf_release(&rkey);
+	return result;
+}
+
+void block_iter_copy_from(struct block_iter *dest, struct block_iter *src)
+{
+	dest->br = src->br;
+	dest->next_off = src->next_off;
+	strbuf_reset(&dest->last_key);
+	strbuf_addbuf(&dest->last_key, &src->last_key);
+}
+
+int block_iter_next(struct block_iter *it, struct reftable_record *rec)
+{
+	struct string_view in = {
+		.buf = it->br->block.data + it->next_off,
+		.len = it->br->block_len - it->next_off,
+	};
+	struct string_view start = in;
+	struct strbuf key = STRBUF_INIT;
+	uint8_t extra = 0;
+	int n = 0;
+
+	if (it->next_off >= it->br->block_len)
+		return 1;
+
+	n = reftable_decode_key(&key, &extra, it->last_key, in);
+	if (n < 0)
+		return -1;
+
+	string_view_consume(&in, n);
+	n = reftable_record_decode(rec, key, extra, in, it->br->hash_size);
+	if (n < 0)
+		return -1;
+	string_view_consume(&in, n);
+
+	strbuf_reset(&it->last_key);
+	strbuf_addbuf(&it->last_key, &key);
+	it->next_off += start.len - in.len;
+	strbuf_release(&key);
+	return 0;
+}
+
+int block_reader_first_key(struct block_reader *br, struct strbuf *key)
+{
+	struct strbuf empty = STRBUF_INIT;
+	int off = br->header_off + 4;
+	struct string_view in = {
+		.buf = br->block.data + off,
+		.len = br->block_len - off,
+	};
+
+	uint8_t extra = 0;
+	int n = reftable_decode_key(key, &extra, empty, in);
+	if (n < 0)
+		return n;
+
+	return 0;
+}
+
+int block_iter_seek(struct block_iter *it, struct strbuf *want)
+{
+	return block_reader_seek(it->br, it, want);
+}
+
+void block_iter_close(struct block_iter *it)
+{
+	strbuf_release(&it->last_key);
+}
+
+int block_reader_seek(struct block_reader *br, struct block_iter *it,
+		      struct strbuf *want)
+{
+	struct restart_find_args args = {
+		.key = *want,
+		.r = br,
+	};
+	struct reftable_record rec = reftable_new_record(block_reader_type(br));
+	struct strbuf key = STRBUF_INIT;
+	int err = 0;
+	struct block_iter next = {
+		.last_key = STRBUF_INIT,
+	};
+
+	int i = binsearch(br->restart_count, &restart_key_less, &args);
+	if (args.error) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
+	it->br = br;
+	if (i > 0) {
+		i--;
+		it->next_off = block_reader_restart_offset(br, i);
+	} else {
+		it->next_off = br->header_off + 4;
+	}
+
+	/* We're looking for the last entry less/equal than the wanted key, so
+	   we have to go one entry too far and then back up.
+	*/
+	while (1) {
+		block_iter_copy_from(&next, it);
+		err = block_iter_next(&next, &rec);
+		if (err < 0)
+			goto done;
+
+		reftable_record_key(&rec, &key);
+		if (err > 0 || strbuf_cmp(&key, want) >= 0) {
+			err = 0;
+			goto done;
+		}
+
+		block_iter_copy_from(it, &next);
+	}
+
+done:
+	strbuf_release(&key);
+	strbuf_release(&next.last_key);
+	reftable_record_destroy(&rec);
+
+	return err;
+}
+
+void block_writer_release(struct block_writer *bw)
+{
+	FREE_AND_NULL(bw->restarts);
+	strbuf_release(&bw->last_key);
+	/* the block is not owned. */
+}
+
+void reftable_block_done(struct reftable_block *blockp)
+{
+	struct reftable_block_source source = blockp->source;
+	if (blockp && source.ops)
+		source.ops->return_block(source.arg, blockp);
+	blockp->data = NULL;
+	blockp->len = 0;
+	blockp->source.ops = NULL;
+	blockp->source.arg = NULL;
+}
diff --git a/reftable/block.h b/reftable/block.h
new file mode 100644
index 0000000000..87c77539b5
--- /dev/null
+++ b/reftable/block.h
@@ -0,0 +1,127 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef BLOCK_H
+#define BLOCK_H
+
+#include "basics.h"
+#include "record.h"
+#include "reftable-blocksource.h"
+
+/*
+ * Writes reftable blocks. The block_writer is reused across blocks to minimize
+ * allocation overhead.
+ */
+struct block_writer {
+	uint8_t *buf;
+	uint32_t block_size;
+
+	/* Offset of the global header. Nonzero in the first block only. */
+	uint32_t header_off;
+
+	/* How often to restart keys. */
+	int restart_interval;
+	int hash_size;
+
+	/* Offset of next uint8_t to write. */
+	uint32_t next;
+	uint32_t *restarts;
+	uint32_t restart_len;
+	uint32_t restart_cap;
+
+	struct strbuf last_key;
+	int entries;
+};
+
+/*
+ * initializes the blockwriter to write `typ` entries, using `buf` as temporary
+ * storage. `buf` is not owned by the block_writer. */
+void block_writer_init(struct block_writer *bw, uint8_t typ, uint8_t *buf,
+		       uint32_t block_size, uint32_t header_off, int hash_size);
+
+/* returns the block type (eg. 'r' for ref records. */
+uint8_t block_writer_type(struct block_writer *bw);
+
+/* appends the record, or -1 if it doesn't fit. */
+int block_writer_add(struct block_writer *w, struct reftable_record *rec);
+
+/* appends the key restarts, and compress the block if necessary. */
+int block_writer_finish(struct block_writer *w);
+
+/* clears out internally allocated block_writer members. */
+void block_writer_release(struct block_writer *bw);
+
+/* Read a block. */
+struct block_reader {
+	/* offset of the block header; nonzero for the first block in a
+	 * reftable. */
+	uint32_t header_off;
+
+	/* the memory block */
+	struct reftable_block block;
+	int hash_size;
+
+	/* size of the data, excluding restart data. */
+	uint32_t block_len;
+	uint8_t *restart_bytes;
+	uint16_t restart_count;
+
+	/* size of the data in the file. For log blocks, this is the compressed
+	 * size. */
+	uint32_t full_block_size;
+};
+
+/* Iterate over entries in a block */
+struct block_iter {
+	/* offset within the block of the next entry to read. */
+	uint32_t next_off;
+	struct block_reader *br;
+
+	/* key for last entry we read. */
+	struct strbuf last_key;
+};
+
+/* initializes a block reader. */
+int block_reader_init(struct block_reader *br, struct reftable_block *bl,
+		      uint32_t header_off, uint32_t table_block_size,
+		      int hash_size);
+
+/* Position `it` at start of the block */
+void block_reader_start(struct block_reader *br, struct block_iter *it);
+
+/* Position `it` to the `want` key in the block */
+int block_reader_seek(struct block_reader *br, struct block_iter *it,
+		      struct strbuf *want);
+
+/* Returns the block type (eg. 'r' for refs) */
+uint8_t block_reader_type(struct block_reader *r);
+
+/* Decodes the first key in the block */
+int block_reader_first_key(struct block_reader *br, struct strbuf *key);
+
+void block_iter_copy_from(struct block_iter *dest, struct block_iter *src);
+
+/* return < 0 for error, 0 for OK, > 0 for EOF. */
+int block_iter_next(struct block_iter *it, struct reftable_record *rec);
+
+/* Seek to `want` with in the block pointed to by `it` */
+int block_iter_seek(struct block_iter *it, struct strbuf *want);
+
+/* deallocate memory for `it`. The block reader and its block is left intact. */
+void block_iter_close(struct block_iter *it);
+
+/* size of file header, depending on format version */
+int header_size(int version);
+
+/* size of file footer, depending on format version */
+int footer_size(int version);
+
+/* returns a block to its source. */
+void reftable_block_done(struct reftable_block *ret);
+
+#endif
diff --git a/reftable/block_test.c b/reftable/block_test.c
new file mode 100644
index 0000000000..4b3ea262dc
--- /dev/null
+++ b/reftable/block_test.c
@@ -0,0 +1,120 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "block.h"
+
+#include "system.h"
+#include "blocksource.h"
+#include "basics.h"
+#include "constants.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+static void test_block_read_write(void)
+{
+	const int header_off = 21; /* random */
+	char *names[30];
+	const int N = ARRAY_SIZE(names);
+	const int block_size = 1024;
+	struct reftable_block block = { NULL };
+	struct block_writer bw = {
+		.last_key = STRBUF_INIT,
+	};
+	struct reftable_ref_record ref = { NULL };
+	struct reftable_record rec = { NULL };
+	int i = 0;
+	int n;
+	struct block_reader br = { 0 };
+	struct block_iter it = { .last_key = STRBUF_INIT };
+	int j = 0;
+	struct strbuf want = STRBUF_INIT;
+
+	block.data = reftable_calloc(block_size);
+	block.len = block_size;
+	block.source = malloc_block_source();
+	block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size,
+			  header_off, hash_size(GIT_SHA1_FORMAT_ID));
+	reftable_record_from_ref(&rec, &ref);
+
+	for (i = 0; i < N; i++) {
+		char name[100];
+		uint8_t hash[GIT_SHA1_RAWSZ];
+		snprintf(name, sizeof(name), "branch%02d", i);
+		memset(hash, i, sizeof(hash));
+
+		ref.refname = name;
+		ref.value_type = REFTABLE_REF_VAL1;
+		ref.value.val1 = hash;
+
+		names[i] = xstrdup(name);
+		n = block_writer_add(&bw, &rec);
+		ref.refname = NULL;
+		ref.value_type = REFTABLE_REF_DELETION;
+		EXPECT(n == 0);
+	}
+
+	n = block_writer_finish(&bw);
+	EXPECT(n > 0);
+
+	block_writer_release(&bw);
+
+	block_reader_init(&br, &block, header_off, block_size, GIT_SHA1_RAWSZ);
+
+	block_reader_start(&br, &it);
+
+	while (1) {
+		int r = block_iter_next(&it, &rec);
+		EXPECT(r >= 0);
+		if (r > 0) {
+			break;
+		}
+		EXPECT_STREQ(names[j], ref.refname);
+		j++;
+	}
+
+	reftable_record_release(&rec);
+	block_iter_close(&it);
+
+	for (i = 0; i < N; i++) {
+		struct block_iter it = { .last_key = STRBUF_INIT };
+		strbuf_reset(&want);
+		strbuf_addstr(&want, names[i]);
+
+		n = block_reader_seek(&br, &it, &want);
+		EXPECT(n == 0);
+
+		n = block_iter_next(&it, &rec);
+		EXPECT(n == 0);
+
+		EXPECT_STREQ(names[i], ref.refname);
+
+		want.len--;
+		n = block_reader_seek(&br, &it, &want);
+		EXPECT(n == 0);
+
+		n = block_iter_next(&it, &rec);
+		EXPECT(n == 0);
+		EXPECT_STREQ(names[10 * (i / 10)], ref.refname);
+
+		block_iter_close(&it);
+	}
+
+	reftable_record_release(&rec);
+	reftable_block_done(&br.block);
+	strbuf_release(&want);
+	for (i = 0; i < N; i++) {
+		reftable_free(names[i]);
+	}
+}
+
+int block_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_block_read_write);
+	return 0;
+}
diff --git a/reftable/blocksource.c b/reftable/blocksource.c
new file mode 100644
index 0000000000..0044eecd9a
--- /dev/null
+++ b/reftable/blocksource.c
@@ -0,0 +1,148 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "blocksource.h"
+#include "reftable-blocksource.h"
+#include "reftable-error.h"
+
+static void strbuf_return_block(void *b, struct reftable_block *dest)
+{
+	memset(dest->data, 0xff, dest->len);
+	reftable_free(dest->data);
+}
+
+static void strbuf_close(void *b)
+{
+}
+
+static int strbuf_read_block(void *v, struct reftable_block *dest, uint64_t off,
+			     uint32_t size)
+{
+	struct strbuf *b = v;
+	assert(off + size <= b->len);
+	dest->data = reftable_calloc(size);
+	memcpy(dest->data, b->buf + off, size);
+	dest->len = size;
+	return size;
+}
+
+static uint64_t strbuf_size(void *b)
+{
+	return ((struct strbuf *)b)->len;
+}
+
+static struct reftable_block_source_vtable strbuf_vtable = {
+	.size = &strbuf_size,
+	.read_block = &strbuf_read_block,
+	.return_block = &strbuf_return_block,
+	.close = &strbuf_close,
+};
+
+void block_source_from_strbuf(struct reftable_block_source *bs,
+			      struct strbuf *buf)
+{
+	assert(!bs->ops);
+	bs->ops = &strbuf_vtable;
+	bs->arg = buf;
+}
+
+static void malloc_return_block(void *b, struct reftable_block *dest)
+{
+	memset(dest->data, 0xff, dest->len);
+	reftable_free(dest->data);
+}
+
+static struct reftable_block_source_vtable malloc_vtable = {
+	.return_block = &malloc_return_block,
+};
+
+static struct reftable_block_source malloc_block_source_instance = {
+	.ops = &malloc_vtable,
+};
+
+struct reftable_block_source malloc_block_source(void)
+{
+	return malloc_block_source_instance;
+}
+
+struct file_block_source {
+	int fd;
+	uint64_t size;
+};
+
+static uint64_t file_size(void *b)
+{
+	return ((struct file_block_source *)b)->size;
+}
+
+static void file_return_block(void *b, struct reftable_block *dest)
+{
+	memset(dest->data, 0xff, dest->len);
+	reftable_free(dest->data);
+}
+
+static void file_close(void *b)
+{
+	int fd = ((struct file_block_source *)b)->fd;
+	if (fd > 0) {
+		close(fd);
+		((struct file_block_source *)b)->fd = 0;
+	}
+
+	reftable_free(b);
+}
+
+static int file_read_block(void *v, struct reftable_block *dest, uint64_t off,
+			   uint32_t size)
+{
+	struct file_block_source *b = v;
+	assert(off + size <= b->size);
+	dest->data = reftable_malloc(size);
+	if (pread(b->fd, dest->data, size, off) != size)
+		return -1;
+	dest->len = size;
+	return size;
+}
+
+static struct reftable_block_source_vtable file_vtable = {
+	.size = &file_size,
+	.read_block = &file_read_block,
+	.return_block = &file_return_block,
+	.close = &file_close,
+};
+
+int reftable_block_source_from_file(struct reftable_block_source *bs,
+				    const char *name)
+{
+	struct stat st = { 0 };
+	int err = 0;
+	int fd = open(name, O_RDONLY);
+	struct file_block_source *p = NULL;
+	if (fd < 0) {
+		if (errno == ENOENT) {
+			return REFTABLE_NOT_EXIST_ERROR;
+		}
+		return -1;
+	}
+
+	err = fstat(fd, &st);
+	if (err < 0)
+		return -1;
+
+	p = reftable_calloc(sizeof(struct file_block_source));
+	p->size = st.st_size;
+	p->fd = fd;
+
+	assert(!bs->ops);
+	bs->ops = &file_vtable;
+	bs->arg = p;
+	return 0;
+}
diff --git a/reftable/blocksource.h b/reftable/blocksource.h
new file mode 100644
index 0000000000..072e2727ad
--- /dev/null
+++ b/reftable/blocksource.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef BLOCKSOURCE_H
+#define BLOCKSOURCE_H
+
+#include "system.h"
+
+struct reftable_block_source;
+
+/* Create an in-memory block source for reading reftables */
+void block_source_from_strbuf(struct reftable_block_source *bs,
+			      struct strbuf *buf);
+
+struct reftable_block_source malloc_block_source(void);
+
+#endif
diff --git a/reftable/constants.h b/reftable/constants.h
new file mode 100644
index 0000000000..5eee72c4c1
--- /dev/null
+++ b/reftable/constants.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef CONSTANTS_H
+#define CONSTANTS_H
+
+#define BLOCK_TYPE_LOG 'g'
+#define BLOCK_TYPE_INDEX 'i'
+#define BLOCK_TYPE_REF 'r'
+#define BLOCK_TYPE_OBJ 'o'
+#define BLOCK_TYPE_ANY 0
+
+#define MAX_RESTARTS ((1 << 16) - 1)
+#define DEFAULT_BLOCK_SIZE 4096
+
+#endif
diff --git a/reftable/dump.c b/reftable/dump.c
new file mode 100644
index 0000000000..155953d1b8
--- /dev/null
+++ b/reftable/dump.c
@@ -0,0 +1,107 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "git-compat-util.h"
+#include "hash.h"
+
+#include "reftable-blocksource.h"
+#include "reftable-error.h"
+#include "reftable-merged.h"
+#include "reftable-record.h"
+#include "reftable-tests.h"
+#include "reftable-writer.h"
+#include "reftable-iterator.h"
+#include "reftable-reader.h"
+#include "reftable-stack.h"
+#include "reftable-generic.h"
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+static int compact_stack(const char *stackdir)
+{
+	struct reftable_stack *stack = NULL;
+	struct reftable_write_options cfg = { 0 };
+
+	int err = reftable_new_stack(&stack, stackdir, cfg);
+	if (err < 0)
+		goto done;
+
+	err = reftable_stack_compact_all(stack, NULL);
+	if (err < 0)
+		goto done;
+done:
+	if (stack) {
+		reftable_stack_destroy(stack);
+	}
+	return err;
+}
+
+static void print_help(void)
+{
+	printf("usage: dump [-cst] arg\n\n"
+	       "options: \n"
+	       "  -c compact\n"
+	       "  -t dump table\n"
+	       "  -s dump stack\n"
+	       "  -6 sha256 hash format\n"
+	       "  -h this help\n"
+	       "\n");
+}
+
+int reftable_dump_main(int argc, char *const *argv)
+{
+	int err = 0;
+	int opt_dump_table = 0;
+	int opt_dump_stack = 0;
+	int opt_compact = 0;
+	uint32_t opt_hash_id = GIT_SHA1_FORMAT_ID;
+	const char *arg = NULL, *argv0 = argv[0];
+
+	for (; argc > 1; argv++, argc--)
+		if (*argv[1] != '-')
+			break;
+		else if (!strcmp("-t", argv[1]))
+			opt_dump_table = 1;
+		else if (!strcmp("-6", argv[1]))
+			opt_hash_id = GIT_SHA256_FORMAT_ID;
+		else if (!strcmp("-s", argv[1]))
+			opt_dump_stack = 1;
+		else if (!strcmp("-c", argv[1]))
+			opt_compact = 1;
+		else if (!strcmp("-?", argv[1]) || !strcmp("-h", argv[1])) {
+			print_help();
+			return 2;
+		}
+
+	if (argc != 2) {
+		fprintf(stderr, "need argument\n");
+		print_help();
+		return 2;
+	}
+
+	arg = argv[1];
+
+	if (opt_dump_table) {
+		err = reftable_reader_print_file(arg);
+	} else if (opt_dump_stack) {
+		err = reftable_stack_print_directory(arg, opt_hash_id);
+	} else if (opt_compact) {
+		err = compact_stack(arg);
+	}
+
+	if (err < 0) {
+		fprintf(stderr, "%s: %s: %s\n", argv0, arg,
+			reftable_error_str(err));
+		return 1;
+	}
+	return 0;
+}
diff --git a/reftable/error.c b/reftable/error.c
new file mode 100644
index 0000000000..93941f2145
--- /dev/null
+++ b/reftable/error.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "reftable-error.h"
+
+#include <stdio.h>
+
+const char *reftable_error_str(int err)
+{
+	static char buf[250];
+	switch (err) {
+	case REFTABLE_IO_ERROR:
+		return "I/O error";
+	case REFTABLE_FORMAT_ERROR:
+		return "corrupt reftable file";
+	case REFTABLE_NOT_EXIST_ERROR:
+		return "file does not exist";
+	case REFTABLE_LOCK_ERROR:
+		return "data is outdated";
+	case REFTABLE_API_ERROR:
+		return "misuse of the reftable API";
+	case REFTABLE_ZLIB_ERROR:
+		return "zlib failure";
+	case REFTABLE_NAME_CONFLICT:
+		return "file/directory conflict";
+	case REFTABLE_EMPTY_TABLE_ERROR:
+		return "wrote empty table";
+	case REFTABLE_REFNAME_ERROR:
+		return "invalid refname";
+	case REFTABLE_ENTRY_TOO_BIG_ERROR:
+		return "entry too large";
+	case -1:
+		return "general error";
+	default:
+		snprintf(buf, sizeof(buf), "unknown error code %d", err);
+		return buf;
+	}
+}
diff --git a/reftable/generic.c b/reftable/generic.c
new file mode 100644
index 0000000000..7a8a738d86
--- /dev/null
+++ b/reftable/generic.c
@@ -0,0 +1,169 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+#include "record.h"
+#include "generic.h"
+#include "reftable-iterator.h"
+#include "reftable-generic.h"
+
+int reftable_table_seek_ref(struct reftable_table *tab,
+			    struct reftable_iterator *it, const char *name)
+{
+	struct reftable_ref_record ref = {
+		.refname = (char *)name,
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_ref(&rec, &ref);
+	return tab->ops->seek_record(tab->table_arg, it, &rec);
+}
+
+int reftable_table_seek_log(struct reftable_table *tab,
+			    struct reftable_iterator *it, const char *name)
+{
+	struct reftable_log_record log = {
+		.refname = (char *)name,
+		.update_index = ~((uint64_t)0),
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_log(&rec, &log);
+	return tab->ops->seek_record(tab->table_arg, it, &rec);
+}
+
+int reftable_table_read_ref(struct reftable_table *tab, const char *name,
+			    struct reftable_ref_record *ref)
+{
+	struct reftable_iterator it = { NULL };
+	int err = reftable_table_seek_ref(tab, &it, name);
+	if (err)
+		goto done;
+
+	err = reftable_iterator_next_ref(&it, ref);
+	if (err)
+		goto done;
+
+	if (strcmp(ref->refname, name) ||
+	    reftable_ref_record_is_deletion(ref)) {
+		reftable_ref_record_release(ref);
+		err = 1;
+		goto done;
+	}
+
+done:
+	reftable_iterator_destroy(&it);
+	return err;
+}
+
+int reftable_table_print(struct reftable_table *tab) {
+	struct reftable_iterator it = { NULL };
+	struct reftable_ref_record ref = { NULL };
+	struct reftable_log_record log = { NULL };
+	uint32_t hash_id = reftable_table_hash_id(tab);
+	int err = reftable_table_seek_ref(tab, &it, "");
+	if (err < 0) {
+		return err;
+	}
+
+	while (1) {
+		err = reftable_iterator_next_ref(&it, &ref);
+		if (err > 0) {
+			break;
+		}
+		if (err < 0) {
+			return err;
+		}
+		reftable_ref_record_print(&ref, hash_id);
+	}
+	reftable_iterator_destroy(&it);
+	reftable_ref_record_release(&ref);
+
+	err = reftable_table_seek_log(tab, &it, "");
+	if (err < 0) {
+		return err;
+	}
+	while (1) {
+		err = reftable_iterator_next_log(&it, &log);
+		if (err > 0) {
+			break;
+		}
+		if (err < 0) {
+			return err;
+		}
+		reftable_log_record_print(&log, hash_id);
+	}
+	reftable_iterator_destroy(&it);
+	reftable_log_record_release(&log);
+	return 0;
+}
+
+uint64_t reftable_table_max_update_index(struct reftable_table *tab)
+{
+	return tab->ops->max_update_index(tab->table_arg);
+}
+
+uint64_t reftable_table_min_update_index(struct reftable_table *tab)
+{
+	return tab->ops->min_update_index(tab->table_arg);
+}
+
+uint32_t reftable_table_hash_id(struct reftable_table *tab)
+{
+	return tab->ops->hash_id(tab->table_arg);
+}
+
+void reftable_iterator_destroy(struct reftable_iterator *it)
+{
+	if (!it->ops) {
+		return;
+	}
+	it->ops->close(it->iter_arg);
+	it->ops = NULL;
+	FREE_AND_NULL(it->iter_arg);
+}
+
+int reftable_iterator_next_ref(struct reftable_iterator *it,
+			       struct reftable_ref_record *ref)
+{
+	struct reftable_record rec = { NULL };
+	reftable_record_from_ref(&rec, ref);
+	return iterator_next(it, &rec);
+}
+
+int reftable_iterator_next_log(struct reftable_iterator *it,
+			       struct reftable_log_record *log)
+{
+	struct reftable_record rec = { NULL };
+	reftable_record_from_log(&rec, log);
+	return iterator_next(it, &rec);
+}
+
+int iterator_next(struct reftable_iterator *it, struct reftable_record *rec)
+{
+	return it->ops->next(it->iter_arg, rec);
+}
+
+static int empty_iterator_next(void *arg, struct reftable_record *rec)
+{
+	return 1;
+}
+
+static void empty_iterator_close(void *arg)
+{
+}
+
+static struct reftable_iterator_vtable empty_vtable = {
+	.next = &empty_iterator_next,
+	.close = &empty_iterator_close,
+};
+
+void iterator_set_empty(struct reftable_iterator *it)
+{
+	assert(!it->ops);
+	it->iter_arg = NULL;
+	it->ops = &empty_vtable;
+}
diff --git a/reftable/generic.h b/reftable/generic.h
new file mode 100644
index 0000000000..98886a0640
--- /dev/null
+++ b/reftable/generic.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef GENERIC_H
+#define GENERIC_H
+
+#include "record.h"
+#include "reftable-generic.h"
+
+/* generic interface to reftables */
+struct reftable_table_vtable {
+	int (*seek_record)(void *tab, struct reftable_iterator *it,
+			   struct reftable_record *);
+	uint32_t (*hash_id)(void *tab);
+	uint64_t (*min_update_index)(void *tab);
+	uint64_t (*max_update_index)(void *tab);
+};
+
+struct reftable_iterator_vtable {
+	int (*next)(void *iter_arg, struct reftable_record *rec);
+	void (*close)(void *iter_arg);
+};
+
+void iterator_set_empty(struct reftable_iterator *it);
+int iterator_next(struct reftable_iterator *it, struct reftable_record *rec);
+
+#endif
diff --git a/reftable/iter.c b/reftable/iter.c
new file mode 100644
index 0000000000..93d04f735b
--- /dev/null
+++ b/reftable/iter.c
@@ -0,0 +1,194 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "iter.h"
+
+#include "system.h"
+
+#include "block.h"
+#include "generic.h"
+#include "constants.h"
+#include "reader.h"
+#include "reftable-error.h"
+
+int iterator_is_null(struct reftable_iterator *it)
+{
+	return !it->ops;
+}
+
+static void filtering_ref_iterator_close(void *iter_arg)
+{
+	struct filtering_ref_iterator *fri = iter_arg;
+	strbuf_release(&fri->oid);
+	reftable_iterator_destroy(&fri->it);
+}
+
+static int filtering_ref_iterator_next(void *iter_arg,
+				       struct reftable_record *rec)
+{
+	struct filtering_ref_iterator *fri = iter_arg;
+	struct reftable_ref_record *ref = rec->data;
+	int err = 0;
+	while (1) {
+		err = reftable_iterator_next_ref(&fri->it, ref);
+		if (err != 0) {
+			break;
+		}
+
+		if (fri->double_check) {
+			struct reftable_iterator it = { NULL };
+
+			err = reftable_table_seek_ref(&fri->tab, &it,
+						      ref->refname);
+			if (err == 0) {
+				err = reftable_iterator_next_ref(&it, ref);
+			}
+
+			reftable_iterator_destroy(&it);
+
+			if (err < 0) {
+				break;
+			}
+
+			if (err > 0) {
+				continue;
+			}
+		}
+
+		if (ref->value_type == REFTABLE_REF_VAL2 &&
+		    (!memcmp(fri->oid.buf, ref->value.val2.target_value,
+			     fri->oid.len) ||
+		     !memcmp(fri->oid.buf, ref->value.val2.value,
+			     fri->oid.len)))
+			return 0;
+
+		if (ref->value_type == REFTABLE_REF_VAL1 &&
+		    !memcmp(fri->oid.buf, ref->value.val1, fri->oid.len)) {
+			return 0;
+		}
+	}
+
+	reftable_ref_record_release(ref);
+	return err;
+}
+
+static struct reftable_iterator_vtable filtering_ref_iterator_vtable = {
+	.next = &filtering_ref_iterator_next,
+	.close = &filtering_ref_iterator_close,
+};
+
+void iterator_from_filtering_ref_iterator(struct reftable_iterator *it,
+					  struct filtering_ref_iterator *fri)
+{
+	assert(!it->ops);
+	it->iter_arg = fri;
+	it->ops = &filtering_ref_iterator_vtable;
+}
+
+static void indexed_table_ref_iter_close(void *p)
+{
+	struct indexed_table_ref_iter *it = p;
+	block_iter_close(&it->cur);
+	reftable_block_done(&it->block_reader.block);
+	reftable_free(it->offsets);
+	strbuf_release(&it->oid);
+}
+
+static int indexed_table_ref_iter_next_block(struct indexed_table_ref_iter *it)
+{
+	uint64_t off;
+	int err = 0;
+	if (it->offset_idx == it->offset_len) {
+		it->is_finished = 1;
+		return 1;
+	}
+
+	reftable_block_done(&it->block_reader.block);
+
+	off = it->offsets[it->offset_idx++];
+	err = reader_init_block_reader(it->r, &it->block_reader, off,
+				       BLOCK_TYPE_REF);
+	if (err < 0) {
+		return err;
+	}
+	if (err > 0) {
+		/* indexed block does not exist. */
+		return REFTABLE_FORMAT_ERROR;
+	}
+	block_reader_start(&it->block_reader, &it->cur);
+	return 0;
+}
+
+static int indexed_table_ref_iter_next(void *p, struct reftable_record *rec)
+{
+	struct indexed_table_ref_iter *it = p;
+	struct reftable_ref_record *ref = rec->data;
+
+	while (1) {
+		int err = block_iter_next(&it->cur, rec);
+		if (err < 0) {
+			return err;
+		}
+
+		if (err > 0) {
+			err = indexed_table_ref_iter_next_block(it);
+			if (err < 0) {
+				return err;
+			}
+
+			if (it->is_finished) {
+				return 1;
+			}
+			continue;
+		}
+		/* BUG */
+		if (!memcmp(it->oid.buf, ref->value.val2.target_value,
+			    it->oid.len) ||
+		    !memcmp(it->oid.buf, ref->value.val2.value, it->oid.len)) {
+			return 0;
+		}
+	}
+}
+
+int new_indexed_table_ref_iter(struct indexed_table_ref_iter **dest,
+			       struct reftable_reader *r, uint8_t *oid,
+			       int oid_len, uint64_t *offsets, int offset_len)
+{
+	struct indexed_table_ref_iter empty = INDEXED_TABLE_REF_ITER_INIT;
+	struct indexed_table_ref_iter *itr =
+		reftable_calloc(sizeof(struct indexed_table_ref_iter));
+	int err = 0;
+
+	*itr = empty;
+	itr->r = r;
+	strbuf_add(&itr->oid, oid, oid_len);
+
+	itr->offsets = offsets;
+	itr->offset_len = offset_len;
+
+	err = indexed_table_ref_iter_next_block(itr);
+	if (err < 0) {
+		reftable_free(itr);
+	} else {
+		*dest = itr;
+	}
+	return err;
+}
+
+static struct reftable_iterator_vtable indexed_table_ref_iter_vtable = {
+	.next = &indexed_table_ref_iter_next,
+	.close = &indexed_table_ref_iter_close,
+};
+
+void iterator_from_indexed_table_ref_iter(struct reftable_iterator *it,
+					  struct indexed_table_ref_iter *itr)
+{
+	assert(!it->ops);
+	it->iter_arg = itr;
+	it->ops = &indexed_table_ref_iter_vtable;
+}
diff --git a/reftable/iter.h b/reftable/iter.h
new file mode 100644
index 0000000000..09eb0cbfa5
--- /dev/null
+++ b/reftable/iter.h
@@ -0,0 +1,69 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef ITER_H
+#define ITER_H
+
+#include "system.h"
+#include "block.h"
+#include "record.h"
+
+#include "reftable-iterator.h"
+#include "reftable-generic.h"
+
+/* Returns true for a zeroed out iterator, such as the one returned from
+ * iterator_destroy. */
+int iterator_is_null(struct reftable_iterator *it);
+
+/* iterator that produces only ref records that point to `oid` */
+struct filtering_ref_iterator {
+	int double_check;
+	struct reftable_table tab;
+	struct strbuf oid;
+	struct reftable_iterator it;
+};
+#define FILTERING_REF_ITERATOR_INIT \
+	{                           \
+		.oid = STRBUF_INIT  \
+	}
+
+void iterator_from_filtering_ref_iterator(struct reftable_iterator *,
+					  struct filtering_ref_iterator *);
+
+/* iterator that produces only ref records that point to `oid`,
+ * but using the object index.
+ */
+struct indexed_table_ref_iter {
+	struct reftable_reader *r;
+	struct strbuf oid;
+
+	/* mutable */
+	uint64_t *offsets;
+
+	/* Points to the next offset to read. */
+	int offset_idx;
+	int offset_len;
+	struct block_reader block_reader;
+	struct block_iter cur;
+	int is_finished;
+};
+
+#define INDEXED_TABLE_REF_ITER_INIT                                     \
+	{                                                               \
+		.cur = { .last_key = STRBUF_INIT }, .oid = STRBUF_INIT, \
+	}
+
+void iterator_from_indexed_table_ref_iter(struct reftable_iterator *it,
+					  struct indexed_table_ref_iter *itr);
+
+/* Takes ownership of `offsets` */
+int new_indexed_table_ref_iter(struct indexed_table_ref_iter **dest,
+			       struct reftable_reader *r, uint8_t *oid,
+			       int oid_len, uint64_t *offsets, int offset_len);
+
+#endif
diff --git a/reftable/merged.c b/reftable/merged.c
new file mode 100644
index 0000000000..e5b53da6db
--- /dev/null
+++ b/reftable/merged.c
@@ -0,0 +1,362 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "merged.h"
+
+#include "constants.h"
+#include "iter.h"
+#include "pq.h"
+#include "reader.h"
+#include "record.h"
+#include "generic.h"
+#include "reftable-merged.h"
+#include "reftable-error.h"
+#include "system.h"
+
+static int merged_iter_init(struct merged_iter *mi)
+{
+	int i = 0;
+	for (i = 0; i < mi->stack_len; i++) {
+		struct reftable_record rec = reftable_new_record(mi->typ);
+		int err = iterator_next(&mi->stack[i], &rec);
+		if (err < 0) {
+			return err;
+		}
+
+		if (err > 0) {
+			reftable_iterator_destroy(&mi->stack[i]);
+			reftable_record_destroy(&rec);
+		} else {
+			struct pq_entry e = {
+				.rec = rec,
+				.index = i,
+			};
+			merged_iter_pqueue_add(&mi->pq, e);
+		}
+	}
+
+	return 0;
+}
+
+static void merged_iter_close(void *p)
+{
+	struct merged_iter *mi = p;
+	int i = 0;
+	merged_iter_pqueue_release(&mi->pq);
+	for (i = 0; i < mi->stack_len; i++) {
+		reftable_iterator_destroy(&mi->stack[i]);
+	}
+	reftable_free(mi->stack);
+}
+
+static int merged_iter_advance_nonnull_subiter(struct merged_iter *mi,
+					       size_t idx)
+{
+	struct reftable_record rec = reftable_new_record(mi->typ);
+	struct pq_entry e = {
+		.rec = rec,
+		.index = idx,
+	};
+	int err = iterator_next(&mi->stack[idx], &rec);
+	if (err < 0)
+		return err;
+
+	if (err > 0) {
+		reftable_iterator_destroy(&mi->stack[idx]);
+		reftable_record_destroy(&rec);
+		return 0;
+	}
+
+	merged_iter_pqueue_add(&mi->pq, e);
+	return 0;
+}
+
+static int merged_iter_advance_subiter(struct merged_iter *mi, size_t idx)
+{
+	if (iterator_is_null(&mi->stack[idx]))
+		return 0;
+	return merged_iter_advance_nonnull_subiter(mi, idx);
+}
+
+static int merged_iter_next_entry(struct merged_iter *mi,
+				  struct reftable_record *rec)
+{
+	struct strbuf entry_key = STRBUF_INIT;
+	struct pq_entry entry = { 0 };
+	int err = 0;
+
+	if (merged_iter_pqueue_is_empty(mi->pq))
+		return 1;
+
+	entry = merged_iter_pqueue_remove(&mi->pq);
+	err = merged_iter_advance_subiter(mi, entry.index);
+	if (err < 0)
+		return err;
+
+	/*
+	  One can also use reftable as datacenter-local storage, where the ref
+	  database is maintained in globally consistent database (eg.
+	  CockroachDB or Spanner). In this scenario, replication delays together
+	  with compaction may cause newer tables to contain older entries. In
+	  such a deployment, the loop below must be changed to collect all
+	  entries for the same key, and return new the newest one.
+	*/
+	reftable_record_key(&entry.rec, &entry_key);
+	while (!merged_iter_pqueue_is_empty(mi->pq)) {
+		struct pq_entry top = merged_iter_pqueue_top(mi->pq);
+		struct strbuf k = STRBUF_INIT;
+		int err = 0, cmp = 0;
+
+		reftable_record_key(&top.rec, &k);
+
+		cmp = strbuf_cmp(&k, &entry_key);
+		strbuf_release(&k);
+
+		if (cmp > 0) {
+			break;
+		}
+
+		merged_iter_pqueue_remove(&mi->pq);
+		err = merged_iter_advance_subiter(mi, top.index);
+		if (err < 0) {
+			return err;
+		}
+		reftable_record_destroy(&top.rec);
+	}
+
+	reftable_record_copy_from(rec, &entry.rec, hash_size(mi->hash_id));
+	reftable_record_destroy(&entry.rec);
+	strbuf_release(&entry_key);
+	return 0;
+}
+
+static int merged_iter_next(struct merged_iter *mi, struct reftable_record *rec)
+{
+	while (1) {
+		int err = merged_iter_next_entry(mi, rec);
+		if (err == 0 && mi->suppress_deletions &&
+		    reftable_record_is_deletion(rec)) {
+			continue;
+		}
+
+		return err;
+	}
+}
+
+static int merged_iter_next_void(void *p, struct reftable_record *rec)
+{
+	struct merged_iter *mi = p;
+	if (merged_iter_pqueue_is_empty(mi->pq))
+		return 1;
+
+	return merged_iter_next(mi, rec);
+}
+
+static struct reftable_iterator_vtable merged_iter_vtable = {
+	.next = &merged_iter_next_void,
+	.close = &merged_iter_close,
+};
+
+static void iterator_from_merged_iter(struct reftable_iterator *it,
+				      struct merged_iter *mi)
+{
+	assert(!it->ops);
+	it->iter_arg = mi;
+	it->ops = &merged_iter_vtable;
+}
+
+int reftable_new_merged_table(struct reftable_merged_table **dest,
+			      struct reftable_table *stack, int n,
+			      uint32_t hash_id)
+{
+	struct reftable_merged_table *m = NULL;
+	uint64_t last_max = 0;
+	uint64_t first_min = 0;
+	int i = 0;
+	for (i = 0; i < n; i++) {
+		uint64_t min = reftable_table_min_update_index(&stack[i]);
+		uint64_t max = reftable_table_max_update_index(&stack[i]);
+
+		if (reftable_table_hash_id(&stack[i]) != hash_id) {
+			return REFTABLE_FORMAT_ERROR;
+		}
+		if (i == 0 || min < first_min) {
+			first_min = min;
+		}
+		if (i == 0 || max > last_max) {
+			last_max = max;
+		}
+	}
+
+	m = reftable_calloc(sizeof(struct reftable_merged_table));
+	m->stack = stack;
+	m->stack_len = n;
+	m->min = first_min;
+	m->max = last_max;
+	m->hash_id = hash_id;
+	*dest = m;
+	return 0;
+}
+
+/* clears the list of subtable, without affecting the readers themselves. */
+void merged_table_release(struct reftable_merged_table *mt)
+{
+	FREE_AND_NULL(mt->stack);
+	mt->stack_len = 0;
+}
+
+void reftable_merged_table_free(struct reftable_merged_table *mt)
+{
+	if (!mt) {
+		return;
+	}
+	merged_table_release(mt);
+	reftable_free(mt);
+}
+
+uint64_t
+reftable_merged_table_max_update_index(struct reftable_merged_table *mt)
+{
+	return mt->max;
+}
+
+uint64_t
+reftable_merged_table_min_update_index(struct reftable_merged_table *mt)
+{
+	return mt->min;
+}
+
+static int reftable_table_seek_record(struct reftable_table *tab,
+				      struct reftable_iterator *it,
+				      struct reftable_record *rec)
+{
+	return tab->ops->seek_record(tab->table_arg, it, rec);
+}
+
+static int merged_table_seek_record(struct reftable_merged_table *mt,
+				    struct reftable_iterator *it,
+				    struct reftable_record *rec)
+{
+	struct reftable_iterator *iters = reftable_calloc(
+		sizeof(struct reftable_iterator) * mt->stack_len);
+	struct merged_iter merged = {
+		.stack = iters,
+		.typ = reftable_record_type(rec),
+		.hash_id = mt->hash_id,
+		.suppress_deletions = mt->suppress_deletions,
+	};
+	int n = 0;
+	int err = 0;
+	int i = 0;
+	for (i = 0; i < mt->stack_len && err == 0; i++) {
+		int e = reftable_table_seek_record(&mt->stack[i], &iters[n],
+						   rec);
+		if (e < 0) {
+			err = e;
+		}
+		if (e == 0) {
+			n++;
+		}
+	}
+	if (err < 0) {
+		int i = 0;
+		for (i = 0; i < n; i++) {
+			reftable_iterator_destroy(&iters[i]);
+		}
+		reftable_free(iters);
+		return err;
+	}
+
+	merged.stack_len = n;
+	err = merged_iter_init(&merged);
+	if (err < 0) {
+		merged_iter_close(&merged);
+		return err;
+	} else {
+		struct merged_iter *p =
+			reftable_malloc(sizeof(struct merged_iter));
+		*p = merged;
+		iterator_from_merged_iter(it, p);
+	}
+	return 0;
+}
+
+int reftable_merged_table_seek_ref(struct reftable_merged_table *mt,
+				   struct reftable_iterator *it,
+				   const char *name)
+{
+	struct reftable_ref_record ref = {
+		.refname = (char *)name,
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_ref(&rec, &ref);
+	return merged_table_seek_record(mt, it, &rec);
+}
+
+int reftable_merged_table_seek_log_at(struct reftable_merged_table *mt,
+				      struct reftable_iterator *it,
+				      const char *name, uint64_t update_index)
+{
+	struct reftable_log_record log = {
+		.refname = (char *)name,
+		.update_index = update_index,
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_log(&rec, &log);
+	return merged_table_seek_record(mt, it, &rec);
+}
+
+int reftable_merged_table_seek_log(struct reftable_merged_table *mt,
+				   struct reftable_iterator *it,
+				   const char *name)
+{
+	uint64_t max = ~((uint64_t)0);
+	return reftable_merged_table_seek_log_at(mt, it, name, max);
+}
+
+uint32_t reftable_merged_table_hash_id(struct reftable_merged_table *mt)
+{
+	return mt->hash_id;
+}
+
+static int reftable_merged_table_seek_void(void *tab,
+					   struct reftable_iterator *it,
+					   struct reftable_record *rec)
+{
+	return merged_table_seek_record(tab, it, rec);
+}
+
+static uint32_t reftable_merged_table_hash_id_void(void *tab)
+{
+	return reftable_merged_table_hash_id(tab);
+}
+
+static uint64_t reftable_merged_table_min_update_index_void(void *tab)
+{
+	return reftable_merged_table_min_update_index(tab);
+}
+
+static uint64_t reftable_merged_table_max_update_index_void(void *tab)
+{
+	return reftable_merged_table_max_update_index(tab);
+}
+
+static struct reftable_table_vtable merged_table_vtable = {
+	.seek_record = reftable_merged_table_seek_void,
+	.hash_id = reftable_merged_table_hash_id_void,
+	.min_update_index = reftable_merged_table_min_update_index_void,
+	.max_update_index = reftable_merged_table_max_update_index_void,
+};
+
+void reftable_table_from_merged_table(struct reftable_table *tab,
+				      struct reftable_merged_table *merged)
+{
+	assert(!tab->ops);
+	tab->ops = &merged_table_vtable;
+	tab->table_arg = merged;
+}
diff --git a/reftable/merged.h b/reftable/merged.h
new file mode 100644
index 0000000000..7d9f95d27e
--- /dev/null
+++ b/reftable/merged.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef MERGED_H
+#define MERGED_H
+
+#include "pq.h"
+
+struct reftable_merged_table {
+	struct reftable_table *stack;
+	size_t stack_len;
+	uint32_t hash_id;
+
+	/* If unset, produce deletions. This is useful for compaction. For the
+	 * full stack, deletions should be produced. */
+	int suppress_deletions;
+
+	uint64_t min;
+	uint64_t max;
+};
+
+struct merged_iter {
+	struct reftable_iterator *stack;
+	uint32_t hash_id;
+	size_t stack_len;
+	uint8_t typ;
+	int suppress_deletions;
+	struct merged_iter_pqueue pq;
+};
+
+void merged_table_release(struct reftable_merged_table *mt);
+
+#endif
diff --git a/reftable/merged_test.c b/reftable/merged_test.c
new file mode 100644
index 0000000000..d08c16abef
--- /dev/null
+++ b/reftable/merged_test.c
@@ -0,0 +1,468 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "merged.h"
+
+#include "system.h"
+
+#include "basics.h"
+#include "blocksource.h"
+#include "constants.h"
+#include "reader.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-merged.h"
+#include "reftable-tests.h"
+#include "reftable-generic.h"
+#include "reftable-writer.h"
+
+static void write_test_table(struct strbuf *buf,
+			     struct reftable_ref_record refs[], int n)
+{
+	uint64_t min = 0xffffffff;
+	uint64_t max = 0;
+	int i = 0;
+	int err;
+
+	struct reftable_write_options opts = {
+		.block_size = 256,
+	};
+	struct reftable_writer *w = NULL;
+	for (i = 0; i < n; i++) {
+		uint64_t ui = refs[i].update_index;
+		if (ui > max) {
+			max = ui;
+		}
+		if (ui < min) {
+			min = ui;
+		}
+	}
+
+	w = reftable_new_writer(&strbuf_add_void, buf, &opts);
+	reftable_writer_set_limits(w, min, max);
+
+	for (i = 0; i < n; i++) {
+		uint64_t before = refs[i].update_index;
+		int n = reftable_writer_add_ref(w, &refs[i]);
+		EXPECT(n == 0);
+		EXPECT(before == refs[i].update_index);
+	}
+
+	err = reftable_writer_close(w);
+	EXPECT_ERR(err);
+
+	reftable_writer_free(w);
+}
+
+static void write_test_log_table(struct strbuf *buf,
+				 struct reftable_log_record logs[], int n,
+				 uint64_t update_index)
+{
+	int i = 0;
+	int err;
+
+	struct reftable_write_options opts = {
+		.block_size = 256,
+		.exact_log_message = 1,
+	};
+	struct reftable_writer *w = NULL;
+	w = reftable_new_writer(&strbuf_add_void, buf, &opts);
+	reftable_writer_set_limits(w, update_index, update_index);
+
+	for (i = 0; i < n; i++) {
+		int err = reftable_writer_add_log(w, &logs[i]);
+		EXPECT_ERR(err);
+	}
+
+	err = reftable_writer_close(w);
+	EXPECT_ERR(err);
+
+	reftable_writer_free(w);
+}
+
+static struct reftable_merged_table *
+merged_table_from_records(struct reftable_ref_record **refs,
+			  struct reftable_block_source **source,
+			  struct reftable_reader ***readers, int *sizes,
+			  struct strbuf *buf, int n)
+{
+	int i = 0;
+	struct reftable_merged_table *mt = NULL;
+	int err;
+	struct reftable_table *tabs =
+		reftable_calloc(n * sizeof(struct reftable_table));
+	*readers = reftable_calloc(n * sizeof(struct reftable_reader *));
+	*source = reftable_calloc(n * sizeof(**source));
+	for (i = 0; i < n; i++) {
+		write_test_table(&buf[i], refs[i], sizes[i]);
+		block_source_from_strbuf(&(*source)[i], &buf[i]);
+
+		err = reftable_new_reader(&(*readers)[i], &(*source)[i],
+					  "name");
+		EXPECT_ERR(err);
+		reftable_table_from_reader(&tabs[i], (*readers)[i]);
+	}
+
+	err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
+	EXPECT_ERR(err);
+	return mt;
+}
+
+static void readers_destroy(struct reftable_reader **readers, size_t n)
+{
+	int i = 0;
+	for (; i < n; i++)
+		reftable_reader_free(readers[i]);
+	reftable_free(readers);
+}
+
+static void test_merged_between(void)
+{
+	uint8_t hash1[GIT_SHA1_RAWSZ] = { 1, 2, 3, 0 };
+
+	struct reftable_ref_record r1[] = { {
+		.refname = "b",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_VAL1,
+		.value.val1 = hash1,
+	} };
+	struct reftable_ref_record r2[] = { {
+		.refname = "a",
+		.update_index = 2,
+		.value_type = REFTABLE_REF_DELETION,
+	} };
+
+	struct reftable_ref_record *refs[] = { r1, r2 };
+	int sizes[] = { 1, 1 };
+	struct strbuf bufs[2] = { STRBUF_INIT, STRBUF_INIT };
+	struct reftable_block_source *bs = NULL;
+	struct reftable_reader **readers = NULL;
+	struct reftable_merged_table *mt =
+		merged_table_from_records(refs, &bs, &readers, sizes, bufs, 2);
+	int i;
+	struct reftable_ref_record ref = { NULL };
+	struct reftable_iterator it = { NULL };
+	int err = reftable_merged_table_seek_ref(mt, &it, "a");
+	EXPECT_ERR(err);
+
+	err = reftable_iterator_next_ref(&it, &ref);
+	EXPECT_ERR(err);
+	EXPECT(ref.update_index == 2);
+	reftable_ref_record_release(&ref);
+	reftable_iterator_destroy(&it);
+	readers_destroy(readers, 2);
+	reftable_merged_table_free(mt);
+	for (i = 0; i < ARRAY_SIZE(bufs); i++) {
+		strbuf_release(&bufs[i]);
+	}
+	reftable_free(bs);
+}
+
+static void test_merged(void)
+{
+	uint8_t hash1[GIT_SHA1_RAWSZ] = { 1 };
+	uint8_t hash2[GIT_SHA1_RAWSZ] = { 2 };
+	struct reftable_ref_record r1[] = {
+		{
+			.refname = "a",
+			.update_index = 1,
+			.value_type = REFTABLE_REF_VAL1,
+			.value.val1 = hash1,
+		},
+		{
+			.refname = "b",
+			.update_index = 1,
+			.value_type = REFTABLE_REF_VAL1,
+			.value.val1 = hash1,
+		},
+		{
+			.refname = "c",
+			.update_index = 1,
+			.value_type = REFTABLE_REF_VAL1,
+			.value.val1 = hash1,
+		}
+	};
+	struct reftable_ref_record r2[] = { {
+		.refname = "a",
+		.update_index = 2,
+		.value_type = REFTABLE_REF_DELETION,
+	} };
+	struct reftable_ref_record r3[] = {
+		{
+			.refname = "c",
+			.update_index = 3,
+			.value_type = REFTABLE_REF_VAL1,
+			.value.val1 = hash2,
+		},
+		{
+			.refname = "d",
+			.update_index = 3,
+			.value_type = REFTABLE_REF_VAL1,
+			.value.val1 = hash1,
+		},
+	};
+
+	struct reftable_ref_record *want[] = {
+		&r2[0],
+		&r1[1],
+		&r3[0],
+		&r3[1],
+	};
+
+	struct reftable_ref_record *refs[] = { r1, r2, r3 };
+	int sizes[3] = { 3, 1, 2 };
+	struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT };
+	struct reftable_block_source *bs = NULL;
+	struct reftable_reader **readers = NULL;
+	struct reftable_merged_table *mt =
+		merged_table_from_records(refs, &bs, &readers, sizes, bufs, 3);
+
+	struct reftable_iterator it = { NULL };
+	int err = reftable_merged_table_seek_ref(mt, &it, "a");
+	struct reftable_ref_record *out = NULL;
+	size_t len = 0;
+	size_t cap = 0;
+	int i = 0;
+
+	EXPECT_ERR(err);
+	EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID);
+	EXPECT(reftable_merged_table_min_update_index(mt) == 1);
+
+	while (len < 100) { /* cap loops/recursion. */
+		struct reftable_ref_record ref = { NULL };
+		int err = reftable_iterator_next_ref(&it, &ref);
+		if (err > 0) {
+			break;
+		}
+		if (len == cap) {
+			cap = 2 * cap + 1;
+			out = reftable_realloc(
+				out, sizeof(struct reftable_ref_record) * cap);
+		}
+		out[len++] = ref;
+	}
+	reftable_iterator_destroy(&it);
+
+	EXPECT(ARRAY_SIZE(want) == len);
+	for (i = 0; i < len; i++) {
+		EXPECT(reftable_ref_record_equal(want[i], &out[i],
+						 GIT_SHA1_RAWSZ));
+	}
+	for (i = 0; i < len; i++) {
+		reftable_ref_record_release(&out[i]);
+	}
+	reftable_free(out);
+
+	for (i = 0; i < 3; i++) {
+		strbuf_release(&bufs[i]);
+	}
+	readers_destroy(readers, 3);
+	reftable_merged_table_free(mt);
+	reftable_free(bs);
+}
+
+static struct reftable_merged_table *
+merged_table_from_log_records(struct reftable_log_record **logs,
+			      struct reftable_block_source **source,
+			      struct reftable_reader ***readers, int *sizes,
+			      struct strbuf *buf, int n)
+{
+	int i = 0;
+	struct reftable_merged_table *mt = NULL;
+	int err;
+	struct reftable_table *tabs =
+		reftable_calloc(n * sizeof(struct reftable_table));
+	*readers = reftable_calloc(n * sizeof(struct reftable_reader *));
+	*source = reftable_calloc(n * sizeof(**source));
+	for (i = 0; i < n; i++) {
+		write_test_log_table(&buf[i], logs[i], sizes[i], i + 1);
+		block_source_from_strbuf(&(*source)[i], &buf[i]);
+
+		err = reftable_new_reader(&(*readers)[i], &(*source)[i],
+					  "name");
+		EXPECT_ERR(err);
+		reftable_table_from_reader(&tabs[i], (*readers)[i]);
+	}
+
+	err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
+	EXPECT_ERR(err);
+	return mt;
+}
+
+static void test_merged_logs(void)
+{
+	uint8_t hash1[GIT_SHA1_RAWSZ] = { 1 };
+	uint8_t hash2[GIT_SHA1_RAWSZ] = { 2 };
+	uint8_t hash3[GIT_SHA1_RAWSZ] = { 3 };
+	struct reftable_log_record r1[] = {
+		{
+			.refname = "a",
+			.update_index = 2,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value.update = {
+				.old_hash = hash2,
+				/* deletion */
+				.name = "jane doe",
+				.email = "jane@invalid",
+				.message = "message2",
+			}
+		},
+		{
+			.refname = "a",
+			.update_index = 1,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value.update = {
+				.old_hash = hash1,
+				.new_hash = hash2,
+				.name = "jane doe",
+				.email = "jane@invalid",
+				.message = "message1",
+			}
+		},
+	};
+	struct reftable_log_record r2[] = {
+		{
+			.refname = "a",
+			.update_index = 3,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value.update = {
+				.new_hash = hash3,
+				.name = "jane doe",
+				.email = "jane@invalid",
+				.message = "message3",
+			}
+		},
+	};
+	struct reftable_log_record r3[] = {
+		{
+			.refname = "a",
+			.update_index = 2,
+			.value_type = REFTABLE_LOG_DELETION,
+		},
+	};
+	struct reftable_log_record *want[] = {
+		&r2[0],
+		&r3[0],
+		&r1[1],
+	};
+
+	struct reftable_log_record *logs[] = { r1, r2, r3 };
+	int sizes[3] = { 2, 1, 1 };
+	struct strbuf bufs[3] = { STRBUF_INIT, STRBUF_INIT, STRBUF_INIT };
+	struct reftable_block_source *bs = NULL;
+	struct reftable_reader **readers = NULL;
+	struct reftable_merged_table *mt = merged_table_from_log_records(
+		logs, &bs, &readers, sizes, bufs, 3);
+
+	struct reftable_iterator it = { NULL };
+	int err = reftable_merged_table_seek_log(mt, &it, "a");
+	struct reftable_log_record *out = NULL;
+	size_t len = 0;
+	size_t cap = 0;
+	int i = 0;
+
+	EXPECT_ERR(err);
+	EXPECT(reftable_merged_table_hash_id(mt) == GIT_SHA1_FORMAT_ID);
+	EXPECT(reftable_merged_table_min_update_index(mt) == 1);
+
+	while (len < 100) { /* cap loops/recursion. */
+		struct reftable_log_record log = { NULL };
+		int err = reftable_iterator_next_log(&it, &log);
+		if (err > 0) {
+			break;
+		}
+		if (len == cap) {
+			cap = 2 * cap + 1;
+			out = reftable_realloc(
+				out, sizeof(struct reftable_log_record) * cap);
+		}
+		out[len++] = log;
+	}
+	reftable_iterator_destroy(&it);
+
+	EXPECT(ARRAY_SIZE(want) == len);
+	for (i = 0; i < len; i++) {
+		EXPECT(reftable_log_record_equal(want[i], &out[i],
+						 GIT_SHA1_RAWSZ));
+	}
+
+	err = reftable_merged_table_seek_log_at(mt, &it, "a", 2);
+	EXPECT_ERR(err);
+	reftable_log_record_release(&out[0]);
+	err = reftable_iterator_next_log(&it, &out[0]);
+	EXPECT_ERR(err);
+	EXPECT(reftable_log_record_equal(&out[0], &r3[0], GIT_SHA1_RAWSZ));
+	reftable_iterator_destroy(&it);
+
+	for (i = 0; i < len; i++) {
+		reftable_log_record_release(&out[i]);
+	}
+	reftable_free(out);
+
+	for (i = 0; i < 3; i++) {
+		strbuf_release(&bufs[i]);
+	}
+	readers_destroy(readers, 3);
+	reftable_merged_table_free(mt);
+	reftable_free(bs);
+}
+
+static void test_default_write_opts(void)
+{
+	struct reftable_write_options opts = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+	struct reftable_ref_record rec = {
+		.refname = "master",
+		.update_index = 1,
+	};
+	int err;
+	struct reftable_block_source source = { NULL };
+	struct reftable_table *tab = reftable_calloc(sizeof(*tab) * 1);
+	uint32_t hash_id;
+	struct reftable_reader *rd = NULL;
+	struct reftable_merged_table *merged = NULL;
+
+	reftable_writer_set_limits(w, 1, 1);
+
+	err = reftable_writer_add_ref(w, &rec);
+	EXPECT_ERR(err);
+
+	err = reftable_writer_close(w);
+	EXPECT_ERR(err);
+	reftable_writer_free(w);
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = reftable_new_reader(&rd, &source, "filename");
+	EXPECT_ERR(err);
+
+	hash_id = reftable_reader_hash_id(rd);
+	EXPECT(hash_id == GIT_SHA1_FORMAT_ID);
+
+	reftable_table_from_reader(&tab[0], rd);
+	err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
+	EXPECT_ERR(err);
+
+	reftable_reader_free(rd);
+	reftable_merged_table_free(merged);
+	strbuf_release(&buf);
+}
+
+/* XXX test refs_for(oid) */
+
+int merged_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_merged_logs);
+	RUN_TEST(test_merged_between);
+	RUN_TEST(test_merged);
+	RUN_TEST(test_default_write_opts);
+	return 0;
+}
diff --git a/reftable/pq.c b/reftable/pq.c
new file mode 100644
index 0000000000..efc474017a
--- /dev/null
+++ b/reftable/pq.c
@@ -0,0 +1,105 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "pq.h"
+
+#include "reftable-record.h"
+#include "system.h"
+#include "basics.h"
+
+int pq_less(struct pq_entry *a, struct pq_entry *b)
+{
+	struct strbuf ak = STRBUF_INIT;
+	struct strbuf bk = STRBUF_INIT;
+	int cmp = 0;
+	reftable_record_key(&a->rec, &ak);
+	reftable_record_key(&b->rec, &bk);
+
+	cmp = strbuf_cmp(&ak, &bk);
+
+	strbuf_release(&ak);
+	strbuf_release(&bk);
+
+	if (cmp == 0)
+		return a->index > b->index;
+
+	return cmp < 0;
+}
+
+struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq)
+{
+	return pq.heap[0];
+}
+
+int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq)
+{
+	return pq.len == 0;
+}
+
+struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq)
+{
+	int i = 0;
+	struct pq_entry e = pq->heap[0];
+	pq->heap[0] = pq->heap[pq->len - 1];
+	pq->len--;
+
+	i = 0;
+	while (i < pq->len) {
+		int min = i;
+		int j = 2 * i + 1;
+		int k = 2 * i + 2;
+		if (j < pq->len && pq_less(&pq->heap[j], &pq->heap[i])) {
+			min = j;
+		}
+		if (k < pq->len && pq_less(&pq->heap[k], &pq->heap[min])) {
+			min = k;
+		}
+
+		if (min == i) {
+			break;
+		}
+
+		SWAP(pq->heap[i], pq->heap[min]);
+		i = min;
+	}
+
+	return e;
+}
+
+void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e)
+{
+	int i = 0;
+	if (pq->len == pq->cap) {
+		pq->cap = 2 * pq->cap + 1;
+		pq->heap = reftable_realloc(pq->heap,
+					    pq->cap * sizeof(struct pq_entry));
+	}
+
+	pq->heap[pq->len++] = e;
+	i = pq->len - 1;
+	while (i > 0) {
+		int j = (i - 1) / 2;
+		if (pq_less(&pq->heap[j], &pq->heap[i])) {
+			break;
+		}
+
+		SWAP(pq->heap[j], pq->heap[i]);
+
+		i = j;
+	}
+}
+
+void merged_iter_pqueue_release(struct merged_iter_pqueue *pq)
+{
+	int i = 0;
+	for (i = 0; i < pq->len; i++) {
+		reftable_record_destroy(&pq->heap[i].rec);
+	}
+	FREE_AND_NULL(pq->heap);
+	pq->len = pq->cap = 0;
+}
diff --git a/reftable/pq.h b/reftable/pq.h
new file mode 100644
index 0000000000..56fc1b6d87
--- /dev/null
+++ b/reftable/pq.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef PQ_H
+#define PQ_H
+
+#include "record.h"
+
+struct pq_entry {
+	int index;
+	struct reftable_record rec;
+};
+
+struct merged_iter_pqueue {
+	struct pq_entry *heap;
+	size_t len;
+	size_t cap;
+};
+
+struct pq_entry merged_iter_pqueue_top(struct merged_iter_pqueue pq);
+int merged_iter_pqueue_is_empty(struct merged_iter_pqueue pq);
+void merged_iter_pqueue_check(struct merged_iter_pqueue pq);
+struct pq_entry merged_iter_pqueue_remove(struct merged_iter_pqueue *pq);
+void merged_iter_pqueue_add(struct merged_iter_pqueue *pq, struct pq_entry e);
+void merged_iter_pqueue_release(struct merged_iter_pqueue *pq);
+int pq_less(struct pq_entry *a, struct pq_entry *b);
+
+#endif
diff --git a/reftable/pq_test.c b/reftable/pq_test.c
new file mode 100644
index 0000000000..c9bb05e37b
--- /dev/null
+++ b/reftable/pq_test.c
@@ -0,0 +1,82 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "constants.h"
+#include "pq.h"
+#include "record.h"
+#include "reftable-tests.h"
+#include "test_framework.h"
+
+void merged_iter_pqueue_check(struct merged_iter_pqueue pq)
+{
+	int i;
+	for (i = 1; i < pq.len; i++) {
+		int parent = (i - 1) / 2;
+
+		EXPECT(pq_less(&pq.heap[parent], &pq.heap[i]));
+	}
+}
+
+static void test_pq(void)
+{
+	char *names[54] = { NULL };
+	int N = ARRAY_SIZE(names) - 1;
+
+	struct merged_iter_pqueue pq = { NULL };
+	const char *last = NULL;
+
+	int i = 0;
+	for (i = 0; i < N; i++) {
+		char name[100];
+		snprintf(name, sizeof(name), "%02d", i);
+		names[i] = xstrdup(name);
+	}
+
+	i = 1;
+	do {
+		struct reftable_record rec =
+			reftable_new_record(BLOCK_TYPE_REF);
+		struct pq_entry e = { 0 };
+
+		reftable_record_as_ref(&rec)->refname = names[i];
+		e.rec = rec;
+		merged_iter_pqueue_add(&pq, e);
+		merged_iter_pqueue_check(pq);
+		i = (i * 7) % N;
+	} while (i != 1);
+
+	while (!merged_iter_pqueue_is_empty(pq)) {
+		struct pq_entry e = merged_iter_pqueue_remove(&pq);
+		struct reftable_ref_record *ref =
+			reftable_record_as_ref(&e.rec);
+
+		merged_iter_pqueue_check(pq);
+
+		if (last) {
+			EXPECT(strcmp(last, ref->refname) < 0);
+		}
+		last = ref->refname;
+		ref->refname = NULL;
+		reftable_free(ref);
+	}
+
+	for (i = 0; i < N; i++) {
+		reftable_free(names[i]);
+	}
+
+	merged_iter_pqueue_release(&pq);
+}
+
+int pq_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_pq);
+	return 0;
+}
diff --git a/reftable/publicbasics.c b/reftable/publicbasics.c
new file mode 100644
index 0000000000..0ad7d5c0ff
--- /dev/null
+++ b/reftable/publicbasics.c
@@ -0,0 +1,65 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "reftable-malloc.h"
+
+#include "basics.h"
+#include "system.h"
+
+static void *(*reftable_malloc_ptr)(size_t sz);
+static void *(*reftable_realloc_ptr)(void *, size_t);
+static void (*reftable_free_ptr)(void *);
+
+void *reftable_malloc(size_t sz)
+{
+	if (reftable_malloc_ptr)
+		return (*reftable_malloc_ptr)(sz);
+	return malloc(sz);
+}
+
+void *reftable_realloc(void *p, size_t sz)
+{
+	if (reftable_realloc_ptr)
+		return (*reftable_realloc_ptr)(p, sz);
+	return realloc(p, sz);
+}
+
+void reftable_free(void *p)
+{
+	if (reftable_free_ptr)
+		reftable_free_ptr(p);
+	else
+		free(p);
+}
+
+void *reftable_calloc(size_t sz)
+{
+	void *p = reftable_malloc(sz);
+	memset(p, 0, sz);
+	return p;
+}
+
+void reftable_set_alloc(void *(*malloc)(size_t),
+			void *(*realloc)(void *, size_t), void (*free)(void *))
+{
+	reftable_malloc_ptr = malloc;
+	reftable_realloc_ptr = realloc;
+	reftable_free_ptr = free;
+}
+
+int hash_size(uint32_t id)
+{
+	switch (id) {
+	case 0:
+	case GIT_SHA1_FORMAT_ID:
+		return GIT_SHA1_RAWSZ;
+	case GIT_SHA256_FORMAT_ID:
+		return GIT_SHA256_RAWSZ;
+	}
+	abort();
+}
diff --git a/reftable/reader.c b/reftable/reader.c
new file mode 100644
index 0000000000..006709a645
--- /dev/null
+++ b/reftable/reader.c
@@ -0,0 +1,801 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "reader.h"
+
+#include "system.h"
+#include "block.h"
+#include "constants.h"
+#include "generic.h"
+#include "iter.h"
+#include "record.h"
+#include "reftable-error.h"
+#include "reftable-generic.h"
+#include "tree.h"
+
+uint64_t block_source_size(struct reftable_block_source *source)
+{
+	return source->ops->size(source->arg);
+}
+
+int block_source_read_block(struct reftable_block_source *source,
+			    struct reftable_block *dest, uint64_t off,
+			    uint32_t size)
+{
+	int result = source->ops->read_block(source->arg, dest, off, size);
+	dest->source = *source;
+	return result;
+}
+
+void block_source_close(struct reftable_block_source *source)
+{
+	if (!source->ops) {
+		return;
+	}
+
+	source->ops->close(source->arg);
+	source->ops = NULL;
+}
+
+static struct reftable_reader_offsets *
+reader_offsets_for(struct reftable_reader *r, uint8_t typ)
+{
+	switch (typ) {
+	case BLOCK_TYPE_REF:
+		return &r->ref_offsets;
+	case BLOCK_TYPE_LOG:
+		return &r->log_offsets;
+	case BLOCK_TYPE_OBJ:
+		return &r->obj_offsets;
+	}
+	abort();
+}
+
+static int reader_get_block(struct reftable_reader *r,
+			    struct reftable_block *dest, uint64_t off,
+			    uint32_t sz)
+{
+	if (off >= r->size)
+		return 0;
+
+	if (off + sz > r->size) {
+		sz = r->size - off;
+	}
+
+	return block_source_read_block(&r->source, dest, off, sz);
+}
+
+uint32_t reftable_reader_hash_id(struct reftable_reader *r)
+{
+	return r->hash_id;
+}
+
+const char *reader_name(struct reftable_reader *r)
+{
+	return r->name;
+}
+
+static int parse_footer(struct reftable_reader *r, uint8_t *footer,
+			uint8_t *header)
+{
+	uint8_t *f = footer;
+	uint8_t first_block_typ;
+	int err = 0;
+	uint32_t computed_crc;
+	uint32_t file_crc;
+
+	if (memcmp(f, "REFT", 4)) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+	f += 4;
+
+	if (memcmp(footer, header, header_size(r->version))) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
+	f++;
+	r->block_size = get_be24(f);
+
+	f += 3;
+	r->min_update_index = get_be64(f);
+	f += 8;
+	r->max_update_index = get_be64(f);
+	f += 8;
+
+	if (r->version == 1) {
+		r->hash_id = GIT_SHA1_FORMAT_ID;
+	} else {
+		r->hash_id = get_be32(f);
+		switch (r->hash_id) {
+		case GIT_SHA1_FORMAT_ID:
+			break;
+		case GIT_SHA256_FORMAT_ID:
+			break;
+		default:
+			err = REFTABLE_FORMAT_ERROR;
+			goto done;
+		}
+		f += 4;
+	}
+
+	r->ref_offsets.index_offset = get_be64(f);
+	f += 8;
+
+	r->obj_offsets.offset = get_be64(f);
+	f += 8;
+
+	r->object_id_len = r->obj_offsets.offset & ((1 << 5) - 1);
+	r->obj_offsets.offset >>= 5;
+
+	r->obj_offsets.index_offset = get_be64(f);
+	f += 8;
+	r->log_offsets.offset = get_be64(f);
+	f += 8;
+	r->log_offsets.index_offset = get_be64(f);
+	f += 8;
+
+	computed_crc = crc32(0, footer, f - footer);
+	file_crc = get_be32(f);
+	f += 4;
+	if (computed_crc != file_crc) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
+	first_block_typ = header[header_size(r->version)];
+	r->ref_offsets.is_present = (first_block_typ == BLOCK_TYPE_REF);
+	r->ref_offsets.offset = 0;
+	r->log_offsets.is_present = (first_block_typ == BLOCK_TYPE_LOG ||
+				     r->log_offsets.offset > 0);
+	r->obj_offsets.is_present = r->obj_offsets.offset > 0;
+	err = 0;
+done:
+	return err;
+}
+
+int init_reader(struct reftable_reader *r, struct reftable_block_source *source,
+		const char *name)
+{
+	struct reftable_block footer = { NULL };
+	struct reftable_block header = { NULL };
+	int err = 0;
+	uint64_t file_size = block_source_size(source);
+
+	/* Need +1 to read type of first block. */
+	uint32_t read_size = header_size(2) + 1; /* read v2 because it's larger.  */
+	memset(r, 0, sizeof(struct reftable_reader));
+
+	if (read_size > file_size) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
+	err = block_source_read_block(source, &header, 0, read_size);
+	if (err != read_size) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	if (memcmp(header.data, "REFT", 4)) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+	r->version = header.data[4];
+	if (r->version != 1 && r->version != 2) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
+	r->size = file_size - footer_size(r->version);
+	r->source = *source;
+	r->name = xstrdup(name);
+	r->hash_id = 0;
+
+	err = block_source_read_block(source, &footer, r->size,
+				      footer_size(r->version));
+	if (err != footer_size(r->version)) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	err = parse_footer(r, footer.data, header.data);
+done:
+	reftable_block_done(&footer);
+	reftable_block_done(&header);
+	return err;
+}
+
+struct table_iter {
+	struct reftable_reader *r;
+	uint8_t typ;
+	uint64_t block_off;
+	struct block_iter bi;
+	int is_finished;
+};
+#define TABLE_ITER_INIT                          \
+	{                                        \
+		.bi = {.last_key = STRBUF_INIT } \
+	}
+
+static void table_iter_copy_from(struct table_iter *dest,
+				 struct table_iter *src)
+{
+	dest->r = src->r;
+	dest->typ = src->typ;
+	dest->block_off = src->block_off;
+	dest->is_finished = src->is_finished;
+	block_iter_copy_from(&dest->bi, &src->bi);
+}
+
+static int table_iter_next_in_block(struct table_iter *ti,
+				    struct reftable_record *rec)
+{
+	int res = block_iter_next(&ti->bi, rec);
+	if (res == 0 && reftable_record_type(rec) == BLOCK_TYPE_REF) {
+		((struct reftable_ref_record *)rec->data)->update_index +=
+			ti->r->min_update_index;
+	}
+
+	return res;
+}
+
+static void table_iter_block_done(struct table_iter *ti)
+{
+	if (!ti->bi.br) {
+		return;
+	}
+	reftable_block_done(&ti->bi.br->block);
+	FREE_AND_NULL(ti->bi.br);
+
+	ti->bi.last_key.len = 0;
+	ti->bi.next_off = 0;
+}
+
+static int32_t extract_block_size(uint8_t *data, uint8_t *typ, uint64_t off,
+				  int version)
+{
+	int32_t result = 0;
+
+	if (off == 0) {
+		data += header_size(version);
+	}
+
+	*typ = data[0];
+	if (reftable_is_block_type(*typ)) {
+		result = get_be24(data + 1);
+	}
+	return result;
+}
+
+int reader_init_block_reader(struct reftable_reader *r, struct block_reader *br,
+			     uint64_t next_off, uint8_t want_typ)
+{
+	int32_t guess_block_size = r->block_size ? r->block_size :
+							 DEFAULT_BLOCK_SIZE;
+	struct reftable_block block = { NULL };
+	uint8_t block_typ = 0;
+	int err = 0;
+	uint32_t header_off = next_off ? 0 : header_size(r->version);
+	int32_t block_size = 0;
+
+	if (next_off >= r->size)
+		return 1;
+
+	err = reader_get_block(r, &block, next_off, guess_block_size);
+	if (err < 0)
+		return err;
+
+	block_size = extract_block_size(block.data, &block_typ, next_off,
+					r->version);
+	if (block_size < 0)
+		return block_size;
+
+	if (want_typ != BLOCK_TYPE_ANY && block_typ != want_typ) {
+		reftable_block_done(&block);
+		return 1;
+	}
+
+	if (block_size > guess_block_size) {
+		reftable_block_done(&block);
+		err = reader_get_block(r, &block, next_off, block_size);
+		if (err < 0) {
+			return err;
+		}
+	}
+
+	return block_reader_init(br, &block, header_off, r->block_size,
+				 hash_size(r->hash_id));
+}
+
+static int table_iter_next_block(struct table_iter *dest,
+				 struct table_iter *src)
+{
+	uint64_t next_block_off = src->block_off + src->bi.br->full_block_size;
+	struct block_reader br = { 0 };
+	int err = 0;
+
+	dest->r = src->r;
+	dest->typ = src->typ;
+	dest->block_off = next_block_off;
+
+	err = reader_init_block_reader(src->r, &br, next_block_off, src->typ);
+	if (err > 0) {
+		dest->is_finished = 1;
+		return 1;
+	}
+	if (err != 0)
+		return err;
+	else {
+		struct block_reader *brp =
+			reftable_malloc(sizeof(struct block_reader));
+		*brp = br;
+
+		dest->is_finished = 0;
+		block_reader_start(brp, &dest->bi);
+	}
+	return 0;
+}
+
+static int table_iter_next(struct table_iter *ti, struct reftable_record *rec)
+{
+	if (reftable_record_type(rec) != ti->typ)
+		return REFTABLE_API_ERROR;
+
+	while (1) {
+		struct table_iter next = TABLE_ITER_INIT;
+		int err = 0;
+		if (ti->is_finished) {
+			return 1;
+		}
+
+		err = table_iter_next_in_block(ti, rec);
+		if (err <= 0) {
+			return err;
+		}
+
+		err = table_iter_next_block(&next, ti);
+		if (err != 0) {
+			ti->is_finished = 1;
+		}
+		table_iter_block_done(ti);
+		if (err != 0) {
+			return err;
+		}
+		table_iter_copy_from(ti, &next);
+		block_iter_close(&next.bi);
+	}
+}
+
+static int table_iter_next_void(void *ti, struct reftable_record *rec)
+{
+	return table_iter_next(ti, rec);
+}
+
+static void table_iter_close(void *p)
+{
+	struct table_iter *ti = p;
+	table_iter_block_done(ti);
+	block_iter_close(&ti->bi);
+}
+
+static struct reftable_iterator_vtable table_iter_vtable = {
+	.next = &table_iter_next_void,
+	.close = &table_iter_close,
+};
+
+static void iterator_from_table_iter(struct reftable_iterator *it,
+				     struct table_iter *ti)
+{
+	assert(!it->ops);
+	it->iter_arg = ti;
+	it->ops = &table_iter_vtable;
+}
+
+static int reader_table_iter_at(struct reftable_reader *r,
+				struct table_iter *ti, uint64_t off,
+				uint8_t typ)
+{
+	struct block_reader br = { 0 };
+	struct block_reader *brp = NULL;
+
+	int err = reader_init_block_reader(r, &br, off, typ);
+	if (err != 0)
+		return err;
+
+	brp = reftable_malloc(sizeof(struct block_reader));
+	*brp = br;
+	ti->r = r;
+	ti->typ = block_reader_type(brp);
+	ti->block_off = off;
+	block_reader_start(brp, &ti->bi);
+	return 0;
+}
+
+static int reader_start(struct reftable_reader *r, struct table_iter *ti,
+			uint8_t typ, int index)
+{
+	struct reftable_reader_offsets *offs = reader_offsets_for(r, typ);
+	uint64_t off = offs->offset;
+	if (index) {
+		off = offs->index_offset;
+		if (off == 0) {
+			return 1;
+		}
+		typ = BLOCK_TYPE_INDEX;
+	}
+
+	return reader_table_iter_at(r, ti, off, typ);
+}
+
+static int reader_seek_linear(struct reftable_reader *r, struct table_iter *ti,
+			      struct reftable_record *want)
+{
+	struct reftable_record rec =
+		reftable_new_record(reftable_record_type(want));
+	struct strbuf want_key = STRBUF_INIT;
+	struct strbuf got_key = STRBUF_INIT;
+	struct table_iter next = TABLE_ITER_INIT;
+	int err = -1;
+
+	reftable_record_key(want, &want_key);
+
+	while (1) {
+		err = table_iter_next_block(&next, ti);
+		if (err < 0)
+			goto done;
+
+		if (err > 0) {
+			break;
+		}
+
+		err = block_reader_first_key(next.bi.br, &got_key);
+		if (err < 0)
+			goto done;
+
+		if (strbuf_cmp(&got_key, &want_key) > 0) {
+			table_iter_block_done(&next);
+			break;
+		}
+
+		table_iter_block_done(ti);
+		table_iter_copy_from(ti, &next);
+	}
+
+	err = block_iter_seek(&ti->bi, &want_key);
+	if (err < 0)
+		goto done;
+	err = 0;
+
+done:
+	block_iter_close(&next.bi);
+	reftable_record_destroy(&rec);
+	strbuf_release(&want_key);
+	strbuf_release(&got_key);
+	return err;
+}
+
+static int reader_seek_indexed(struct reftable_reader *r,
+			       struct reftable_iterator *it,
+			       struct reftable_record *rec)
+{
+	struct reftable_index_record want_index = { .last_key = STRBUF_INIT };
+	struct reftable_record want_index_rec = { NULL };
+	struct reftable_index_record index_result = { .last_key = STRBUF_INIT };
+	struct reftable_record index_result_rec = { NULL };
+	struct table_iter index_iter = TABLE_ITER_INIT;
+	struct table_iter next = TABLE_ITER_INIT;
+	int err = 0;
+
+	reftable_record_key(rec, &want_index.last_key);
+	reftable_record_from_index(&want_index_rec, &want_index);
+	reftable_record_from_index(&index_result_rec, &index_result);
+
+	err = reader_start(r, &index_iter, reftable_record_type(rec), 1);
+	if (err < 0)
+		goto done;
+
+	err = reader_seek_linear(r, &index_iter, &want_index_rec);
+	while (1) {
+		err = table_iter_next(&index_iter, &index_result_rec);
+		table_iter_block_done(&index_iter);
+		if (err != 0)
+			goto done;
+
+		err = reader_table_iter_at(r, &next, index_result.offset, 0);
+		if (err != 0)
+			goto done;
+
+		err = block_iter_seek(&next.bi, &want_index.last_key);
+		if (err < 0)
+			goto done;
+
+		if (next.typ == reftable_record_type(rec)) {
+			err = 0;
+			break;
+		}
+
+		if (next.typ != BLOCK_TYPE_INDEX) {
+			err = REFTABLE_FORMAT_ERROR;
+			break;
+		}
+
+		table_iter_copy_from(&index_iter, &next);
+	}
+
+	if (err == 0) {
+		struct table_iter empty = TABLE_ITER_INIT;
+		struct table_iter *malloced =
+			reftable_calloc(sizeof(struct table_iter));
+		*malloced = empty;
+		table_iter_copy_from(malloced, &next);
+		iterator_from_table_iter(it, malloced);
+	}
+done:
+	block_iter_close(&next.bi);
+	table_iter_close(&index_iter);
+	reftable_record_release(&want_index_rec);
+	reftable_record_release(&index_result_rec);
+	return err;
+}
+
+static int reader_seek_internal(struct reftable_reader *r,
+				struct reftable_iterator *it,
+				struct reftable_record *rec)
+{
+	struct reftable_reader_offsets *offs =
+		reader_offsets_for(r, reftable_record_type(rec));
+	uint64_t idx = offs->index_offset;
+	struct table_iter ti = TABLE_ITER_INIT;
+	int err = 0;
+	if (idx > 0)
+		return reader_seek_indexed(r, it, rec);
+
+	err = reader_start(r, &ti, reftable_record_type(rec), 0);
+	if (err < 0)
+		return err;
+	err = reader_seek_linear(r, &ti, rec);
+	if (err < 0)
+		return err;
+	else {
+		struct table_iter *p =
+			reftable_malloc(sizeof(struct table_iter));
+		*p = ti;
+		iterator_from_table_iter(it, p);
+	}
+
+	return 0;
+}
+
+static int reader_seek(struct reftable_reader *r, struct reftable_iterator *it,
+		       struct reftable_record *rec)
+{
+	uint8_t typ = reftable_record_type(rec);
+
+	struct reftable_reader_offsets *offs = reader_offsets_for(r, typ);
+	if (!offs->is_present) {
+		iterator_set_empty(it);
+		return 0;
+	}
+
+	return reader_seek_internal(r, it, rec);
+}
+
+int reftable_reader_seek_ref(struct reftable_reader *r,
+			     struct reftable_iterator *it, const char *name)
+{
+	struct reftable_ref_record ref = {
+		.refname = (char *)name,
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_ref(&rec, &ref);
+	return reader_seek(r, it, &rec);
+}
+
+int reftable_reader_seek_log_at(struct reftable_reader *r,
+				struct reftable_iterator *it, const char *name,
+				uint64_t update_index)
+{
+	struct reftable_log_record log = {
+		.refname = (char *)name,
+		.update_index = update_index,
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_log(&rec, &log);
+	return reader_seek(r, it, &rec);
+}
+
+int reftable_reader_seek_log(struct reftable_reader *r,
+			     struct reftable_iterator *it, const char *name)
+{
+	uint64_t max = ~((uint64_t)0);
+	return reftable_reader_seek_log_at(r, it, name, max);
+}
+
+void reader_close(struct reftable_reader *r)
+{
+	block_source_close(&r->source);
+	FREE_AND_NULL(r->name);
+}
+
+int reftable_new_reader(struct reftable_reader **p,
+			struct reftable_block_source *src, char const *name)
+{
+	struct reftable_reader *rd =
+		reftable_calloc(sizeof(struct reftable_reader));
+	int err = init_reader(rd, src, name);
+	if (err == 0) {
+		*p = rd;
+	} else {
+		block_source_close(src);
+		reftable_free(rd);
+	}
+	return err;
+}
+
+void reftable_reader_free(struct reftable_reader *r)
+{
+	reader_close(r);
+	reftable_free(r);
+}
+
+static int reftable_reader_refs_for_indexed(struct reftable_reader *r,
+					    struct reftable_iterator *it,
+					    uint8_t *oid)
+{
+	struct reftable_obj_record want = {
+		.hash_prefix = oid,
+		.hash_prefix_len = r->object_id_len,
+	};
+	struct reftable_record want_rec = { NULL };
+	struct reftable_iterator oit = { NULL };
+	struct reftable_obj_record got = { NULL };
+	struct reftable_record got_rec = { NULL };
+	int err = 0;
+	struct indexed_table_ref_iter *itr = NULL;
+
+	/* Look through the reverse index. */
+	reftable_record_from_obj(&want_rec, &want);
+	err = reader_seek(r, &oit, &want_rec);
+	if (err != 0)
+		goto done;
+
+	/* read out the reftable_obj_record */
+	reftable_record_from_obj(&got_rec, &got);
+	err = iterator_next(&oit, &got_rec);
+	if (err < 0)
+		goto done;
+
+	if (err > 0 ||
+	    memcmp(want.hash_prefix, got.hash_prefix, r->object_id_len)) {
+		/* didn't find it; return empty iterator */
+		iterator_set_empty(it);
+		err = 0;
+		goto done;
+	}
+
+	err = new_indexed_table_ref_iter(&itr, r, oid, hash_size(r->hash_id),
+					 got.offsets, got.offset_len);
+	if (err < 0)
+		goto done;
+	got.offsets = NULL;
+	iterator_from_indexed_table_ref_iter(it, itr);
+
+done:
+	reftable_iterator_destroy(&oit);
+	reftable_record_release(&got_rec);
+	return err;
+}
+
+static int reftable_reader_refs_for_unindexed(struct reftable_reader *r,
+					      struct reftable_iterator *it,
+					      uint8_t *oid)
+{
+	struct table_iter ti_empty = TABLE_ITER_INIT;
+	struct table_iter *ti = reftable_calloc(sizeof(struct table_iter));
+	struct filtering_ref_iterator *filter = NULL;
+	struct filtering_ref_iterator empty = FILTERING_REF_ITERATOR_INIT;
+	int oid_len = hash_size(r->hash_id);
+	int err;
+
+	*ti = ti_empty;
+	err = reader_start(r, ti, BLOCK_TYPE_REF, 0);
+	if (err < 0) {
+		reftable_free(ti);
+		return err;
+	}
+
+	filter = reftable_malloc(sizeof(struct filtering_ref_iterator));
+	*filter = empty;
+
+	strbuf_add(&filter->oid, oid, oid_len);
+	reftable_table_from_reader(&filter->tab, r);
+	filter->double_check = 0;
+	iterator_from_table_iter(&filter->it, ti);
+
+	iterator_from_filtering_ref_iterator(it, filter);
+	return 0;
+}
+
+int reftable_reader_refs_for(struct reftable_reader *r,
+			     struct reftable_iterator *it, uint8_t *oid)
+{
+	if (r->obj_offsets.is_present)
+		return reftable_reader_refs_for_indexed(r, it, oid);
+	return reftable_reader_refs_for_unindexed(r, it, oid);
+}
+
+uint64_t reftable_reader_max_update_index(struct reftable_reader *r)
+{
+	return r->max_update_index;
+}
+
+uint64_t reftable_reader_min_update_index(struct reftable_reader *r)
+{
+	return r->min_update_index;
+}
+
+/* generic table interface. */
+
+static int reftable_reader_seek_void(void *tab, struct reftable_iterator *it,
+				     struct reftable_record *rec)
+{
+	return reader_seek(tab, it, rec);
+}
+
+static uint32_t reftable_reader_hash_id_void(void *tab)
+{
+	return reftable_reader_hash_id(tab);
+}
+
+static uint64_t reftable_reader_min_update_index_void(void *tab)
+{
+	return reftable_reader_min_update_index(tab);
+}
+
+static uint64_t reftable_reader_max_update_index_void(void *tab)
+{
+	return reftable_reader_max_update_index(tab);
+}
+
+static struct reftable_table_vtable reader_vtable = {
+	.seek_record = reftable_reader_seek_void,
+	.hash_id = reftable_reader_hash_id_void,
+	.min_update_index = reftable_reader_min_update_index_void,
+	.max_update_index = reftable_reader_max_update_index_void,
+};
+
+void reftable_table_from_reader(struct reftable_table *tab,
+				struct reftable_reader *reader)
+{
+	assert(!tab->ops);
+	tab->ops = &reader_vtable;
+	tab->table_arg = reader;
+}
+
+
+int reftable_reader_print_file(const char *tablename)
+{
+	struct reftable_block_source src = { NULL };
+	int err = reftable_block_source_from_file(&src, tablename);
+	struct reftable_reader *r = NULL;
+	struct reftable_table tab = { NULL };
+	if (err < 0)
+		goto done;
+
+	err = reftable_new_reader(&r, &src, tablename);
+	if (err < 0)
+		goto done;
+
+	reftable_table_from_reader(&tab, r);
+	err = reftable_table_print(&tab);
+done:
+	reftable_reader_free(r);
+	return err;
+}
diff --git a/reftable/reader.h b/reftable/reader.h
new file mode 100644
index 0000000000..e869165f23
--- /dev/null
+++ b/reftable/reader.h
@@ -0,0 +1,64 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef READER_H
+#define READER_H
+
+#include "block.h"
+#include "record.h"
+#include "reftable-iterator.h"
+#include "reftable-reader.h"
+
+uint64_t block_source_size(struct reftable_block_source *source);
+
+int block_source_read_block(struct reftable_block_source *source,
+			    struct reftable_block *dest, uint64_t off,
+			    uint32_t size);
+void block_source_close(struct reftable_block_source *source);
+
+/* metadata for a block type */
+struct reftable_reader_offsets {
+	int is_present;
+	uint64_t offset;
+	uint64_t index_offset;
+};
+
+/* The state for reading a reftable file. */
+struct reftable_reader {
+	/* for convience, associate a name with the instance. */
+	char *name;
+	struct reftable_block_source source;
+
+	/* Size of the file, excluding the footer. */
+	uint64_t size;
+
+	/* 'sha1' for SHA1, 's256' for SHA-256 */
+	uint32_t hash_id;
+
+	uint32_t block_size;
+	uint64_t min_update_index;
+	uint64_t max_update_index;
+	/* Length of the OID keys in the 'o' section */
+	int object_id_len;
+	int version;
+
+	struct reftable_reader_offsets ref_offsets;
+	struct reftable_reader_offsets obj_offsets;
+	struct reftable_reader_offsets log_offsets;
+};
+
+int init_reader(struct reftable_reader *r, struct reftable_block_source *source,
+		const char *name);
+void reader_close(struct reftable_reader *r);
+const char *reader_name(struct reftable_reader *r);
+
+/* initialize a block reader to read from `r` */
+int reader_init_block_reader(struct reftable_reader *r, struct block_reader *br,
+			     uint64_t next_off, uint8_t want_typ);
+
+#endif
diff --git a/reftable/readwrite_test.c b/reftable/readwrite_test.c
new file mode 100644
index 0000000000..70c7aedba2
--- /dev/null
+++ b/reftable/readwrite_test.c
@@ -0,0 +1,687 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+
+#include "basics.h"
+#include "block.h"
+#include "blocksource.h"
+#include "constants.h"
+#include "reader.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+#include "reftable-writer.h"
+
+static const int update_index = 5;
+
+static void test_buffer(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_block_source source = { NULL };
+	struct reftable_block out = { NULL };
+	int n;
+	uint8_t in[] = "hello";
+	strbuf_add(&buf, in, sizeof(in));
+	block_source_from_strbuf(&source, &buf);
+	EXPECT(block_source_size(&source) == 6);
+	n = block_source_read_block(&source, &out, 0, sizeof(in));
+	EXPECT(n == sizeof(in));
+	EXPECT(!memcmp(in, out.data, n));
+	reftable_block_done(&out);
+
+	n = block_source_read_block(&source, &out, 1, 2);
+	EXPECT(n == 2);
+	EXPECT(!memcmp(out.data, "el", 2));
+
+	reftable_block_done(&out);
+	block_source_close(&source);
+	strbuf_release(&buf);
+}
+
+static void write_table(char ***names, struct strbuf *buf, int N,
+			int block_size, uint32_t hash_id)
+{
+	struct reftable_write_options opts = {
+		.block_size = block_size,
+		.hash_id = hash_id,
+	};
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, buf, &opts);
+	struct reftable_ref_record ref = { NULL };
+	int i = 0, n;
+	struct reftable_log_record log = { NULL };
+	const struct reftable_stats *stats = NULL;
+	*names = reftable_calloc(sizeof(char *) * (N + 1));
+	reftable_writer_set_limits(w, update_index, update_index);
+	for (i = 0; i < N; i++) {
+		uint8_t hash[GIT_SHA256_RAWSZ] = { 0 };
+		char name[100];
+		int n;
+
+		set_test_hash(hash, i);
+
+		snprintf(name, sizeof(name), "refs/heads/branch%02d", i);
+
+		ref.refname = name;
+		ref.update_index = update_index;
+		ref.value_type = REFTABLE_REF_VAL1;
+		ref.value.val1 = hash;
+		(*names)[i] = xstrdup(name);
+
+		n = reftable_writer_add_ref(w, &ref);
+		EXPECT(n == 0);
+	}
+
+	for (i = 0; i < N; i++) {
+		uint8_t hash[GIT_SHA256_RAWSZ] = { 0 };
+		char name[100];
+		int n;
+
+		set_test_hash(hash, i);
+
+		snprintf(name, sizeof(name), "refs/heads/branch%02d", i);
+
+		log.refname = name;
+		log.update_index = update_index;
+		log.value_type = REFTABLE_LOG_UPDATE;
+		log.value.update.new_hash = hash;
+		log.value.update.message = "message";
+
+		n = reftable_writer_add_log(w, &log);
+		EXPECT(n == 0);
+	}
+
+	n = reftable_writer_close(w);
+	EXPECT(n == 0);
+
+	stats = writer_stats(w);
+	for (i = 0; i < stats->ref_stats.blocks; i++) {
+		int off = i * opts.block_size;
+		if (off == 0) {
+			off = header_size(
+				(hash_id == GIT_SHA256_FORMAT_ID) ? 2 : 1);
+		}
+		EXPECT(buf->buf[off] == 'r');
+	}
+
+	EXPECT(stats->log_stats.blocks > 0);
+	reftable_writer_free(w);
+}
+
+static void test_log_buffer_size(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_write_options opts = {
+		.block_size = 4096,
+	};
+	int err;
+	int i;
+	struct reftable_log_record
+		log = { .refname = "refs/heads/master",
+			.update_index = 0xa,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value = { .update = {
+					   .name = "Han-Wen Nienhuys",
+					   .email = "hanwen@google.com",
+					   .tz_offset = 100,
+					   .time = 0x5e430672,
+					   .message = "commit: 9\n",
+				   } } };
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+	/* This tests buffer extension for log compression. Must use a random
+	   hash, to ensure that the compressed part is larger than the original.
+	*/
+	uint8_t hash1[GIT_SHA1_RAWSZ], hash2[GIT_SHA1_RAWSZ];
+	for (i = 0; i < GIT_SHA1_RAWSZ; i++) {
+		hash1[i] = (uint8_t)(rand() % 256);
+		hash2[i] = (uint8_t)(rand() % 256);
+	}
+	log.value.update.old_hash = hash1;
+	log.value.update.new_hash = hash2;
+	reftable_writer_set_limits(w, update_index, update_index);
+	err = reftable_writer_add_log(w, &log);
+	EXPECT_ERR(err);
+	err = reftable_writer_close(w);
+	EXPECT_ERR(err);
+	reftable_writer_free(w);
+	strbuf_release(&buf);
+}
+
+static void test_log_overflow(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+	char msg[256] = { 0 };
+	struct reftable_write_options opts = {
+		.block_size = ARRAY_SIZE(msg),
+	};
+	int err;
+	struct reftable_log_record
+		log = { .refname = "refs/heads/master",
+			.update_index = 0xa,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value = { .update = {
+					   .name = "Han-Wen Nienhuys",
+					   .email = "hanwen@google.com",
+					   .tz_offset = 100,
+					   .time = 0x5e430672,
+					   .message = msg,
+				   } } };
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+	uint8_t hash1[GIT_SHA1_RAWSZ]  = {1}, hash2[GIT_SHA1_RAWSZ] = { 2 };
+
+	memset(msg, 'x', sizeof(msg) - 1);
+	log.value.update.old_hash = hash1;
+	log.value.update.new_hash = hash2;
+	reftable_writer_set_limits(w, update_index, update_index);
+	err = reftable_writer_add_log(w, &log);
+	EXPECT(err == REFTABLE_ENTRY_TOO_BIG_ERROR);
+	reftable_writer_free(w);
+	strbuf_release(&buf);
+}
+
+static void test_log_write_read(void)
+{
+	int N = 2;
+	char **names = reftable_calloc(sizeof(char *) * (N + 1));
+	int err;
+	struct reftable_write_options opts = {
+		.block_size = 256,
+	};
+	struct reftable_ref_record ref = { NULL };
+	int i = 0;
+	struct reftable_log_record log = { NULL };
+	int n;
+	struct reftable_iterator it = { NULL };
+	struct reftable_reader rd = { NULL };
+	struct reftable_block_source source = { NULL };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+	const struct reftable_stats *stats = NULL;
+	reftable_writer_set_limits(w, 0, N);
+	for (i = 0; i < N; i++) {
+		char name[256];
+		struct reftable_ref_record ref = { NULL };
+		snprintf(name, sizeof(name), "b%02d%0*d", i, 130, 7);
+		names[i] = xstrdup(name);
+		ref.refname = name;
+		ref.update_index = i;
+
+		err = reftable_writer_add_ref(w, &ref);
+		EXPECT_ERR(err);
+	}
+	for (i = 0; i < N; i++) {
+		uint8_t hash1[GIT_SHA1_RAWSZ], hash2[GIT_SHA1_RAWSZ];
+		struct reftable_log_record log = { NULL };
+		set_test_hash(hash1, i);
+		set_test_hash(hash2, i + 1);
+
+		log.refname = names[i];
+		log.update_index = i;
+		log.value_type = REFTABLE_LOG_UPDATE;
+		log.value.update.old_hash = hash1;
+		log.value.update.new_hash = hash2;
+
+		err = reftable_writer_add_log(w, &log);
+		EXPECT_ERR(err);
+	}
+
+	n = reftable_writer_close(w);
+	EXPECT(n == 0);
+
+	stats = writer_stats(w);
+	EXPECT(stats->log_stats.blocks > 0);
+	reftable_writer_free(w);
+	w = NULL;
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = init_reader(&rd, &source, "file.log");
+	EXPECT_ERR(err);
+
+	err = reftable_reader_seek_ref(&rd, &it, names[N - 1]);
+	EXPECT_ERR(err);
+
+	err = reftable_iterator_next_ref(&it, &ref);
+	EXPECT_ERR(err);
+
+	/* end of iteration. */
+	err = reftable_iterator_next_ref(&it, &ref);
+	EXPECT(0 < err);
+
+	reftable_iterator_destroy(&it);
+	reftable_ref_record_release(&ref);
+
+	err = reftable_reader_seek_log(&rd, &it, "");
+	EXPECT_ERR(err);
+
+	i = 0;
+	while (1) {
+		int err = reftable_iterator_next_log(&it, &log);
+		if (err > 0) {
+			break;
+		}
+
+		EXPECT_ERR(err);
+		EXPECT_STREQ(names[i], log.refname);
+		EXPECT(i == log.update_index);
+		i++;
+		reftable_log_record_release(&log);
+	}
+
+	EXPECT(i == N);
+	reftable_iterator_destroy(&it);
+
+	/* cleanup. */
+	strbuf_release(&buf);
+	free_names(names);
+	reader_close(&rd);
+}
+
+static void test_table_read_write_sequential(void)
+{
+	char **names;
+	struct strbuf buf = STRBUF_INIT;
+	int N = 50;
+	struct reftable_iterator it = { NULL };
+	struct reftable_block_source source = { NULL };
+	struct reftable_reader rd = { NULL };
+	int err = 0;
+	int j = 0;
+
+	write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = init_reader(&rd, &source, "file.ref");
+	EXPECT_ERR(err);
+
+	err = reftable_reader_seek_ref(&rd, &it, "");
+	EXPECT_ERR(err);
+
+	while (1) {
+		struct reftable_ref_record ref = { NULL };
+		int r = reftable_iterator_next_ref(&it, &ref);
+		EXPECT(r >= 0);
+		if (r > 0) {
+			break;
+		}
+		EXPECT(0 == strcmp(names[j], ref.refname));
+		EXPECT(update_index == ref.update_index);
+
+		j++;
+		reftable_ref_record_release(&ref);
+	}
+	EXPECT(j == N);
+	reftable_iterator_destroy(&it);
+	strbuf_release(&buf);
+	free_names(names);
+
+	reader_close(&rd);
+}
+
+static void test_table_write_small_table(void)
+{
+	char **names;
+	struct strbuf buf = STRBUF_INIT;
+	int N = 1;
+	write_table(&names, &buf, N, 4096, GIT_SHA1_FORMAT_ID);
+	EXPECT(buf.len < 200);
+	strbuf_release(&buf);
+	free_names(names);
+}
+
+static void test_table_read_api(void)
+{
+	char **names;
+	struct strbuf buf = STRBUF_INIT;
+	int N = 50;
+	struct reftable_reader rd = { NULL };
+	struct reftable_block_source source = { NULL };
+	int err;
+	int i;
+	struct reftable_log_record log = { NULL };
+	struct reftable_iterator it = { NULL };
+
+	write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = init_reader(&rd, &source, "file.ref");
+	EXPECT_ERR(err);
+
+	err = reftable_reader_seek_ref(&rd, &it, names[0]);
+	EXPECT_ERR(err);
+
+	err = reftable_iterator_next_log(&it, &log);
+	EXPECT(err == REFTABLE_API_ERROR);
+
+	strbuf_release(&buf);
+	for (i = 0; i < N; i++) {
+		reftable_free(names[i]);
+	}
+	reftable_iterator_destroy(&it);
+	reftable_free(names);
+	reader_close(&rd);
+	strbuf_release(&buf);
+}
+
+static void test_table_read_write_seek(int index, int hash_id)
+{
+	char **names;
+	struct strbuf buf = STRBUF_INIT;
+	int N = 50;
+	struct reftable_reader rd = { NULL };
+	struct reftable_block_source source = { NULL };
+	int err;
+	int i = 0;
+
+	struct reftable_iterator it = { NULL };
+	struct strbuf pastLast = STRBUF_INIT;
+	struct reftable_ref_record ref = { NULL };
+
+	write_table(&names, &buf, N, 256, hash_id);
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = init_reader(&rd, &source, "file.ref");
+	EXPECT_ERR(err);
+	EXPECT(hash_id == reftable_reader_hash_id(&rd));
+
+	if (!index) {
+		rd.ref_offsets.index_offset = 0;
+	} else {
+		EXPECT(rd.ref_offsets.index_offset > 0);
+	}
+
+	for (i = 1; i < N; i++) {
+		int err = reftable_reader_seek_ref(&rd, &it, names[i]);
+		EXPECT_ERR(err);
+		err = reftable_iterator_next_ref(&it, &ref);
+		EXPECT_ERR(err);
+		EXPECT(0 == strcmp(names[i], ref.refname));
+		EXPECT(REFTABLE_REF_VAL1 == ref.value_type);
+		EXPECT(i == ref.value.val1[0]);
+
+		reftable_ref_record_release(&ref);
+		reftable_iterator_destroy(&it);
+	}
+
+	strbuf_addstr(&pastLast, names[N - 1]);
+	strbuf_addstr(&pastLast, "/");
+
+	err = reftable_reader_seek_ref(&rd, &it, pastLast.buf);
+	if (err == 0) {
+		struct reftable_ref_record ref = { NULL };
+		int err = reftable_iterator_next_ref(&it, &ref);
+		EXPECT(err > 0);
+	} else {
+		EXPECT(err > 0);
+	}
+
+	strbuf_release(&pastLast);
+	reftable_iterator_destroy(&it);
+
+	strbuf_release(&buf);
+	for (i = 0; i < N; i++) {
+		reftable_free(names[i]);
+	}
+	reftable_free(names);
+	reader_close(&rd);
+}
+
+static void test_table_read_write_seek_linear(void)
+{
+	test_table_read_write_seek(0, GIT_SHA1_FORMAT_ID);
+}
+
+static void test_table_read_write_seek_linear_sha256(void)
+{
+	test_table_read_write_seek(0, GIT_SHA256_FORMAT_ID);
+}
+
+static void test_table_read_write_seek_index(void)
+{
+	test_table_read_write_seek(1, GIT_SHA1_FORMAT_ID);
+}
+
+static void test_table_refs_for(int indexed)
+{
+	int N = 50;
+	char **want_names = reftable_calloc(sizeof(char *) * (N + 1));
+	int want_names_len = 0;
+	uint8_t want_hash[GIT_SHA1_RAWSZ];
+
+	struct reftable_write_options opts = {
+		.block_size = 256,
+	};
+	struct reftable_ref_record ref = { NULL };
+	int i = 0;
+	int n;
+	int err;
+	struct reftable_reader rd;
+	struct reftable_block_source source = { NULL };
+
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+
+	struct reftable_iterator it = { NULL };
+	int j;
+
+	set_test_hash(want_hash, 4);
+
+	for (i = 0; i < N; i++) {
+		uint8_t hash[GIT_SHA1_RAWSZ];
+		char fill[51] = { 0 };
+		char name[100];
+		uint8_t hash1[GIT_SHA1_RAWSZ];
+		uint8_t hash2[GIT_SHA1_RAWSZ];
+		struct reftable_ref_record ref = { NULL };
+
+		memset(hash, i, sizeof(hash));
+		memset(fill, 'x', 50);
+		/* Put the variable part in the start */
+		snprintf(name, sizeof(name), "br%02d%s", i, fill);
+		name[40] = 0;
+		ref.refname = name;
+
+		set_test_hash(hash1, i / 4);
+		set_test_hash(hash2, 3 + i / 4);
+		ref.value_type = REFTABLE_REF_VAL2;
+		ref.value.val2.value = hash1;
+		ref.value.val2.target_value = hash2;
+
+		/* 80 bytes / entry, so 3 entries per block. Yields 17
+		 */
+		/* blocks. */
+		n = reftable_writer_add_ref(w, &ref);
+		EXPECT(n == 0);
+
+		if (!memcmp(hash1, want_hash, GIT_SHA1_RAWSZ) ||
+		    !memcmp(hash2, want_hash, GIT_SHA1_RAWSZ)) {
+			want_names[want_names_len++] = xstrdup(name);
+		}
+	}
+
+	n = reftable_writer_close(w);
+	EXPECT(n == 0);
+
+	reftable_writer_free(w);
+	w = NULL;
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = init_reader(&rd, &source, "file.ref");
+	EXPECT_ERR(err);
+	if (!indexed) {
+		rd.obj_offsets.is_present = 0;
+	}
+
+	err = reftable_reader_seek_ref(&rd, &it, "");
+	EXPECT_ERR(err);
+	reftable_iterator_destroy(&it);
+
+	err = reftable_reader_refs_for(&rd, &it, want_hash);
+	EXPECT_ERR(err);
+
+	j = 0;
+	while (1) {
+		int err = reftable_iterator_next_ref(&it, &ref);
+		EXPECT(err >= 0);
+		if (err > 0) {
+			break;
+		}
+
+		EXPECT(j < want_names_len);
+		EXPECT(0 == strcmp(ref.refname, want_names[j]));
+		j++;
+		reftable_ref_record_release(&ref);
+	}
+	EXPECT(j == want_names_len);
+
+	strbuf_release(&buf);
+	free_names(want_names);
+	reftable_iterator_destroy(&it);
+	reader_close(&rd);
+}
+
+static void test_table_refs_for_no_index(void)
+{
+	test_table_refs_for(0);
+}
+
+static void test_table_refs_for_obj_index(void)
+{
+	test_table_refs_for(1);
+}
+
+static void test_write_empty_table(void)
+{
+	struct reftable_write_options opts = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+	struct reftable_block_source source = { NULL };
+	struct reftable_reader *rd = NULL;
+	struct reftable_ref_record rec = { NULL };
+	struct reftable_iterator it = { NULL };
+	int err;
+
+	reftable_writer_set_limits(w, 1, 1);
+
+	err = reftable_writer_close(w);
+	EXPECT(err == REFTABLE_EMPTY_TABLE_ERROR);
+	reftable_writer_free(w);
+
+	EXPECT(buf.len == header_size(1) + footer_size(1));
+
+	block_source_from_strbuf(&source, &buf);
+
+	err = reftable_new_reader(&rd, &source, "filename");
+	EXPECT_ERR(err);
+
+	err = reftable_reader_seek_ref(rd, &it, "");
+	EXPECT_ERR(err);
+
+	err = reftable_iterator_next_ref(&it, &rec);
+	EXPECT(err > 0);
+
+	reftable_iterator_destroy(&it);
+	reftable_reader_free(rd);
+	strbuf_release(&buf);
+}
+
+static void test_write_key_order(void)
+{
+	struct reftable_write_options opts = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+	struct reftable_ref_record refs[2] = {
+		{
+			.refname = "b",
+			.update_index = 1,
+			.value_type = REFTABLE_REF_SYMREF,
+			.value = {
+				.symref = "target",
+			},
+		}, {
+			.refname = "a",
+			.update_index = 1,
+			.value_type = REFTABLE_REF_SYMREF,
+			.value = {
+				.symref = "target",
+			},
+		}
+	};
+	int err;
+
+	reftable_writer_set_limits(w, 1, 1);
+	err = reftable_writer_add_ref(w, &refs[0]);
+	EXPECT_ERR(err);
+	err = reftable_writer_add_ref(w, &refs[1]);
+	printf("%d\n", err);
+	EXPECT(err == REFTABLE_API_ERROR);
+	reftable_writer_close(w);
+	reftable_writer_free(w);
+	strbuf_release(&buf);
+}
+
+static void test_corrupt_table_empty(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_block_source source = { NULL };
+	struct reftable_reader rd = { NULL };
+	int err;
+
+	block_source_from_strbuf(&source, &buf);
+	err = init_reader(&rd, &source, "file.log");
+	EXPECT(err == REFTABLE_FORMAT_ERROR);
+}
+
+static void test_corrupt_table(void)
+{
+	uint8_t zeros[1024] = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_block_source source = { NULL };
+	struct reftable_reader rd = { NULL };
+	int err;
+	strbuf_add(&buf, zeros, sizeof(zeros));
+
+	block_source_from_strbuf(&source, &buf);
+	err = init_reader(&rd, &source, "file.log");
+	EXPECT(err == REFTABLE_FORMAT_ERROR);
+	strbuf_release(&buf);
+}
+
+int readwrite_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_corrupt_table);
+	RUN_TEST(test_corrupt_table_empty);
+	RUN_TEST(test_log_write_read);
+	RUN_TEST(test_write_key_order);
+	RUN_TEST(test_table_read_write_seek_linear_sha256);
+	RUN_TEST(test_log_buffer_size);
+	RUN_TEST(test_table_write_small_table);
+	RUN_TEST(test_buffer);
+	RUN_TEST(test_table_read_api);
+	RUN_TEST(test_table_read_write_sequential);
+	RUN_TEST(test_table_read_write_seek_linear);
+	RUN_TEST(test_table_read_write_seek_index);
+	RUN_TEST(test_table_refs_for_no_index);
+	RUN_TEST(test_table_refs_for_obj_index);
+	RUN_TEST(test_write_empty_table);
+	RUN_TEST(test_log_overflow);
+	return 0;
+}
diff --git a/reftable/record.c b/reftable/record.c
new file mode 100644
index 0000000000..6a5dac32dc
--- /dev/null
+++ b/reftable/record.c
@@ -0,0 +1,1212 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+/* record.c - methods for different types of records. */
+
+#include "record.h"
+
+#include "system.h"
+#include "constants.h"
+#include "reftable-error.h"
+#include "basics.h"
+
+int get_var_int(uint64_t *dest, struct string_view *in)
+{
+	int ptr = 0;
+	uint64_t val;
+
+	if (in->len == 0)
+		return -1;
+	val = in->buf[ptr] & 0x7f;
+
+	while (in->buf[ptr] & 0x80) {
+		ptr++;
+		if (ptr > in->len) {
+			return -1;
+		}
+		val = (val + 1) << 7 | (uint64_t)(in->buf[ptr] & 0x7f);
+	}
+
+	*dest = val;
+	return ptr + 1;
+}
+
+int put_var_int(struct string_view *dest, uint64_t val)
+{
+	uint8_t buf[10] = { 0 };
+	int i = 9;
+	int n = 0;
+	buf[i] = (uint8_t)(val & 0x7f);
+	i--;
+	while (1) {
+		val >>= 7;
+		if (!val) {
+			break;
+		}
+		val--;
+		buf[i] = 0x80 | (uint8_t)(val & 0x7f);
+		i--;
+	}
+
+	n = sizeof(buf) - i - 1;
+	if (dest->len < n)
+		return -1;
+	memcpy(dest->buf, &buf[i + 1], n);
+	return n;
+}
+
+int reftable_is_block_type(uint8_t typ)
+{
+	switch (typ) {
+	case BLOCK_TYPE_REF:
+	case BLOCK_TYPE_LOG:
+	case BLOCK_TYPE_OBJ:
+	case BLOCK_TYPE_INDEX:
+		return 1;
+	}
+	return 0;
+}
+
+uint8_t *reftable_ref_record_val1(struct reftable_ref_record *rec)
+{
+	switch (rec->value_type) {
+	case REFTABLE_REF_VAL1:
+		return rec->value.val1;
+	case REFTABLE_REF_VAL2:
+		return rec->value.val2.value;
+	default:
+		return NULL;
+	}
+}
+
+uint8_t *reftable_ref_record_val2(struct reftable_ref_record *rec)
+{
+	switch (rec->value_type) {
+	case REFTABLE_REF_VAL2:
+		return rec->value.val2.target_value;
+	default:
+		return NULL;
+	}
+}
+
+static int decode_string(struct strbuf *dest, struct string_view in)
+{
+	int start_len = in.len;
+	uint64_t tsize = 0;
+	int n = get_var_int(&tsize, &in);
+	if (n <= 0)
+		return -1;
+	string_view_consume(&in, n);
+	if (in.len < tsize)
+		return -1;
+
+	strbuf_reset(dest);
+	strbuf_add(dest, in.buf, tsize);
+	string_view_consume(&in, tsize);
+
+	return start_len - in.len;
+}
+
+static int encode_string(char *str, struct string_view s)
+{
+	struct string_view start = s;
+	int l = strlen(str);
+	int n = put_var_int(&s, l);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+	if (s.len < l)
+		return -1;
+	memcpy(s.buf, str, l);
+	string_view_consume(&s, l);
+
+	return start.len - s.len;
+}
+
+int reftable_encode_key(int *restart, struct string_view dest,
+			struct strbuf prev_key, struct strbuf key,
+			uint8_t extra)
+{
+	struct string_view start = dest;
+	int prefix_len = common_prefix_size(&prev_key, &key);
+	uint64_t suffix_len = key.len - prefix_len;
+	int n = put_var_int(&dest, (uint64_t)prefix_len);
+	if (n < 0)
+		return -1;
+	string_view_consume(&dest, n);
+
+	*restart = (prefix_len == 0);
+
+	n = put_var_int(&dest, suffix_len << 3 | (uint64_t)extra);
+	if (n < 0)
+		return -1;
+	string_view_consume(&dest, n);
+
+	if (dest.len < suffix_len)
+		return -1;
+	memcpy(dest.buf, key.buf + prefix_len, suffix_len);
+	string_view_consume(&dest, suffix_len);
+
+	return start.len - dest.len;
+}
+
+int reftable_decode_key(struct strbuf *key, uint8_t *extra,
+			struct strbuf last_key, struct string_view in)
+{
+	int start_len = in.len;
+	uint64_t prefix_len = 0;
+	uint64_t suffix_len = 0;
+	int n = get_var_int(&prefix_len, &in);
+	if (n < 0)
+		return -1;
+	string_view_consume(&in, n);
+
+	if (prefix_len > last_key.len)
+		return -1;
+
+	n = get_var_int(&suffix_len, &in);
+	if (n <= 0)
+		return -1;
+	string_view_consume(&in, n);
+
+	*extra = (uint8_t)(suffix_len & 0x7);
+	suffix_len >>= 3;
+
+	if (in.len < suffix_len)
+		return -1;
+
+	strbuf_reset(key);
+	strbuf_add(key, last_key.buf, prefix_len);
+	strbuf_add(key, in.buf, suffix_len);
+	string_view_consume(&in, suffix_len);
+
+	return start_len - in.len;
+}
+
+static void reftable_ref_record_key(const void *r, struct strbuf *dest)
+{
+	const struct reftable_ref_record *rec =
+		(const struct reftable_ref_record *)r;
+	strbuf_reset(dest);
+	strbuf_addstr(dest, rec->refname);
+}
+
+static void reftable_ref_record_copy_from(void *rec, const void *src_rec,
+					  int hash_size)
+{
+	struct reftable_ref_record *ref = rec;
+	const struct reftable_ref_record *src = src_rec;
+	assert(hash_size > 0);
+
+	/* This is simple and correct, but we could probably reuse the hash
+	 * fields. */
+	reftable_ref_record_release(ref);
+	if (src->refname) {
+		ref->refname = xstrdup(src->refname);
+	}
+	ref->update_index = src->update_index;
+	ref->value_type = src->value_type;
+	switch (src->value_type) {
+	case REFTABLE_REF_DELETION:
+		break;
+	case REFTABLE_REF_VAL1:
+		ref->value.val1 = reftable_malloc(hash_size);
+		memcpy(ref->value.val1, src->value.val1, hash_size);
+		break;
+	case REFTABLE_REF_VAL2:
+		ref->value.val2.value = reftable_malloc(hash_size);
+		memcpy(ref->value.val2.value, src->value.val2.value, hash_size);
+		ref->value.val2.target_value = reftable_malloc(hash_size);
+		memcpy(ref->value.val2.target_value,
+		       src->value.val2.target_value, hash_size);
+		break;
+	case REFTABLE_REF_SYMREF:
+		ref->value.symref = xstrdup(src->value.symref);
+		break;
+	}
+}
+
+static char hexdigit(int c)
+{
+	if (c <= 9)
+		return '0' + c;
+	return 'a' + (c - 10);
+}
+
+static void hex_format(char *dest, uint8_t *src, int hash_size)
+{
+	assert(hash_size > 0);
+	if (src) {
+		int i = 0;
+		for (i = 0; i < hash_size; i++) {
+			dest[2 * i] = hexdigit(src[i] >> 4);
+			dest[2 * i + 1] = hexdigit(src[i] & 0xf);
+		}
+		dest[2 * hash_size] = 0;
+	}
+}
+
+void reftable_ref_record_print(struct reftable_ref_record *ref,
+			       uint32_t hash_id)
+{
+	char hex[2 * GIT_SHA256_RAWSZ + 1] = { 0 }; /* BUG */
+	printf("ref{%s(%" PRIu64 ") ", ref->refname, ref->update_index);
+	switch (ref->value_type) {
+	case REFTABLE_REF_SYMREF:
+		printf("=> %s", ref->value.symref);
+		break;
+	case REFTABLE_REF_VAL2:
+		hex_format(hex, ref->value.val2.value, hash_size(hash_id));
+		printf("val 2 %s", hex);
+		hex_format(hex, ref->value.val2.target_value,
+			   hash_size(hash_id));
+		printf("(T %s)", hex);
+		break;
+	case REFTABLE_REF_VAL1:
+		hex_format(hex, ref->value.val1, hash_size(hash_id));
+		printf("val 1 %s", hex);
+		break;
+	case REFTABLE_REF_DELETION:
+		printf("delete");
+		break;
+	}
+	printf("}\n");
+}
+
+static void reftable_ref_record_release_void(void *rec)
+{
+	reftable_ref_record_release(rec);
+}
+
+void reftable_ref_record_release(struct reftable_ref_record *ref)
+{
+	switch (ref->value_type) {
+	case REFTABLE_REF_SYMREF:
+		reftable_free(ref->value.symref);
+		break;
+	case REFTABLE_REF_VAL2:
+		reftable_free(ref->value.val2.target_value);
+		reftable_free(ref->value.val2.value);
+		break;
+	case REFTABLE_REF_VAL1:
+		reftable_free(ref->value.val1);
+		break;
+	case REFTABLE_REF_DELETION:
+		break;
+	default:
+		abort();
+	}
+
+	reftable_free(ref->refname);
+	memset(ref, 0, sizeof(struct reftable_ref_record));
+}
+
+static uint8_t reftable_ref_record_val_type(const void *rec)
+{
+	const struct reftable_ref_record *r =
+		(const struct reftable_ref_record *)rec;
+	return r->value_type;
+}
+
+static int reftable_ref_record_encode(const void *rec, struct string_view s,
+				      int hash_size)
+{
+	const struct reftable_ref_record *r =
+		(const struct reftable_ref_record *)rec;
+	struct string_view start = s;
+	int n = put_var_int(&s, r->update_index);
+	assert(hash_size > 0);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+
+	switch (r->value_type) {
+	case REFTABLE_REF_SYMREF:
+		n = encode_string(r->value.symref, s);
+		if (n < 0) {
+			return -1;
+		}
+		string_view_consume(&s, n);
+		break;
+	case REFTABLE_REF_VAL2:
+		if (s.len < 2 * hash_size) {
+			return -1;
+		}
+		memcpy(s.buf, r->value.val2.value, hash_size);
+		string_view_consume(&s, hash_size);
+		memcpy(s.buf, r->value.val2.target_value, hash_size);
+		string_view_consume(&s, hash_size);
+		break;
+	case REFTABLE_REF_VAL1:
+		if (s.len < hash_size) {
+			return -1;
+		}
+		memcpy(s.buf, r->value.val1, hash_size);
+		string_view_consume(&s, hash_size);
+		break;
+	case REFTABLE_REF_DELETION:
+		break;
+	default:
+		abort();
+	}
+
+	return start.len - s.len;
+}
+
+static int reftable_ref_record_decode(void *rec, struct strbuf key,
+				      uint8_t val_type, struct string_view in,
+				      int hash_size)
+{
+	struct reftable_ref_record *r = rec;
+	struct string_view start = in;
+	uint64_t update_index = 0;
+	int n = get_var_int(&update_index, &in);
+	if (n < 0)
+		return n;
+	string_view_consume(&in, n);
+
+	reftable_ref_record_release(r);
+
+	assert(hash_size > 0);
+
+	r->refname = reftable_realloc(r->refname, key.len + 1);
+	memcpy(r->refname, key.buf, key.len);
+	r->update_index = update_index;
+	r->refname[key.len] = 0;
+	r->value_type = val_type;
+	switch (val_type) {
+	case REFTABLE_REF_VAL1:
+		if (in.len < hash_size) {
+			return -1;
+		}
+
+		r->value.val1 = reftable_malloc(hash_size);
+		memcpy(r->value.val1, in.buf, hash_size);
+		string_view_consume(&in, hash_size);
+		break;
+
+	case REFTABLE_REF_VAL2:
+		if (in.len < 2 * hash_size) {
+			return -1;
+		}
+
+		r->value.val2.value = reftable_malloc(hash_size);
+		memcpy(r->value.val2.value, in.buf, hash_size);
+		string_view_consume(&in, hash_size);
+
+		r->value.val2.target_value = reftable_malloc(hash_size);
+		memcpy(r->value.val2.target_value, in.buf, hash_size);
+		string_view_consume(&in, hash_size);
+		break;
+
+	case REFTABLE_REF_SYMREF: {
+		struct strbuf dest = STRBUF_INIT;
+		int n = decode_string(&dest, in);
+		if (n < 0) {
+			return -1;
+		}
+		string_view_consume(&in, n);
+		r->value.symref = dest.buf;
+	} break;
+
+	case REFTABLE_REF_DELETION:
+		break;
+	default:
+		abort();
+		break;
+	}
+
+	return start.len - in.len;
+}
+
+static int reftable_ref_record_is_deletion_void(const void *p)
+{
+	return reftable_ref_record_is_deletion(
+		(const struct reftable_ref_record *)p);
+}
+
+static struct reftable_record_vtable reftable_ref_record_vtable = {
+	.key = &reftable_ref_record_key,
+	.type = BLOCK_TYPE_REF,
+	.copy_from = &reftable_ref_record_copy_from,
+	.val_type = &reftable_ref_record_val_type,
+	.encode = &reftable_ref_record_encode,
+	.decode = &reftable_ref_record_decode,
+	.release = &reftable_ref_record_release_void,
+	.is_deletion = &reftable_ref_record_is_deletion_void,
+};
+
+static void reftable_obj_record_key(const void *r, struct strbuf *dest)
+{
+	const struct reftable_obj_record *rec =
+		(const struct reftable_obj_record *)r;
+	strbuf_reset(dest);
+	strbuf_add(dest, rec->hash_prefix, rec->hash_prefix_len);
+}
+
+static void reftable_obj_record_release(void *rec)
+{
+	struct reftable_obj_record *obj = rec;
+	FREE_AND_NULL(obj->hash_prefix);
+	FREE_AND_NULL(obj->offsets);
+	memset(obj, 0, sizeof(struct reftable_obj_record));
+}
+
+static void reftable_obj_record_copy_from(void *rec, const void *src_rec,
+					  int hash_size)
+{
+	struct reftable_obj_record *obj = rec;
+	const struct reftable_obj_record *src =
+		(const struct reftable_obj_record *)src_rec;
+
+	reftable_obj_record_release(obj);
+	*obj = *src;
+	obj->hash_prefix = reftable_malloc(obj->hash_prefix_len);
+	memcpy(obj->hash_prefix, src->hash_prefix, obj->hash_prefix_len);
+
+	obj->offsets = reftable_malloc(obj->offset_len * sizeof(uint64_t));
+	COPY_ARRAY(obj->offsets, src->offsets, obj->offset_len);
+}
+
+static uint8_t reftable_obj_record_val_type(const void *rec)
+{
+	const struct reftable_obj_record *r = rec;
+	if (r->offset_len > 0 && r->offset_len < 8)
+		return r->offset_len;
+	return 0;
+}
+
+static int reftable_obj_record_encode(const void *rec, struct string_view s,
+				      int hash_size)
+{
+	const struct reftable_obj_record *r = rec;
+	struct string_view start = s;
+	int i = 0;
+	int n = 0;
+	uint64_t last = 0;
+	if (r->offset_len == 0 || r->offset_len >= 8) {
+		n = put_var_int(&s, r->offset_len);
+		if (n < 0) {
+			return -1;
+		}
+		string_view_consume(&s, n);
+	}
+	if (r->offset_len == 0)
+		return start.len - s.len;
+	n = put_var_int(&s, r->offsets[0]);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+
+	last = r->offsets[0];
+	for (i = 1; i < r->offset_len; i++) {
+		int n = put_var_int(&s, r->offsets[i] - last);
+		if (n < 0) {
+			return -1;
+		}
+		string_view_consume(&s, n);
+		last = r->offsets[i];
+	}
+	return start.len - s.len;
+}
+
+static int reftable_obj_record_decode(void *rec, struct strbuf key,
+				      uint8_t val_type, struct string_view in,
+				      int hash_size)
+{
+	struct string_view start = in;
+	struct reftable_obj_record *r = rec;
+	uint64_t count = val_type;
+	int n = 0;
+	uint64_t last;
+	int j;
+	r->hash_prefix = reftable_malloc(key.len);
+	memcpy(r->hash_prefix, key.buf, key.len);
+	r->hash_prefix_len = key.len;
+
+	if (val_type == 0) {
+		n = get_var_int(&count, &in);
+		if (n < 0) {
+			return n;
+		}
+
+		string_view_consume(&in, n);
+	}
+
+	r->offsets = NULL;
+	r->offset_len = 0;
+	if (count == 0)
+		return start.len - in.len;
+
+	r->offsets = reftable_malloc(count * sizeof(uint64_t));
+	r->offset_len = count;
+
+	n = get_var_int(&r->offsets[0], &in);
+	if (n < 0)
+		return n;
+	string_view_consume(&in, n);
+
+	last = r->offsets[0];
+	j = 1;
+	while (j < count) {
+		uint64_t delta = 0;
+		int n = get_var_int(&delta, &in);
+		if (n < 0) {
+			return n;
+		}
+		string_view_consume(&in, n);
+
+		last = r->offsets[j] = (delta + last);
+		j++;
+	}
+	return start.len - in.len;
+}
+
+static int not_a_deletion(const void *p)
+{
+	return 0;
+}
+
+static struct reftable_record_vtable reftable_obj_record_vtable = {
+	.key = &reftable_obj_record_key,
+	.type = BLOCK_TYPE_OBJ,
+	.copy_from = &reftable_obj_record_copy_from,
+	.val_type = &reftable_obj_record_val_type,
+	.encode = &reftable_obj_record_encode,
+	.decode = &reftable_obj_record_decode,
+	.release = &reftable_obj_record_release,
+	.is_deletion = not_a_deletion,
+};
+
+void reftable_log_record_print(struct reftable_log_record *log,
+			       uint32_t hash_id)
+{
+	char hex[GIT_SHA256_RAWSZ + 1] = { 0 };
+
+	switch (log->value_type) {
+	case REFTABLE_LOG_DELETION:
+		printf("log{%s(%" PRIu64 ") delete", log->refname,
+		       log->update_index);
+		break;
+	case REFTABLE_LOG_UPDATE:
+		printf("log{%s(%" PRIu64 ") %s <%s> %" PRIu64 " %04d\n",
+		       log->refname, log->update_index, log->value.update.name,
+		       log->value.update.email, log->value.update.time,
+		       log->value.update.tz_offset);
+		hex_format(hex, log->value.update.old_hash, hash_size(hash_id));
+		printf("%s => ", hex);
+		hex_format(hex, log->value.update.new_hash, hash_size(hash_id));
+		printf("%s\n\n%s\n}\n", hex, log->value.update.message);
+		break;
+	}
+}
+
+static void reftable_log_record_key(const void *r, struct strbuf *dest)
+{
+	const struct reftable_log_record *rec =
+		(const struct reftable_log_record *)r;
+	int len = strlen(rec->refname);
+	uint8_t i64[8];
+	uint64_t ts = 0;
+	strbuf_reset(dest);
+	strbuf_add(dest, (uint8_t *)rec->refname, len + 1);
+
+	ts = (~ts) - rec->update_index;
+	put_be64(&i64[0], ts);
+	strbuf_add(dest, i64, sizeof(i64));
+}
+
+static void reftable_log_record_copy_from(void *rec, const void *src_rec,
+					  int hash_size)
+{
+	struct reftable_log_record *dst = rec;
+	const struct reftable_log_record *src =
+		(const struct reftable_log_record *)src_rec;
+
+	reftable_log_record_release(dst);
+	*dst = *src;
+	if (dst->refname) {
+		dst->refname = xstrdup(dst->refname);
+	}
+	switch (dst->value_type) {
+	case REFTABLE_LOG_DELETION:
+		break;
+	case REFTABLE_LOG_UPDATE:
+		if (dst->value.update.email) {
+			dst->value.update.email =
+				xstrdup(dst->value.update.email);
+		}
+		if (dst->value.update.name) {
+			dst->value.update.name =
+				xstrdup(dst->value.update.name);
+		}
+		if (dst->value.update.message) {
+			dst->value.update.message =
+				xstrdup(dst->value.update.message);
+		}
+
+		if (dst->value.update.new_hash) {
+			dst->value.update.new_hash = reftable_malloc(hash_size);
+			memcpy(dst->value.update.new_hash,
+			       src->value.update.new_hash, hash_size);
+		}
+		if (dst->value.update.old_hash) {
+			dst->value.update.old_hash = reftable_malloc(hash_size);
+			memcpy(dst->value.update.old_hash,
+			       src->value.update.old_hash, hash_size);
+		}
+		break;
+	}
+}
+
+static void reftable_log_record_release_void(void *rec)
+{
+	struct reftable_log_record *r = rec;
+	reftable_log_record_release(r);
+}
+
+void reftable_log_record_release(struct reftable_log_record *r)
+{
+	reftable_free(r->refname);
+	switch (r->value_type) {
+	case REFTABLE_LOG_DELETION:
+		break;
+	case REFTABLE_LOG_UPDATE:
+		reftable_free(r->value.update.new_hash);
+		reftable_free(r->value.update.old_hash);
+		reftable_free(r->value.update.name);
+		reftable_free(r->value.update.email);
+		reftable_free(r->value.update.message);
+		break;
+	}
+	memset(r, 0, sizeof(struct reftable_log_record));
+}
+
+static uint8_t reftable_log_record_val_type(const void *rec)
+{
+	const struct reftable_log_record *log =
+		(const struct reftable_log_record *)rec;
+
+	return reftable_log_record_is_deletion(log) ? 0 : 1;
+}
+
+static uint8_t zero[GIT_SHA256_RAWSZ] = { 0 };
+
+static int reftable_log_record_encode(const void *rec, struct string_view s,
+				      int hash_size)
+{
+	const struct reftable_log_record *r = rec;
+	struct string_view start = s;
+	int n = 0;
+	uint8_t *oldh = NULL;
+	uint8_t *newh = NULL;
+	if (reftable_log_record_is_deletion(r))
+		return 0;
+
+	oldh = r->value.update.old_hash;
+	newh = r->value.update.new_hash;
+	if (!oldh) {
+		oldh = zero;
+	}
+	if (!newh) {
+		newh = zero;
+	}
+
+	if (s.len < 2 * hash_size)
+		return -1;
+
+	memcpy(s.buf, oldh, hash_size);
+	memcpy(s.buf + hash_size, newh, hash_size);
+	string_view_consume(&s, 2 * hash_size);
+
+	n = encode_string(r->value.update.name ? r->value.update.name : "", s);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+
+	n = encode_string(r->value.update.email ? r->value.update.email : "",
+			  s);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+
+	n = put_var_int(&s, r->value.update.time);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+
+	if (s.len < 2)
+		return -1;
+
+	put_be16(s.buf, r->value.update.tz_offset);
+	string_view_consume(&s, 2);
+
+	n = encode_string(
+		r->value.update.message ? r->value.update.message : "", s);
+	if (n < 0)
+		return -1;
+	string_view_consume(&s, n);
+
+	return start.len - s.len;
+}
+
+static int reftable_log_record_decode(void *rec, struct strbuf key,
+				      uint8_t val_type, struct string_view in,
+				      int hash_size)
+{
+	struct string_view start = in;
+	struct reftable_log_record *r = rec;
+	uint64_t max = 0;
+	uint64_t ts = 0;
+	struct strbuf dest = STRBUF_INIT;
+	int n;
+
+	if (key.len <= 9 || key.buf[key.len - 9] != 0)
+		return REFTABLE_FORMAT_ERROR;
+
+	r->refname = reftable_realloc(r->refname, key.len - 8);
+	memcpy(r->refname, key.buf, key.len - 8);
+	ts = get_be64(key.buf + key.len - 8);
+
+	r->update_index = (~max) - ts;
+
+	if (val_type != r->value_type) {
+		switch (r->value_type) {
+		case REFTABLE_LOG_UPDATE:
+			FREE_AND_NULL(r->value.update.old_hash);
+			FREE_AND_NULL(r->value.update.new_hash);
+			FREE_AND_NULL(r->value.update.message);
+			FREE_AND_NULL(r->value.update.email);
+			FREE_AND_NULL(r->value.update.name);
+			break;
+		case REFTABLE_LOG_DELETION:
+			break;
+		}
+	}
+
+	r->value_type = val_type;
+	if (val_type == REFTABLE_LOG_DELETION)
+		return 0;
+
+	if (in.len < 2 * hash_size)
+		return REFTABLE_FORMAT_ERROR;
+
+	r->value.update.old_hash =
+		reftable_realloc(r->value.update.old_hash, hash_size);
+	r->value.update.new_hash =
+		reftable_realloc(r->value.update.new_hash, hash_size);
+
+	memcpy(r->value.update.old_hash, in.buf, hash_size);
+	memcpy(r->value.update.new_hash, in.buf + hash_size, hash_size);
+
+	string_view_consume(&in, 2 * hash_size);
+
+	n = decode_string(&dest, in);
+	if (n < 0)
+		goto done;
+	string_view_consume(&in, n);
+
+	r->value.update.name =
+		reftable_realloc(r->value.update.name, dest.len + 1);
+	memcpy(r->value.update.name, dest.buf, dest.len);
+	r->value.update.name[dest.len] = 0;
+
+	strbuf_reset(&dest);
+	n = decode_string(&dest, in);
+	if (n < 0)
+		goto done;
+	string_view_consume(&in, n);
+
+	r->value.update.email =
+		reftable_realloc(r->value.update.email, dest.len + 1);
+	memcpy(r->value.update.email, dest.buf, dest.len);
+	r->value.update.email[dest.len] = 0;
+
+	ts = 0;
+	n = get_var_int(&ts, &in);
+	if (n < 0)
+		goto done;
+	string_view_consume(&in, n);
+	r->value.update.time = ts;
+	if (in.len < 2)
+		goto done;
+
+	r->value.update.tz_offset = get_be16(in.buf);
+	string_view_consume(&in, 2);
+
+	strbuf_reset(&dest);
+	n = decode_string(&dest, in);
+	if (n < 0)
+		goto done;
+	string_view_consume(&in, n);
+
+	r->value.update.message =
+		reftable_realloc(r->value.update.message, dest.len + 1);
+	memcpy(r->value.update.message, dest.buf, dest.len);
+	r->value.update.message[dest.len] = 0;
+
+	strbuf_release(&dest);
+	return start.len - in.len;
+
+done:
+	strbuf_release(&dest);
+	return REFTABLE_FORMAT_ERROR;
+}
+
+static int null_streq(char *a, char *b)
+{
+	char *empty = "";
+	if (!a)
+		a = empty;
+
+	if (!b)
+		b = empty;
+
+	return 0 == strcmp(a, b);
+}
+
+static int zero_hash_eq(uint8_t *a, uint8_t *b, int sz)
+{
+	if (!a)
+		a = zero;
+
+	if (!b)
+		b = zero;
+
+	return !memcmp(a, b, sz);
+}
+
+int reftable_log_record_equal(struct reftable_log_record *a,
+			      struct reftable_log_record *b, int hash_size)
+{
+	if (!(null_streq(a->refname, b->refname) &&
+	      a->update_index == b->update_index &&
+	      a->value_type == b->value_type))
+		return 0;
+
+	switch (a->value_type) {
+	case REFTABLE_LOG_DELETION:
+		return 1;
+	case REFTABLE_LOG_UPDATE:
+		return null_streq(a->value.update.name, b->value.update.name) &&
+		       a->value.update.time == b->value.update.time &&
+		       a->value.update.tz_offset == b->value.update.tz_offset &&
+		       null_streq(a->value.update.email,
+				  b->value.update.email) &&
+		       null_streq(a->value.update.message,
+				  b->value.update.message) &&
+		       zero_hash_eq(a->value.update.old_hash,
+				    b->value.update.old_hash, hash_size) &&
+		       zero_hash_eq(a->value.update.new_hash,
+				    b->value.update.new_hash, hash_size);
+	}
+
+	abort();
+}
+
+static int reftable_log_record_is_deletion_void(const void *p)
+{
+	return reftable_log_record_is_deletion(
+		(const struct reftable_log_record *)p);
+}
+
+static struct reftable_record_vtable reftable_log_record_vtable = {
+	.key = &reftable_log_record_key,
+	.type = BLOCK_TYPE_LOG,
+	.copy_from = &reftable_log_record_copy_from,
+	.val_type = &reftable_log_record_val_type,
+	.encode = &reftable_log_record_encode,
+	.decode = &reftable_log_record_decode,
+	.release = &reftable_log_record_release_void,
+	.is_deletion = &reftable_log_record_is_deletion_void,
+};
+
+struct reftable_record reftable_new_record(uint8_t typ)
+{
+	struct reftable_record rec = { NULL };
+	switch (typ) {
+	case BLOCK_TYPE_REF: {
+		struct reftable_ref_record *r =
+			reftable_calloc(sizeof(struct reftable_ref_record));
+		reftable_record_from_ref(&rec, r);
+		return rec;
+	}
+
+	case BLOCK_TYPE_OBJ: {
+		struct reftable_obj_record *r =
+			reftable_calloc(sizeof(struct reftable_obj_record));
+		reftable_record_from_obj(&rec, r);
+		return rec;
+	}
+	case BLOCK_TYPE_LOG: {
+		struct reftable_log_record *r =
+			reftable_calloc(sizeof(struct reftable_log_record));
+		reftable_record_from_log(&rec, r);
+		return rec;
+	}
+	case BLOCK_TYPE_INDEX: {
+		struct reftable_index_record empty = { .last_key =
+							       STRBUF_INIT };
+		struct reftable_index_record *r =
+			reftable_calloc(sizeof(struct reftable_index_record));
+		*r = empty;
+		reftable_record_from_index(&rec, r);
+		return rec;
+	}
+	}
+	abort();
+	return rec;
+}
+
+/* clear out the record, yielding the reftable_record data that was
+ * encapsulated. */
+static void *reftable_record_yield(struct reftable_record *rec)
+{
+	void *p = rec->data;
+	rec->data = NULL;
+	return p;
+}
+
+void reftable_record_destroy(struct reftable_record *rec)
+{
+	reftable_record_release(rec);
+	reftable_free(reftable_record_yield(rec));
+}
+
+static void reftable_index_record_key(const void *r, struct strbuf *dest)
+{
+	const struct reftable_index_record *rec = r;
+	strbuf_reset(dest);
+	strbuf_addbuf(dest, &rec->last_key);
+}
+
+static void reftable_index_record_copy_from(void *rec, const void *src_rec,
+					    int hash_size)
+{
+	struct reftable_index_record *dst = rec;
+	const struct reftable_index_record *src = src_rec;
+
+	strbuf_reset(&dst->last_key);
+	strbuf_addbuf(&dst->last_key, &src->last_key);
+	dst->offset = src->offset;
+}
+
+static void reftable_index_record_release(void *rec)
+{
+	struct reftable_index_record *idx = rec;
+	strbuf_release(&idx->last_key);
+}
+
+static uint8_t reftable_index_record_val_type(const void *rec)
+{
+	return 0;
+}
+
+static int reftable_index_record_encode(const void *rec, struct string_view out,
+					int hash_size)
+{
+	const struct reftable_index_record *r =
+		(const struct reftable_index_record *)rec;
+	struct string_view start = out;
+
+	int n = put_var_int(&out, r->offset);
+	if (n < 0)
+		return n;
+
+	string_view_consume(&out, n);
+
+	return start.len - out.len;
+}
+
+static int reftable_index_record_decode(void *rec, struct strbuf key,
+					uint8_t val_type, struct string_view in,
+					int hash_size)
+{
+	struct string_view start = in;
+	struct reftable_index_record *r = rec;
+	int n = 0;
+
+	strbuf_reset(&r->last_key);
+	strbuf_addbuf(&r->last_key, &key);
+
+	n = get_var_int(&r->offset, &in);
+	if (n < 0)
+		return n;
+
+	string_view_consume(&in, n);
+	return start.len - in.len;
+}
+
+static struct reftable_record_vtable reftable_index_record_vtable = {
+	.key = &reftable_index_record_key,
+	.type = BLOCK_TYPE_INDEX,
+	.copy_from = &reftable_index_record_copy_from,
+	.val_type = &reftable_index_record_val_type,
+	.encode = &reftable_index_record_encode,
+	.decode = &reftable_index_record_decode,
+	.release = &reftable_index_record_release,
+	.is_deletion = &not_a_deletion,
+};
+
+void reftable_record_key(struct reftable_record *rec, struct strbuf *dest)
+{
+	rec->ops->key(rec->data, dest);
+}
+
+uint8_t reftable_record_type(struct reftable_record *rec)
+{
+	return rec->ops->type;
+}
+
+int reftable_record_encode(struct reftable_record *rec, struct string_view dest,
+			   int hash_size)
+{
+	return rec->ops->encode(rec->data, dest, hash_size);
+}
+
+void reftable_record_copy_from(struct reftable_record *rec,
+			       struct reftable_record *src, int hash_size)
+{
+	assert(src->ops->type == rec->ops->type);
+
+	rec->ops->copy_from(rec->data, src->data, hash_size);
+}
+
+uint8_t reftable_record_val_type(struct reftable_record *rec)
+{
+	return rec->ops->val_type(rec->data);
+}
+
+int reftable_record_decode(struct reftable_record *rec, struct strbuf key,
+			   uint8_t extra, struct string_view src, int hash_size)
+{
+	return rec->ops->decode(rec->data, key, extra, src, hash_size);
+}
+
+void reftable_record_release(struct reftable_record *rec)
+{
+	rec->ops->release(rec->data);
+}
+
+int reftable_record_is_deletion(struct reftable_record *rec)
+{
+	return rec->ops->is_deletion(rec->data);
+}
+
+void reftable_record_from_ref(struct reftable_record *rec,
+			      struct reftable_ref_record *ref_rec)
+{
+	assert(!rec->ops);
+	rec->data = ref_rec;
+	rec->ops = &reftable_ref_record_vtable;
+}
+
+void reftable_record_from_obj(struct reftable_record *rec,
+			      struct reftable_obj_record *obj_rec)
+{
+	assert(!rec->ops);
+	rec->data = obj_rec;
+	rec->ops = &reftable_obj_record_vtable;
+}
+
+void reftable_record_from_index(struct reftable_record *rec,
+				struct reftable_index_record *index_rec)
+{
+	assert(!rec->ops);
+	rec->data = index_rec;
+	rec->ops = &reftable_index_record_vtable;
+}
+
+void reftable_record_from_log(struct reftable_record *rec,
+			      struct reftable_log_record *log_rec)
+{
+	assert(!rec->ops);
+	rec->data = log_rec;
+	rec->ops = &reftable_log_record_vtable;
+}
+
+struct reftable_ref_record *reftable_record_as_ref(struct reftable_record *rec)
+{
+	assert(reftable_record_type(rec) == BLOCK_TYPE_REF);
+	return rec->data;
+}
+
+struct reftable_log_record *reftable_record_as_log(struct reftable_record *rec)
+{
+	assert(reftable_record_type(rec) == BLOCK_TYPE_LOG);
+	return rec->data;
+}
+
+static int hash_equal(uint8_t *a, uint8_t *b, int hash_size)
+{
+	if (a && b)
+		return !memcmp(a, b, hash_size);
+
+	return a == b;
+}
+
+int reftable_ref_record_equal(struct reftable_ref_record *a,
+			      struct reftable_ref_record *b, int hash_size)
+{
+	assert(hash_size > 0);
+	if (!(0 == strcmp(a->refname, b->refname) &&
+	      a->update_index == b->update_index &&
+	      a->value_type == b->value_type))
+		return 0;
+
+	switch (a->value_type) {
+	case REFTABLE_REF_SYMREF:
+		return !strcmp(a->value.symref, b->value.symref);
+	case REFTABLE_REF_VAL2:
+		return hash_equal(a->value.val2.value, b->value.val2.value,
+				  hash_size) &&
+		       hash_equal(a->value.val2.target_value,
+				  b->value.val2.target_value, hash_size);
+	case REFTABLE_REF_VAL1:
+		return hash_equal(a->value.val1, b->value.val1, hash_size);
+	case REFTABLE_REF_DELETION:
+		return 1;
+	default:
+		abort();
+	}
+}
+
+int reftable_ref_record_compare_name(const void *a, const void *b)
+{
+	return strcmp(((struct reftable_ref_record *)a)->refname,
+		      ((struct reftable_ref_record *)b)->refname);
+}
+
+int reftable_ref_record_is_deletion(const struct reftable_ref_record *ref)
+{
+	return ref->value_type == REFTABLE_REF_DELETION;
+}
+
+int reftable_log_record_compare_key(const void *a, const void *b)
+{
+	const struct reftable_log_record *la = a;
+	const struct reftable_log_record *lb = b;
+
+	int cmp = strcmp(la->refname, lb->refname);
+	if (cmp)
+		return cmp;
+	if (la->update_index > lb->update_index)
+		return -1;
+	return (la->update_index < lb->update_index) ? 1 : 0;
+}
+
+int reftable_log_record_is_deletion(const struct reftable_log_record *log)
+{
+	return (log->value_type == REFTABLE_LOG_DELETION);
+}
+
+void string_view_consume(struct string_view *s, int n)
+{
+	s->buf += n;
+	s->len -= n;
+}
diff --git a/reftable/record.h b/reftable/record.h
new file mode 100644
index 0000000000..498e8c50bf
--- /dev/null
+++ b/reftable/record.h
@@ -0,0 +1,139 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef RECORD_H
+#define RECORD_H
+
+#include "system.h"
+
+#include <stdint.h>
+
+#include "reftable-record.h"
+
+/*
+ * A substring of existing string data. This structure takes no responsibility
+ * for the lifetime of the data it points to.
+ */
+struct string_view {
+	uint8_t *buf;
+	size_t len;
+};
+
+/* Advance `s.buf` by `n`, and decrease length. */
+void string_view_consume(struct string_view *s, int n);
+
+/* utilities for de/encoding varints */
+
+int get_var_int(uint64_t *dest, struct string_view *in);
+int put_var_int(struct string_view *dest, uint64_t val);
+
+/* Methods for records. */
+struct reftable_record_vtable {
+	/* encode the key of to a uint8_t strbuf. */
+	void (*key)(const void *rec, struct strbuf *dest);
+
+	/* The record type of ('r' for ref). */
+	uint8_t type;
+
+	void (*copy_from)(void *dest, const void *src, int hash_size);
+
+	/* a value of [0..7], indicating record subvariants (eg. ref vs. symref
+	 * vs ref deletion) */
+	uint8_t (*val_type)(const void *rec);
+
+	/* encodes rec into dest, returning how much space was used. */
+	int (*encode)(const void *rec, struct string_view dest, int hash_size);
+
+	/* decode data from `src` into the record. */
+	int (*decode)(void *rec, struct strbuf key, uint8_t extra,
+		      struct string_view src, int hash_size);
+
+	/* deallocate and null the record. */
+	void (*release)(void *rec);
+
+	/* is this a tombstone? */
+	int (*is_deletion)(const void *rec);
+};
+
+/* record is a generic wrapper for different types of records. */
+struct reftable_record {
+	void *data;
+	struct reftable_record_vtable *ops;
+};
+
+/* returns true for recognized block types. Block start with the block type. */
+int reftable_is_block_type(uint8_t typ);
+
+/* creates a malloced record of the given type. Dispose with record_destroy */
+struct reftable_record reftable_new_record(uint8_t typ);
+
+/* Encode `key` into `dest`. Sets `is_restart` to indicate a restart. Returns
+ * number of bytes written. */
+int reftable_encode_key(int *is_restart, struct string_view dest,
+			struct strbuf prev_key, struct strbuf key,
+			uint8_t extra);
+
+/* Decode into `key` and `extra` from `in` */
+int reftable_decode_key(struct strbuf *key, uint8_t *extra,
+			struct strbuf last_key, struct string_view in);
+
+/* reftable_index_record are used internally to speed up lookups. */
+struct reftable_index_record {
+	uint64_t offset; /* Offset of block */
+	struct strbuf last_key; /* Last key of the block. */
+};
+
+/* reftable_obj_record stores an object ID => ref mapping. */
+struct reftable_obj_record {
+	uint8_t *hash_prefix; /* leading bytes of the object ID */
+	int hash_prefix_len; /* number of leading bytes. Constant
+			      * across a single table. */
+	uint64_t *offsets; /* a vector of file offsets. */
+	int offset_len;
+};
+
+/* see struct record_vtable */
+
+void reftable_record_key(struct reftable_record *rec, struct strbuf *dest);
+uint8_t reftable_record_type(struct reftable_record *rec);
+void reftable_record_copy_from(struct reftable_record *rec,
+			       struct reftable_record *src, int hash_size);
+uint8_t reftable_record_val_type(struct reftable_record *rec);
+int reftable_record_encode(struct reftable_record *rec, struct string_view dest,
+			   int hash_size);
+int reftable_record_decode(struct reftable_record *rec, struct strbuf key,
+			   uint8_t extra, struct string_view src,
+			   int hash_size);
+int reftable_record_is_deletion(struct reftable_record *rec);
+
+/* zeroes out the embedded record */
+void reftable_record_release(struct reftable_record *rec);
+
+/* clear and deallocate embedded record, and zero `rec`. */
+void reftable_record_destroy(struct reftable_record *rec);
+
+/* initialize generic records from concrete records. The generic record should
+ * be zeroed out. */
+void reftable_record_from_obj(struct reftable_record *rec,
+			      struct reftable_obj_record *objrec);
+void reftable_record_from_index(struct reftable_record *rec,
+				struct reftable_index_record *idxrec);
+void reftable_record_from_ref(struct reftable_record *rec,
+			      struct reftable_ref_record *refrec);
+void reftable_record_from_log(struct reftable_record *rec,
+			      struct reftable_log_record *logrec);
+struct reftable_ref_record *reftable_record_as_ref(struct reftable_record *ref);
+struct reftable_log_record *reftable_record_as_log(struct reftable_record *ref);
+
+/* for qsort. */
+int reftable_ref_record_compare_name(const void *a, const void *b);
+
+/* for qsort. */
+int reftable_log_record_compare_key(const void *a, const void *b);
+
+#endif
diff --git a/reftable/record_test.c b/reftable/record_test.c
new file mode 100644
index 0000000000..f4ad7cace4
--- /dev/null
+++ b/reftable/record_test.c
@@ -0,0 +1,412 @@
+/*
+  Copyright 2020 Google LLC
+
+  Use of this source code is governed by a BSD-style
+  license that can be found in the LICENSE file or at
+  https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "record.h"
+
+#include "system.h"
+#include "basics.h"
+#include "constants.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+static void test_copy(struct reftable_record *rec)
+{
+	struct reftable_record copy =
+		reftable_new_record(reftable_record_type(rec));
+	reftable_record_copy_from(&copy, rec, GIT_SHA1_RAWSZ);
+	/* do it twice to catch memory leaks */
+	reftable_record_copy_from(&copy, rec, GIT_SHA1_RAWSZ);
+	switch (reftable_record_type(&copy)) {
+	case BLOCK_TYPE_REF:
+		EXPECT(reftable_ref_record_equal(reftable_record_as_ref(&copy),
+						 reftable_record_as_ref(rec),
+						 GIT_SHA1_RAWSZ));
+		break;
+	case BLOCK_TYPE_LOG:
+		EXPECT(reftable_log_record_equal(reftable_record_as_log(&copy),
+						 reftable_record_as_log(rec),
+						 GIT_SHA1_RAWSZ));
+		break;
+	}
+	reftable_record_destroy(&copy);
+}
+
+static void test_varint_roundtrip(void)
+{
+	uint64_t inputs[] = { 0,
+			      1,
+			      27,
+			      127,
+			      128,
+			      257,
+			      4096,
+			      ((uint64_t)1 << 63),
+			      ((uint64_t)1 << 63) + ((uint64_t)1 << 63) - 1 };
+	int i = 0;
+	for (i = 0; i < ARRAY_SIZE(inputs); i++) {
+		uint8_t dest[10];
+
+		struct string_view out = {
+			.buf = dest,
+			.len = sizeof(dest),
+		};
+		uint64_t in = inputs[i];
+		int n = put_var_int(&out, in);
+		uint64_t got = 0;
+
+		EXPECT(n > 0);
+		out.len = n;
+		n = get_var_int(&got, &out);
+		EXPECT(n > 0);
+
+		EXPECT(got == in);
+	}
+}
+
+static void test_common_prefix(void)
+{
+	struct {
+		const char *a, *b;
+		int want;
+	} cases[] = {
+		{ "abc", "ab", 2 },
+		{ "", "abc", 0 },
+		{ "abc", "abd", 2 },
+		{ "abc", "pqr", 0 },
+	};
+
+	int i = 0;
+	for (i = 0; i < ARRAY_SIZE(cases); i++) {
+		struct strbuf a = STRBUF_INIT;
+		struct strbuf b = STRBUF_INIT;
+		strbuf_addstr(&a, cases[i].a);
+		strbuf_addstr(&b, cases[i].b);
+		EXPECT(common_prefix_size(&a, &b) == cases[i].want);
+
+		strbuf_release(&a);
+		strbuf_release(&b);
+	}
+}
+
+static void set_hash(uint8_t *h, int j)
+{
+	int i = 0;
+	for (i = 0; i < hash_size(GIT_SHA1_FORMAT_ID); i++) {
+		h[i] = (j >> i) & 0xff;
+	}
+}
+
+static void test_reftable_ref_record_roundtrip(void)
+{
+	int i = 0;
+
+	for (i = REFTABLE_REF_DELETION; i < REFTABLE_NR_REF_VALUETYPES; i++) {
+		struct reftable_ref_record in = { NULL };
+		struct reftable_ref_record out = { NULL };
+		struct reftable_record rec_out = { NULL };
+		struct strbuf key = STRBUF_INIT;
+		struct reftable_record rec = { NULL };
+		uint8_t buffer[1024] = { 0 };
+		struct string_view dest = {
+			.buf = buffer,
+			.len = sizeof(buffer),
+		};
+
+		int n, m;
+
+		in.value_type = i;
+		switch (i) {
+		case REFTABLE_REF_DELETION:
+			break;
+		case REFTABLE_REF_VAL1:
+			in.value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+			set_hash(in.value.val1, 1);
+			break;
+		case REFTABLE_REF_VAL2:
+			in.value.val2.value = reftable_malloc(GIT_SHA1_RAWSZ);
+			set_hash(in.value.val2.value, 1);
+			in.value.val2.target_value =
+				reftable_malloc(GIT_SHA1_RAWSZ);
+			set_hash(in.value.val2.target_value, 2);
+			break;
+		case REFTABLE_REF_SYMREF:
+			in.value.symref = xstrdup("target");
+			break;
+		}
+		in.refname = xstrdup("refs/heads/master");
+
+		reftable_record_from_ref(&rec, &in);
+		test_copy(&rec);
+
+		EXPECT(reftable_record_val_type(&rec) == i);
+
+		reftable_record_key(&rec, &key);
+		n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n > 0);
+
+		/* decode into a non-zero reftable_record to test for leaks. */
+
+		reftable_record_from_ref(&rec_out, &out);
+		m = reftable_record_decode(&rec_out, key, i, dest,
+					   GIT_SHA1_RAWSZ);
+		EXPECT(n == m);
+
+		EXPECT(reftable_ref_record_equal(&in, &out, GIT_SHA1_RAWSZ));
+		reftable_record_release(&rec_out);
+
+		strbuf_release(&key);
+		reftable_ref_record_release(&in);
+	}
+}
+
+static void test_reftable_log_record_equal(void)
+{
+	struct reftable_log_record in[2] = {
+		{
+			.refname = xstrdup("refs/heads/master"),
+			.update_index = 42,
+		},
+		{
+			.refname = xstrdup("refs/heads/master"),
+			.update_index = 22,
+		}
+	};
+
+	EXPECT(!reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
+	in[1].update_index = in[0].update_index;
+	EXPECT(reftable_log_record_equal(&in[0], &in[1], GIT_SHA1_RAWSZ));
+	reftable_log_record_release(&in[0]);
+	reftable_log_record_release(&in[1]);
+}
+
+static void test_reftable_log_record_roundtrip(void)
+{
+	int i;
+	struct reftable_log_record in[2] = {
+		{
+			.refname = xstrdup("refs/heads/master"),
+			.update_index = 42,
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value = {
+				.update = {
+					.old_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+					.new_hash = reftable_malloc(GIT_SHA1_RAWSZ),
+					.name = xstrdup("han-wen"),
+					.email = xstrdup("hanwen@google.com"),
+					.message = xstrdup("test"),
+					.time = 1577123507,
+					.tz_offset = 100,
+				},
+			}
+		},
+		{
+			.refname = xstrdup("refs/heads/master"),
+			.update_index = 22,
+			.value_type = REFTABLE_LOG_DELETION,
+		}
+	};
+	set_test_hash(in[0].value.update.new_hash, 1);
+	set_test_hash(in[0].value.update.old_hash, 2);
+	for (i = 0; i < ARRAY_SIZE(in); i++) {
+		struct reftable_record rec = { NULL };
+		struct strbuf key = STRBUF_INIT;
+		uint8_t buffer[1024] = { 0 };
+		struct string_view dest = {
+			.buf = buffer,
+			.len = sizeof(buffer),
+		};
+		/* populate out, to check for leaks. */
+		struct reftable_log_record out = {
+			.refname = xstrdup("old name"),
+			.value_type = REFTABLE_LOG_UPDATE,
+			.value = {
+				.update = {
+					.new_hash = reftable_calloc(GIT_SHA1_RAWSZ),
+					.old_hash = reftable_calloc(GIT_SHA1_RAWSZ),
+					.name = xstrdup("old name"),
+					.email = xstrdup("old@email"),
+					.message = xstrdup("old message"),
+				},
+			},
+		};
+		struct reftable_record rec_out = { NULL };
+		int n, m, valtype;
+
+		reftable_record_from_log(&rec, &in[i]);
+
+		test_copy(&rec);
+
+		reftable_record_key(&rec, &key);
+
+		n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n >= 0);
+		reftable_record_from_log(&rec_out, &out);
+		valtype = reftable_record_val_type(&rec);
+		m = reftable_record_decode(&rec_out, key, valtype, dest,
+					   GIT_SHA1_RAWSZ);
+		EXPECT(n == m);
+
+		EXPECT(reftable_log_record_equal(&in[i], &out, GIT_SHA1_RAWSZ));
+		reftable_log_record_release(&in[i]);
+		strbuf_release(&key);
+		reftable_record_release(&rec_out);
+	}
+}
+
+static void test_u24_roundtrip(void)
+{
+	uint32_t in = 0x112233;
+	uint8_t dest[3];
+	uint32_t out;
+	put_be24(dest, in);
+	out = get_be24(dest);
+	EXPECT(in == out);
+}
+
+static void test_key_roundtrip(void)
+{
+	uint8_t buffer[1024] = { 0 };
+	struct string_view dest = {
+		.buf = buffer,
+		.len = sizeof(buffer),
+	};
+	struct strbuf last_key = STRBUF_INIT;
+	struct strbuf key = STRBUF_INIT;
+	struct strbuf roundtrip = STRBUF_INIT;
+	int restart;
+	uint8_t extra;
+	int n, m;
+	uint8_t rt_extra;
+
+	strbuf_addstr(&last_key, "refs/heads/master");
+	strbuf_addstr(&key, "refs/tags/bla");
+	extra = 6;
+	n = reftable_encode_key(&restart, dest, last_key, key, extra);
+	EXPECT(!restart);
+	EXPECT(n > 0);
+
+	m = reftable_decode_key(&roundtrip, &rt_extra, last_key, dest);
+	EXPECT(n == m);
+	EXPECT(0 == strbuf_cmp(&key, &roundtrip));
+	EXPECT(rt_extra == extra);
+
+	strbuf_release(&last_key);
+	strbuf_release(&key);
+	strbuf_release(&roundtrip);
+}
+
+static void test_reftable_obj_record_roundtrip(void)
+{
+	uint8_t testHash1[GIT_SHA1_RAWSZ] = { 1, 2, 3, 4, 0 };
+	uint64_t till9[] = { 1, 2, 3, 4, 500, 600, 700, 800, 9000 };
+	struct reftable_obj_record recs[3] = { {
+						       .hash_prefix = testHash1,
+						       .hash_prefix_len = 5,
+						       .offsets = till9,
+						       .offset_len = 3,
+					       },
+					       {
+						       .hash_prefix = testHash1,
+						       .hash_prefix_len = 5,
+						       .offsets = till9,
+						       .offset_len = 9,
+					       },
+					       {
+						       .hash_prefix = testHash1,
+						       .hash_prefix_len = 5,
+					       } };
+	int i = 0;
+	for (i = 0; i < ARRAY_SIZE(recs); i++) {
+		struct reftable_obj_record in = recs[i];
+		uint8_t buffer[1024] = { 0 };
+		struct string_view dest = {
+			.buf = buffer,
+			.len = sizeof(buffer),
+		};
+		struct reftable_record rec = { NULL };
+		struct strbuf key = STRBUF_INIT;
+		struct reftable_obj_record out = { NULL };
+		struct reftable_record rec_out = { NULL };
+		int n, m;
+		uint8_t extra;
+
+		reftable_record_from_obj(&rec, &in);
+		test_copy(&rec);
+		reftable_record_key(&rec, &key);
+		n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ);
+		EXPECT(n > 0);
+		extra = reftable_record_val_type(&rec);
+		reftable_record_from_obj(&rec_out, &out);
+		m = reftable_record_decode(&rec_out, key, extra, dest,
+					   GIT_SHA1_RAWSZ);
+		EXPECT(n == m);
+
+		EXPECT(in.hash_prefix_len == out.hash_prefix_len);
+		EXPECT(in.offset_len == out.offset_len);
+
+		EXPECT(!memcmp(in.hash_prefix, out.hash_prefix,
+			       in.hash_prefix_len));
+		EXPECT(0 == memcmp(in.offsets, out.offsets,
+				   sizeof(uint64_t) * in.offset_len));
+		strbuf_release(&key);
+		reftable_record_release(&rec_out);
+	}
+}
+
+static void test_reftable_index_record_roundtrip(void)
+{
+	struct reftable_index_record in = {
+		.offset = 42,
+		.last_key = STRBUF_INIT,
+	};
+	uint8_t buffer[1024] = { 0 };
+	struct string_view dest = {
+		.buf = buffer,
+		.len = sizeof(buffer),
+	};
+	struct strbuf key = STRBUF_INIT;
+	struct reftable_record rec = { NULL };
+	struct reftable_index_record out = { .last_key = STRBUF_INIT };
+	struct reftable_record out_rec = { NULL };
+	int n, m;
+	uint8_t extra;
+
+	strbuf_addstr(&in.last_key, "refs/heads/master");
+	reftable_record_from_index(&rec, &in);
+	reftable_record_key(&rec, &key);
+	test_copy(&rec);
+
+	EXPECT(0 == strbuf_cmp(&key, &in.last_key));
+	n = reftable_record_encode(&rec, dest, GIT_SHA1_RAWSZ);
+	EXPECT(n > 0);
+
+	extra = reftable_record_val_type(&rec);
+	reftable_record_from_index(&out_rec, &out);
+	m = reftable_record_decode(&out_rec, key, extra, dest, GIT_SHA1_RAWSZ);
+	EXPECT(m == n);
+
+	EXPECT(in.offset == out.offset);
+
+	reftable_record_release(&out_rec);
+	strbuf_release(&key);
+	strbuf_release(&in.last_key);
+}
+
+int record_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_reftable_log_record_equal);
+	RUN_TEST(test_reftable_log_record_roundtrip);
+	RUN_TEST(test_reftable_ref_record_roundtrip);
+	RUN_TEST(test_varint_roundtrip);
+	RUN_TEST(test_key_roundtrip);
+	RUN_TEST(test_common_prefix);
+	RUN_TEST(test_reftable_obj_record_roundtrip);
+	RUN_TEST(test_reftable_index_record_roundtrip);
+	RUN_TEST(test_u24_roundtrip);
+	return 0;
+}
diff --git a/reftable/refname.c b/reftable/refname.c
new file mode 100644
index 0000000000..9573496932
--- /dev/null
+++ b/reftable/refname.c
@@ -0,0 +1,209 @@
+/*
+  Copyright 2020 Google LLC
+
+  Use of this source code is governed by a BSD-style
+  license that can be found in the LICENSE file or at
+  https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+#include "reftable-error.h"
+#include "basics.h"
+#include "refname.h"
+#include "reftable-iterator.h"
+
+struct find_arg {
+	char **names;
+	const char *want;
+};
+
+static int find_name(size_t k, void *arg)
+{
+	struct find_arg *f_arg = arg;
+	return strcmp(f_arg->names[k], f_arg->want) >= 0;
+}
+
+static int modification_has_ref(struct modification *mod, const char *name)
+{
+	struct reftable_ref_record ref = { NULL };
+	int err = 0;
+
+	if (mod->add_len > 0) {
+		struct find_arg arg = {
+			.names = mod->add,
+			.want = name,
+		};
+		int idx = binsearch(mod->add_len, find_name, &arg);
+		if (idx < mod->add_len && !strcmp(mod->add[idx], name)) {
+			return 0;
+		}
+	}
+
+	if (mod->del_len > 0) {
+		struct find_arg arg = {
+			.names = mod->del,
+			.want = name,
+		};
+		int idx = binsearch(mod->del_len, find_name, &arg);
+		if (idx < mod->del_len && !strcmp(mod->del[idx], name)) {
+			return 1;
+		}
+	}
+
+	err = reftable_table_read_ref(&mod->tab, name, &ref);
+	reftable_ref_record_release(&ref);
+	return err;
+}
+
+static void modification_release(struct modification *mod)
+{
+	/* don't delete the strings themselves; they're owned by ref records.
+	 */
+	FREE_AND_NULL(mod->add);
+	FREE_AND_NULL(mod->del);
+	mod->add_len = 0;
+	mod->del_len = 0;
+}
+
+static int modification_has_ref_with_prefix(struct modification *mod,
+					    const char *prefix)
+{
+	struct reftable_iterator it = { NULL };
+	struct reftable_ref_record ref = { NULL };
+	int err = 0;
+
+	if (mod->add_len > 0) {
+		struct find_arg arg = {
+			.names = mod->add,
+			.want = prefix,
+		};
+		int idx = binsearch(mod->add_len, find_name, &arg);
+		if (idx < mod->add_len &&
+		    !strncmp(prefix, mod->add[idx], strlen(prefix)))
+			goto done;
+	}
+	err = reftable_table_seek_ref(&mod->tab, &it, prefix);
+	if (err)
+		goto done;
+
+	while (1) {
+		err = reftable_iterator_next_ref(&it, &ref);
+		if (err)
+			goto done;
+
+		if (mod->del_len > 0) {
+			struct find_arg arg = {
+				.names = mod->del,
+				.want = ref.refname,
+			};
+			int idx = binsearch(mod->del_len, find_name, &arg);
+			if (idx < mod->del_len &&
+			    !strcmp(ref.refname, mod->del[idx])) {
+				continue;
+			}
+		}
+
+		if (strncmp(ref.refname, prefix, strlen(prefix))) {
+			err = 1;
+			goto done;
+		}
+		err = 0;
+		goto done;
+	}
+
+done:
+	reftable_ref_record_release(&ref);
+	reftable_iterator_destroy(&it);
+	return err;
+}
+
+static int validate_refname(const char *name)
+{
+	while (1) {
+		char *next = strchr(name, '/');
+		if (!*name) {
+			return REFTABLE_REFNAME_ERROR;
+		}
+		if (!next) {
+			return 0;
+		}
+		if (next - name == 0 || (next - name == 1 && *name == '.') ||
+		    (next - name == 2 && name[0] == '.' && name[1] == '.'))
+			return REFTABLE_REFNAME_ERROR;
+		name = next + 1;
+	}
+	return 0;
+}
+
+int validate_ref_record_addition(struct reftable_table tab,
+				 struct reftable_ref_record *recs, size_t sz)
+{
+	struct modification mod = {
+		.tab = tab,
+		.add = reftable_calloc(sizeof(char *) * sz),
+		.del = reftable_calloc(sizeof(char *) * sz),
+	};
+	int i = 0;
+	int err = 0;
+	for (; i < sz; i++) {
+		if (reftable_ref_record_is_deletion(&recs[i])) {
+			mod.del[mod.del_len++] = recs[i].refname;
+		} else {
+			mod.add[mod.add_len++] = recs[i].refname;
+		}
+	}
+
+	err = modification_validate(&mod);
+	modification_release(&mod);
+	return err;
+}
+
+static void strbuf_trim_component(struct strbuf *sl)
+{
+	while (sl->len > 0) {
+		int is_slash = (sl->buf[sl->len - 1] == '/');
+		strbuf_setlen(sl, sl->len - 1);
+		if (is_slash)
+			break;
+	}
+}
+
+int modification_validate(struct modification *mod)
+{
+	struct strbuf slashed = STRBUF_INIT;
+	int err = 0;
+	int i = 0;
+	for (; i < mod->add_len; i++) {
+		err = validate_refname(mod->add[i]);
+		if (err)
+			goto done;
+		strbuf_reset(&slashed);
+		strbuf_addstr(&slashed, mod->add[i]);
+		strbuf_addstr(&slashed, "/");
+
+		err = modification_has_ref_with_prefix(mod, slashed.buf);
+		if (err == 0) {
+			err = REFTABLE_NAME_CONFLICT;
+			goto done;
+		}
+		if (err < 0)
+			goto done;
+
+		strbuf_reset(&slashed);
+		strbuf_addstr(&slashed, mod->add[i]);
+		while (slashed.len) {
+			strbuf_trim_component(&slashed);
+			err = modification_has_ref(mod, slashed.buf);
+			if (err == 0) {
+				err = REFTABLE_NAME_CONFLICT;
+				goto done;
+			}
+			if (err < 0)
+				goto done;
+		}
+	}
+	err = 0;
+done:
+	strbuf_release(&slashed);
+	return err;
+}
diff --git a/reftable/refname.h b/reftable/refname.h
new file mode 100644
index 0000000000..a24b40fcb4
--- /dev/null
+++ b/reftable/refname.h
@@ -0,0 +1,29 @@
+/*
+  Copyright 2020 Google LLC
+
+  Use of this source code is governed by a BSD-style
+  license that can be found in the LICENSE file or at
+  https://developers.google.com/open-source/licenses/bsd
+*/
+#ifndef REFNAME_H
+#define REFNAME_H
+
+#include "reftable-record.h"
+#include "reftable-generic.h"
+
+struct modification {
+	struct reftable_table tab;
+
+	char **add;
+	size_t add_len;
+
+	char **del;
+	size_t del_len;
+};
+
+int validate_ref_record_addition(struct reftable_table tab,
+				 struct reftable_ref_record *recs, size_t sz);
+
+int modification_validate(struct modification *mod);
+
+#endif
diff --git a/reftable/refname_test.c b/reftable/refname_test.c
new file mode 100644
index 0000000000..8645cd93bb
--- /dev/null
+++ b/reftable/refname_test.c
@@ -0,0 +1,102 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+#include "block.h"
+#include "blocksource.h"
+#include "constants.h"
+#include "reader.h"
+#include "record.h"
+#include "refname.h"
+#include "reftable-error.h"
+#include "reftable-writer.h"
+#include "system.h"
+
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+struct testcase {
+	char *add;
+	char *del;
+	int error_code;
+};
+
+static void test_conflict(void)
+{
+	struct reftable_write_options opts = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+	struct reftable_writer *w =
+		reftable_new_writer(&strbuf_add_void, &buf, &opts);
+	struct reftable_ref_record rec = {
+		.refname = "a/b",
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "destination", /* make sure it's not a symref.
+						*/
+		.update_index = 1,
+	};
+	int err;
+	int i;
+	struct reftable_block_source source = { NULL };
+	struct reftable_reader *rd = NULL;
+	struct reftable_table tab = { NULL };
+	struct testcase cases[] = {
+		{ "a/b/c", NULL, REFTABLE_NAME_CONFLICT },
+		{ "b", NULL, 0 },
+		{ "a", NULL, REFTABLE_NAME_CONFLICT },
+		{ "a", "a/b", 0 },
+
+		{ "p/", NULL, REFTABLE_REFNAME_ERROR },
+		{ "p//q", NULL, REFTABLE_REFNAME_ERROR },
+		{ "p/./q", NULL, REFTABLE_REFNAME_ERROR },
+		{ "p/../q", NULL, REFTABLE_REFNAME_ERROR },
+
+		{ "a/b/c", "a/b", 0 },
+		{ NULL, "a//b", 0 },
+	};
+	reftable_writer_set_limits(w, 1, 1);
+
+	err = reftable_writer_add_ref(w, &rec);
+	EXPECT_ERR(err);
+
+	err = reftable_writer_close(w);
+	EXPECT_ERR(err);
+	reftable_writer_free(w);
+
+	block_source_from_strbuf(&source, &buf);
+	err = reftable_new_reader(&rd, &source, "filename");
+	EXPECT_ERR(err);
+
+	reftable_table_from_reader(&tab, rd);
+
+	for (i = 0; i < ARRAY_SIZE(cases); i++) {
+		struct modification mod = {
+			.tab = tab,
+		};
+
+		if (cases[i].add) {
+			mod.add = &cases[i].add;
+			mod.add_len = 1;
+		}
+		if (cases[i].del) {
+			mod.del = &cases[i].del;
+			mod.del_len = 1;
+		}
+
+		err = modification_validate(&mod);
+		EXPECT(err == cases[i].error_code);
+	}
+
+	reftable_reader_free(rd);
+	strbuf_release(&buf);
+}
+
+int refname_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_conflict);
+	return 0;
+}
diff --git a/reftable/reftable-blocksource.h b/reftable/reftable-blocksource.h
new file mode 100644
index 0000000000..5aa3990a57
--- /dev/null
+++ b/reftable/reftable-blocksource.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_BLOCKSOURCE_H
+#define REFTABLE_BLOCKSOURCE_H
+
+#include <stdint.h>
+
+/* block_source is a generic wrapper for a seekable readable file.
+ */
+struct reftable_block_source {
+	struct reftable_block_source_vtable *ops;
+	void *arg;
+};
+
+/* a contiguous segment of bytes. It keeps track of its generating block_source
+ * so it can return itself into the pool. */
+struct reftable_block {
+	uint8_t *data;
+	int len;
+	struct reftable_block_source source;
+};
+
+/* block_source_vtable are the operations that make up block_source */
+struct reftable_block_source_vtable {
+	/* returns the size of a block source */
+	uint64_t (*size)(void *source);
+
+	/* reads a segment from the block source. It is an error to read
+	   beyond the end of the block */
+	int (*read_block)(void *source, struct reftable_block *dest,
+			  uint64_t off, uint32_t size);
+	/* mark the block as read; may return the data back to malloc */
+	void (*return_block)(void *source, struct reftable_block *blockp);
+
+	/* release all resources associated with the block source */
+	void (*close)(void *source);
+};
+
+/* opens a file on the file system as a block_source */
+int reftable_block_source_from_file(struct reftable_block_source *block_src,
+				    const char *name);
+
+#endif
diff --git a/reftable/reftable-error.h b/reftable/reftable-error.h
new file mode 100644
index 0000000000..4c457aaaf8
--- /dev/null
+++ b/reftable/reftable-error.h
@@ -0,0 +1,66 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_ERROR_H
+#define REFTABLE_ERROR_H
+
+/*
+ * Errors in reftable calls are signaled with negative integer return values. 0
+ * means success.
+ */
+enum reftable_error {
+	/* Unexpected file system behavior */
+	REFTABLE_IO_ERROR = -2,
+
+	/* Format inconsistency on reading data */
+	REFTABLE_FORMAT_ERROR = -3,
+
+	/* File does not exist. Returned from block_source_from_file(), because
+	 * it needs special handling in stack.
+	 */
+	REFTABLE_NOT_EXIST_ERROR = -4,
+
+	/* Trying to write out-of-date data. */
+	REFTABLE_LOCK_ERROR = -5,
+
+	/* Misuse of the API:
+	 *  - on writing a record with NULL refname.
+	 *  - on writing a reftable_ref_record outside the table limits
+	 *  - on writing a ref or log record before the stack's
+	 * next_update_inde*x
+	 *  - on writing a log record with multiline message with
+	 *  exact_log_message unset
+	 *  - on reading a reftable_ref_record from log iterator, or vice versa.
+	 *
+	 * When a call misuses the API, the internal state of the library is
+	 * kept unchanged.
+	 */
+	REFTABLE_API_ERROR = -6,
+
+	/* Decompression error */
+	REFTABLE_ZLIB_ERROR = -7,
+
+	/* Wrote a table without blocks. */
+	REFTABLE_EMPTY_TABLE_ERROR = -8,
+
+	/* Dir/file conflict. */
+	REFTABLE_NAME_CONFLICT = -9,
+
+	/* Invalid ref name. */
+	REFTABLE_REFNAME_ERROR = -10,
+
+	/* Entry does not fit. This can happen when writing outsize reflog
+	   messages. */
+	REFTABLE_ENTRY_TOO_BIG_ERROR = -11,
+};
+
+/* convert the numeric error code to a string. The string should not be
+ * deallocated. */
+const char *reftable_error_str(int err);
+
+#endif
diff --git a/reftable/reftable-generic.h b/reftable/reftable-generic.h
new file mode 100644
index 0000000000..d239751a77
--- /dev/null
+++ b/reftable/reftable-generic.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_GENERIC_H
+#define REFTABLE_GENERIC_H
+
+#include "reftable-iterator.h"
+
+struct reftable_table_vtable;
+
+/*
+ * Provides a unified API for reading tables, either merged tables, or single
+ * readers. */
+struct reftable_table {
+	struct reftable_table_vtable *ops;
+	void *table_arg;
+};
+
+int reftable_table_seek_log(struct reftable_table *tab,
+			    struct reftable_iterator *it, const char *name);
+
+int reftable_table_seek_ref(struct reftable_table *tab,
+			    struct reftable_iterator *it, const char *name);
+
+/* returns the hash ID from a generic reftable_table */
+uint32_t reftable_table_hash_id(struct reftable_table *tab);
+
+/* returns the max update_index covered by this table. */
+uint64_t reftable_table_max_update_index(struct reftable_table *tab);
+
+/* returns the min update_index covered by this table. */
+uint64_t reftable_table_min_update_index(struct reftable_table *tab);
+
+/* convenience function to read a single ref. Returns < 0 for error, 0
+   for success, and 1 if ref not found. */
+int reftable_table_read_ref(struct reftable_table *tab, const char *name,
+			    struct reftable_ref_record *ref);
+
+/* dump table contents onto stdout for debugging */
+int reftable_table_print(struct reftable_table *tab);
+
+#endif
diff --git a/reftable/reftable-iterator.h b/reftable/reftable-iterator.h
new file mode 100644
index 0000000000..d3eee7af35
--- /dev/null
+++ b/reftable/reftable-iterator.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_ITERATOR_H
+#define REFTABLE_ITERATOR_H
+
+#include "reftable-record.h"
+
+struct reftable_iterator_vtable;
+
+/* iterator is the generic interface for walking over data stored in a
+ * reftable.
+ */
+struct reftable_iterator {
+	struct reftable_iterator_vtable *ops;
+	void *iter_arg;
+};
+
+/* reads the next reftable_ref_record. Returns < 0 for error, 0 for OK and > 0:
+ * end of iteration.
+ */
+int reftable_iterator_next_ref(struct reftable_iterator *it,
+			       struct reftable_ref_record *ref);
+
+/* reads the next reftable_log_record. Returns < 0 for error, 0 for OK and > 0:
+ * end of iteration.
+ */
+int reftable_iterator_next_log(struct reftable_iterator *it,
+			       struct reftable_log_record *log);
+
+/* releases resources associated with an iterator. */
+void reftable_iterator_destroy(struct reftable_iterator *it);
+
+#endif
diff --git a/reftable/reftable-malloc.h b/reftable/reftable-malloc.h
new file mode 100644
index 0000000000..5f2185f1f3
--- /dev/null
+++ b/reftable/reftable-malloc.h
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_H
+#define REFTABLE_H
+
+#include <stddef.h>
+
+/* Overrides the functions to use for memory management. */
+void reftable_set_alloc(void *(*malloc)(size_t),
+			void *(*realloc)(void *, size_t), void (*free)(void *));
+
+#endif
diff --git a/reftable/reftable-merged.h b/reftable/reftable-merged.h
new file mode 100644
index 0000000000..1a6d16915a
--- /dev/null
+++ b/reftable/reftable-merged.h
@@ -0,0 +1,72 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_MERGED_H
+#define REFTABLE_MERGED_H
+
+#include "reftable-iterator.h"
+
+/*
+ * Merged tables
+ *
+ * A ref database kept in a sequence of table files. The merged_table presents a
+ * unified view to reading (seeking, iterating) a sequence of immutable tables.
+ *
+ * The merged tables are on purpose kept disconnected from their actual storage
+ * (eg. files on disk), because it is useful to merge tables aren't files. For
+ * example, the per-workspace and global ref namespace can be implemented as a
+ * merged table of two stacks of file-backed reftables.
+ */
+
+/* A merged table is implements seeking/iterating over a stack of tables. */
+struct reftable_merged_table;
+
+/* A generic reftable; see below. */
+struct reftable_table;
+
+/* reftable_new_merged_table creates a new merged table. It takes ownership of
+   the stack array.
+*/
+int reftable_new_merged_table(struct reftable_merged_table **dest,
+			      struct reftable_table *stack, int n,
+			      uint32_t hash_id);
+
+/* returns an iterator positioned just before 'name' */
+int reftable_merged_table_seek_ref(struct reftable_merged_table *mt,
+				   struct reftable_iterator *it,
+				   const char *name);
+
+/* returns an iterator for log entry, at given update_index */
+int reftable_merged_table_seek_log_at(struct reftable_merged_table *mt,
+				      struct reftable_iterator *it,
+				      const char *name, uint64_t update_index);
+
+/* like reftable_merged_table_seek_log_at but look for the newest entry. */
+int reftable_merged_table_seek_log(struct reftable_merged_table *mt,
+				   struct reftable_iterator *it,
+				   const char *name);
+
+/* returns the max update_index covered by this merged table. */
+uint64_t
+reftable_merged_table_max_update_index(struct reftable_merged_table *mt);
+
+/* returns the min update_index covered by this merged table. */
+uint64_t
+reftable_merged_table_min_update_index(struct reftable_merged_table *mt);
+
+/* releases memory for the merged_table */
+void reftable_merged_table_free(struct reftable_merged_table *m);
+
+/* return the hash ID of the merged table. */
+uint32_t reftable_merged_table_hash_id(struct reftable_merged_table *m);
+
+/* create a generic table from reftable_merged_table */
+void reftable_table_from_merged_table(struct reftable_table *tab,
+				      struct reftable_merged_table *table);
+
+#endif
diff --git a/reftable/reftable-reader.h b/reftable/reftable-reader.h
new file mode 100644
index 0000000000..4a4bc2fdf8
--- /dev/null
+++ b/reftable/reftable-reader.h
@@ -0,0 +1,101 @@
+/*
+  Copyright 2020 Google LLC
+
+  Use of this source code is governed by a BSD-style
+  license that can be found in the LICENSE file or at
+  https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_READER_H
+#define REFTABLE_READER_H
+
+#include "reftable-iterator.h"
+#include "reftable-blocksource.h"
+
+/*
+ * Reading single tables
+ *
+ * The follow routines are for reading single files. For an
+ * application-level interface, skip ahead to struct
+ * reftable_merged_table and struct reftable_stack.
+ */
+
+/* The reader struct is a handle to an open reftable file. */
+struct reftable_reader;
+
+/* Generic table. */
+struct reftable_table;
+
+/* reftable_new_reader opens a reftable for reading. If successful,
+ * returns 0 code and sets pp. The name is used for creating a
+ * stack. Typically, it is the basename of the file. The block source
+ * `src` is owned by the reader, and is closed on calling
+ * reftable_reader_destroy(). On error, the block source `src` is
+ * closed as well.
+ */
+int reftable_new_reader(struct reftable_reader **pp,
+			struct reftable_block_source *src, const char *name);
+
+/* reftable_reader_seek_ref returns an iterator where 'name' would be inserted
+   in the table.  To seek to the start of the table, use name = "".
+
+   example:
+
+   struct reftable_reader *r = NULL;
+   int err = reftable_new_reader(&r, &src, "filename");
+   if (err < 0) { ... }
+   struct reftable_iterator it  = {0};
+   err = reftable_reader_seek_ref(r, &it, "refs/heads/master");
+   if (err < 0) { ... }
+   struct reftable_ref_record ref  = {0};
+   while (1) {
+   err = reftable_iterator_next_ref(&it, &ref);
+   if (err > 0) {
+   break;
+   }
+   if (err < 0) {
+   ..error handling..
+   }
+   ..found..
+   }
+   reftable_iterator_destroy(&it);
+   reftable_ref_record_release(&ref);
+*/
+int reftable_reader_seek_ref(struct reftable_reader *r,
+			     struct reftable_iterator *it, const char *name);
+
+/* returns the hash ID used in this table. */
+uint32_t reftable_reader_hash_id(struct reftable_reader *r);
+
+/* seek to logs for the given name, older than update_index. To seek to the
+   start of the table, use name = "".
+*/
+int reftable_reader_seek_log_at(struct reftable_reader *r,
+				struct reftable_iterator *it, const char *name,
+				uint64_t update_index);
+
+/* seek to newest log entry for given name. */
+int reftable_reader_seek_log(struct reftable_reader *r,
+			     struct reftable_iterator *it, const char *name);
+
+/* closes and deallocates a reader. */
+void reftable_reader_free(struct reftable_reader *);
+
+/* return an iterator for the refs pointing to `oid`. */
+int reftable_reader_refs_for(struct reftable_reader *r,
+			     struct reftable_iterator *it, uint8_t *oid);
+
+/* return the max_update_index for a table */
+uint64_t reftable_reader_max_update_index(struct reftable_reader *r);
+
+/* return the min_update_index for a table */
+uint64_t reftable_reader_min_update_index(struct reftable_reader *r);
+
+/* creates a generic table from a file reader. */
+void reftable_table_from_reader(struct reftable_table *tab,
+				struct reftable_reader *reader);
+
+/* print table onto stdout for debugging. */
+int reftable_reader_print_file(const char *tablename);
+
+#endif
diff --git a/reftable/reftable-record.h b/reftable/reftable-record.h
new file mode 100644
index 0000000000..5370d2288c
--- /dev/null
+++ b/reftable/reftable-record.h
@@ -0,0 +1,114 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_RECORD_H
+#define REFTABLE_RECORD_H
+
+#include <stdint.h>
+
+/*
+ * Basic data types
+ *
+ * Reftables store the state of each ref in struct reftable_ref_record, and they
+ * store a sequence of reflog updates in struct reftable_log_record.
+ */
+
+/* reftable_ref_record holds a ref database entry target_value */
+struct reftable_ref_record {
+	char *refname; /* Name of the ref, malloced. */
+	uint64_t update_index; /* Logical timestamp at which this value is
+				* written */
+
+	enum {
+		/* tombstone to hide deletions from earlier tables */
+		REFTABLE_REF_DELETION = 0x0,
+
+		/* a simple ref */
+		REFTABLE_REF_VAL1 = 0x1,
+		/* a tag, plus its peeled hash */
+		REFTABLE_REF_VAL2 = 0x2,
+
+		/* a symbolic reference */
+		REFTABLE_REF_SYMREF = 0x3,
+#define REFTABLE_NR_REF_VALUETYPES 4
+	} value_type;
+	union {
+		uint8_t *val1; /* malloced hash. */
+		struct {
+			uint8_t *value; /* first value, malloced hash  */
+			uint8_t *target_value; /* second value, malloced hash */
+		} val2;
+		char *symref; /* referent, malloced 0-terminated string */
+	} value;
+};
+
+/* Returns the first hash, or NULL if `rec` is not of type
+ * REFTABLE_REF_VAL1 or REFTABLE_REF_VAL2. */
+uint8_t *reftable_ref_record_val1(struct reftable_ref_record *rec);
+
+/* Returns the second hash, or NULL if `rec` is not of type
+ * REFTABLE_REF_VAL2. */
+uint8_t *reftable_ref_record_val2(struct reftable_ref_record *rec);
+
+/* returns whether 'ref' represents a deletion */
+int reftable_ref_record_is_deletion(const struct reftable_ref_record *ref);
+
+/* prints a reftable_ref_record onto stdout. Useful for debugging. */
+void reftable_ref_record_print(struct reftable_ref_record *ref,
+			       uint32_t hash_id);
+
+/* frees and nulls all pointer values inside `ref`. */
+void reftable_ref_record_release(struct reftable_ref_record *ref);
+
+/* returns whether two reftable_ref_records are the same. Useful for testing. */
+int reftable_ref_record_equal(struct reftable_ref_record *a,
+			      struct reftable_ref_record *b, int hash_size);
+
+/* reftable_log_record holds a reflog entry */
+struct reftable_log_record {
+	char *refname;
+	uint64_t update_index; /* logical timestamp of a transactional update.
+				*/
+
+	enum {
+		/* tombstone to hide deletions from earlier tables */
+		REFTABLE_LOG_DELETION = 0x0,
+
+		/* a simple update */
+		REFTABLE_LOG_UPDATE = 0x1,
+#define REFTABLE_NR_LOG_VALUETYPES 2
+	} value_type;
+
+	union {
+		struct {
+			uint8_t *new_hash;
+			uint8_t *old_hash;
+			char *name;
+			char *email;
+			uint64_t time;
+			int16_t tz_offset;
+			char *message;
+		} update;
+	} value;
+};
+
+/* returns whether 'ref' represents the deletion of a log record. */
+int reftable_log_record_is_deletion(const struct reftable_log_record *log);
+
+/* frees and nulls all pointer values. */
+void reftable_log_record_release(struct reftable_log_record *log);
+
+/* returns whether two records are equal. Useful for testing. */
+int reftable_log_record_equal(struct reftable_log_record *a,
+			      struct reftable_log_record *b, int hash_size);
+
+/* dumps a reftable_log_record on stdout, for debugging/testing. */
+void reftable_log_record_print(struct reftable_log_record *log,
+			       uint32_t hash_id);
+
+#endif
diff --git a/reftable/reftable-stack.h b/reftable/reftable-stack.h
new file mode 100644
index 0000000000..1b602dda58
--- /dev/null
+++ b/reftable/reftable-stack.h
@@ -0,0 +1,128 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_STACK_H
+#define REFTABLE_STACK_H
+
+#include "reftable-writer.h"
+
+/*
+ * The stack presents an interface to a mutable sequence of reftables.
+
+ * A stack can be mutated by pushing a table to the top of the stack.
+
+ * The reftable_stack automatically compacts files on disk to ensure good
+ * amortized performance.
+ *
+ * For windows and other platforms that cannot have open files as rename
+ * destinations, concurrent access from multiple processes needs the rand()
+ * random seed to be randomized.
+ */
+struct reftable_stack;
+
+/* open a new reftable stack. The tables along with the table list will be
+ *  stored in 'dir'. Typically, this should be .git/reftables.
+ */
+int reftable_new_stack(struct reftable_stack **dest, const char *dir,
+		       struct reftable_write_options config);
+
+/* returns the update_index at which a next table should be written. */
+uint64_t reftable_stack_next_update_index(struct reftable_stack *st);
+
+/* holds a transaction to add tables at the top of a stack. */
+struct reftable_addition;
+
+/*
+ * returns a new transaction to add reftables to the given stack. As a side
+ * effect, the ref database is locked.
+ */
+int reftable_stack_new_addition(struct reftable_addition **dest,
+				struct reftable_stack *st);
+
+/* Adds a reftable to transaction. */
+int reftable_addition_add(struct reftable_addition *add,
+			  int (*write_table)(struct reftable_writer *wr,
+					     void *arg),
+			  void *arg);
+
+/* Commits the transaction, releasing the lock. After calling this,
+ * reftable_addition_destroy should still be called.
+ */
+int reftable_addition_commit(struct reftable_addition *add);
+
+/* Release all non-committed data from the transaction, and deallocate the
+ * transaction. Releases the lock if held. */
+void reftable_addition_destroy(struct reftable_addition *add);
+
+/* add a new table to the stack. The write_table function must call
+ * reftable_writer_set_limits, add refs and return an error value. */
+int reftable_stack_add(struct reftable_stack *st,
+		       int (*write_table)(struct reftable_writer *wr,
+					  void *write_arg),
+		       void *write_arg);
+
+/* returns the merged_table for seeking. This table is valid until the
+ * next write or reload, and should not be closed or deleted.
+ */
+struct reftable_merged_table *
+reftable_stack_merged_table(struct reftable_stack *st);
+
+/* frees all resources associated with the stack. */
+void reftable_stack_destroy(struct reftable_stack *st);
+
+/* Reloads the stack if necessary. This is very cheap to run if the stack was up
+ * to date */
+int reftable_stack_reload(struct reftable_stack *st);
+
+/* Policy for expiring reflog entries. */
+struct reftable_log_expiry_config {
+	/* Drop entries older than this timestamp */
+	uint64_t time;
+
+	/* Drop older entries */
+	uint64_t min_update_index;
+};
+
+/* compacts all reftables into a giant table. Expire reflog entries if config is
+ * non-NULL */
+int reftable_stack_compact_all(struct reftable_stack *st,
+			       struct reftable_log_expiry_config *config);
+
+/* heuristically compact unbalanced table stack. */
+int reftable_stack_auto_compact(struct reftable_stack *st);
+
+/* delete stale .ref tables. */
+int reftable_stack_clean(struct reftable_stack *st);
+
+/* convenience function to read a single ref. Returns < 0 for error, 0 for
+ * success, and 1 if ref not found. */
+int reftable_stack_read_ref(struct reftable_stack *st, const char *refname,
+			    struct reftable_ref_record *ref);
+
+/* convenience function to read a single log. Returns < 0 for error, 0 for
+ * success, and 1 if ref not found. */
+int reftable_stack_read_log(struct reftable_stack *st, const char *refname,
+			    struct reftable_log_record *log);
+
+/* statistics on past compactions. */
+struct reftable_compaction_stats {
+	uint64_t bytes; /* total number of bytes written */
+	uint64_t entries_written; /* total number of entries written, including
+				     failures. */
+	int attempts; /* how often we tried to compact */
+	int failures; /* failures happen on concurrent updates */
+};
+
+/* return statistics for compaction up till now. */
+struct reftable_compaction_stats *
+reftable_stack_compaction_stats(struct reftable_stack *st);
+
+/* print the entire stack represented by the directory */
+int reftable_stack_print_directory(const char *stackdir, uint32_t hash_id);
+
+#endif
diff --git a/reftable/reftable-tests.h b/reftable/reftable-tests.h
new file mode 100644
index 0000000000..0019cbcfa4
--- /dev/null
+++ b/reftable/reftable-tests.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_TESTS_H
+#define REFTABLE_TESTS_H
+
+int basics_test_main(int argc, const char **argv);
+int block_test_main(int argc, const char **argv);
+int merged_test_main(int argc, const char **argv);
+int pq_test_main(int argc, const char **argv);
+int record_test_main(int argc, const char **argv);
+int refname_test_main(int argc, const char **argv);
+int readwrite_test_main(int argc, const char **argv);
+int stack_test_main(int argc, const char **argv);
+int tree_test_main(int argc, const char **argv);
+int reftable_dump_main(int argc, char *const *argv);
+
+#endif
diff --git a/reftable/reftable-writer.h b/reftable/reftable-writer.h
new file mode 100644
index 0000000000..a560dc1725
--- /dev/null
+++ b/reftable/reftable-writer.h
@@ -0,0 +1,151 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef REFTABLE_WRITER_H
+#define REFTABLE_WRITER_H
+
+#include "reftable-record.h"
+
+#include <stdint.h>
+#include <unistd.h> /* ssize_t */
+
+/* Writing single reftables */
+
+/* reftable_write_options sets options for writing a single reftable. */
+struct reftable_write_options {
+	/* boolean: do not pad out blocks to block size. */
+	unsigned unpadded : 1;
+
+	/* the blocksize. Should be less than 2^24. */
+	uint32_t block_size;
+
+	/* boolean: do not generate a SHA1 => ref index. */
+	unsigned skip_index_objects : 1;
+
+	/* how often to write complete keys in each block. */
+	int restart_interval;
+
+	/* 4-byte identifier ("sha1", "s256") of the hash.
+	 * Defaults to SHA1 if unset
+	 */
+	uint32_t hash_id;
+
+	/* Default mode for creating files. If unset, use 0666 (+umask) */
+	unsigned int default_permissions;
+
+	/* boolean: do not check ref names for validity or dir/file conflicts.
+	 */
+	unsigned skip_name_check : 1;
+
+	/* boolean: copy log messages exactly. If unset, check that the message
+	 *   is a single line, and add '\n' if missing.
+	 */
+	unsigned exact_log_message : 1;
+};
+
+/* reftable_block_stats holds statistics for a single block type */
+struct reftable_block_stats {
+	/* total number of entries written */
+	int entries;
+	/* total number of key restarts */
+	int restarts;
+	/* total number of blocks */
+	int blocks;
+	/* total number of index blocks */
+	int index_blocks;
+	/* depth of the index */
+	int max_index_level;
+
+	/* offset of the first block for this type */
+	uint64_t offset;
+	/* offset of the top level index block for this type, or 0 if not
+	 * present */
+	uint64_t index_offset;
+};
+
+/* stats holds overall statistics for a single reftable */
+struct reftable_stats {
+	/* total number of blocks written. */
+	int blocks;
+	/* stats for ref data */
+	struct reftable_block_stats ref_stats;
+	/* stats for the SHA1 to ref map. */
+	struct reftable_block_stats obj_stats;
+	/* stats for index blocks */
+	struct reftable_block_stats idx_stats;
+	/* stats for log blocks */
+	struct reftable_block_stats log_stats;
+
+	/* disambiguation length of shortened object IDs. */
+	int object_id_len;
+};
+
+/* reftable_new_writer creates a new writer */
+struct reftable_writer *
+reftable_new_writer(ssize_t (*writer_func)(void *, const void *, size_t),
+		    void *writer_arg, struct reftable_write_options *opts);
+
+/* Set the range of update indices for the records we will add. When writing a
+   table into a stack, the min should be at least
+   reftable_stack_next_update_index(), or REFTABLE_API_ERROR is returned.
+
+   For transactional updates to a stack, typically min==max, and the
+   update_index can be obtained by inspeciting the stack. When converting an
+   existing ref database into a single reftable, this would be a range of
+   update-index timestamps.
+ */
+void reftable_writer_set_limits(struct reftable_writer *w, uint64_t min,
+				uint64_t max);
+
+/*
+  Add a reftable_ref_record. The record should have names that come after
+  already added records.
+
+  The update_index must be within the limits set by
+  reftable_writer_set_limits(), or REFTABLE_API_ERROR is returned. It is an
+  REFTABLE_API_ERROR error to write a ref record after a log record.
+*/
+int reftable_writer_add_ref(struct reftable_writer *w,
+			    struct reftable_ref_record *ref);
+
+/*
+  Convenience function to add multiple reftable_ref_records; the function sorts
+  the records before adding them, reordering the records array passed in.
+*/
+int reftable_writer_add_refs(struct reftable_writer *w,
+			     struct reftable_ref_record *refs, int n);
+
+/*
+  adds reftable_log_records. Log records are keyed by (refname, decreasing
+  update_index). The key for the record added must come after the already added
+  log records.
+*/
+int reftable_writer_add_log(struct reftable_writer *w,
+			    struct reftable_log_record *log);
+
+/*
+  Convenience function to add multiple reftable_log_records; the function sorts
+  the records before adding them, reordering records array passed in.
+*/
+int reftable_writer_add_logs(struct reftable_writer *w,
+			     struct reftable_log_record *logs, int n);
+
+/* reftable_writer_close finalizes the reftable. The writer is retained so
+ * statistics can be inspected. */
+int reftable_writer_close(struct reftable_writer *w);
+
+/* writer_stats returns the statistics on the reftable being written.
+
+   This struct becomes invalid when the writer is freed.
+ */
+const struct reftable_stats *writer_stats(struct reftable_writer *w);
+
+/* reftable_writer_free deallocates memory for the writer */
+void reftable_writer_free(struct reftable_writer *w);
+
+#endif
diff --git a/reftable/reftable.c b/reftable/reftable.c
new file mode 100644
index 0000000000..0e4607a7cd
--- /dev/null
+++ b/reftable/reftable.c
@@ -0,0 +1,115 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "basics.h"
+#include "record.h"
+#include "generic.h"
+#include "reftable-iterator.h"
+#include "reftable-generic.h"
+
+int reftable_table_seek_ref(struct reftable_table *tab,
+			    struct reftable_iterator *it, const char *name)
+{
+	struct reftable_ref_record ref = {
+		.refname = (char *)name,
+	};
+	struct reftable_record rec = { NULL };
+	reftable_record_from_ref(&rec, &ref);
+	return tab->ops->seek_record(tab->table_arg, it, &rec);
+}
+
+int reftable_table_read_ref(struct reftable_table *tab, const char *name,
+			    struct reftable_ref_record *ref)
+{
+	struct reftable_iterator it = { NULL };
+	int err = reftable_table_seek_ref(tab, &it, name);
+	if (err)
+		goto done;
+
+	err = reftable_iterator_next_ref(&it, ref);
+	if (err)
+		goto done;
+
+	if (strcmp(ref->refname, name) ||
+	    reftable_ref_record_is_deletion(ref)) {
+		reftable_ref_record_release(ref);
+		err = 1;
+		goto done;
+	}
+
+done:
+	reftable_iterator_destroy(&it);
+	return err;
+}
+
+uint64_t reftable_table_max_update_index(struct reftable_table *tab)
+{
+	return tab->ops->max_update_index(tab->table_arg);
+}
+
+uint64_t reftable_table_min_update_index(struct reftable_table *tab)
+{
+	return tab->ops->min_update_index(tab->table_arg);
+}
+
+uint32_t reftable_table_hash_id(struct reftable_table *tab)
+{
+	return tab->ops->hash_id(tab->table_arg);
+}
+
+void reftable_iterator_destroy(struct reftable_iterator *it)
+{
+	if (!it->ops) {
+		return;
+	}
+	it->ops->close(it->iter_arg);
+	it->ops = NULL;
+	FREE_AND_NULL(it->iter_arg);
+}
+
+int reftable_iterator_next_ref(struct reftable_iterator *it,
+			       struct reftable_ref_record *ref)
+{
+	struct reftable_record rec = { NULL };
+	reftable_record_from_ref(&rec, ref);
+	return iterator_next(it, &rec);
+}
+
+int reftable_iterator_next_log(struct reftable_iterator *it,
+			       struct reftable_log_record *log)
+{
+	struct reftable_record rec = { NULL };
+	reftable_record_from_log(&rec, log);
+	return iterator_next(it, &rec);
+}
+
+int iterator_next(struct reftable_iterator *it, struct reftable_record *rec)
+{
+	return it->ops->next(it->iter_arg, rec);
+}
+
+static int empty_iterator_next(void *arg, struct reftable_record *rec)
+{
+	return 1;
+}
+
+static void empty_iterator_close(void *arg)
+{
+}
+
+static struct reftable_iterator_vtable empty_vtable = {
+	.next = &empty_iterator_next,
+	.close = &empty_iterator_close,
+};
+
+void iterator_set_empty(struct reftable_iterator *it)
+{
+	assert(!it->ops);
+	it->iter_arg = NULL;
+	it->ops = &empty_vtable;
+}
diff --git a/reftable/stack.c b/reftable/stack.c
new file mode 100644
index 0000000000..56bf5f2d84
--- /dev/null
+++ b/reftable/stack.c
@@ -0,0 +1,1414 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "stack.h"
+
+#include "system.h"
+#include "merged.h"
+#include "reader.h"
+#include "refname.h"
+#include "reftable-error.h"
+#include "reftable-record.h"
+#include "reftable-merged.h"
+#include "writer.h"
+
+static int stack_try_add(struct reftable_stack *st,
+			 int (*write_table)(struct reftable_writer *wr,
+					    void *arg),
+			 void *arg);
+static int stack_write_compact(struct reftable_stack *st,
+			       struct reftable_writer *wr, int first, int last,
+			       struct reftable_log_expiry_config *config);
+static int stack_check_addition(struct reftable_stack *st,
+				const char *new_tab_name);
+static void reftable_addition_close(struct reftable_addition *add);
+static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st,
+					     int reuse_open);
+
+static void stack_filename(struct strbuf *dest, struct reftable_stack *st,
+			   const char *name)
+{
+	strbuf_reset(dest);
+	strbuf_addstr(dest, st->reftable_dir);
+	strbuf_addstr(dest, "/");
+	strbuf_addstr(dest, name);
+}
+
+static ssize_t reftable_fd_write(void *arg, const void *data, size_t sz)
+{
+	int *fdp = (int *)arg;
+	return write(*fdp, data, sz);
+}
+
+int reftable_new_stack(struct reftable_stack **dest, const char *dir,
+		       struct reftable_write_options config)
+{
+	struct reftable_stack *p =
+		reftable_calloc(sizeof(struct reftable_stack));
+	struct strbuf list_file_name = STRBUF_INIT;
+	int err = 0;
+
+	if (config.hash_id == 0) {
+		config.hash_id = GIT_SHA1_FORMAT_ID;
+	}
+
+	*dest = NULL;
+
+	strbuf_reset(&list_file_name);
+	strbuf_addstr(&list_file_name, dir);
+	strbuf_addstr(&list_file_name, "/tables.list");
+
+	p->list_file = strbuf_detach(&list_file_name, NULL);
+	p->reftable_dir = xstrdup(dir);
+	p->config = config;
+
+	err = reftable_stack_reload_maybe_reuse(p, 1);
+	if (err < 0) {
+		reftable_stack_destroy(p);
+	} else {
+		*dest = p;
+	}
+	return err;
+}
+
+static int fd_read_lines(int fd, char ***namesp)
+{
+	off_t size = lseek(fd, 0, SEEK_END);
+	char *buf = NULL;
+	int err = 0;
+	if (size < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+	err = lseek(fd, 0, SEEK_SET);
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	buf = reftable_malloc(size + 1);
+	if (read(fd, buf, size) != size) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+	buf[size] = 0;
+
+	parse_names(buf, size, namesp);
+
+done:
+	reftable_free(buf);
+	return err;
+}
+
+int read_lines(const char *filename, char ***namesp)
+{
+	int fd = open(filename, O_RDONLY);
+	int err = 0;
+	if (fd < 0) {
+		if (errno == ENOENT) {
+			*namesp = reftable_calloc(sizeof(char *));
+			return 0;
+		}
+
+		return REFTABLE_IO_ERROR;
+	}
+	err = fd_read_lines(fd, namesp);
+	close(fd);
+	return err;
+}
+
+struct reftable_merged_table *
+reftable_stack_merged_table(struct reftable_stack *st)
+{
+	return st->merged;
+}
+
+static int has_name(char **names, const char *name)
+{
+	while (*names) {
+		if (!strcmp(*names, name))
+			return 1;
+		names++;
+	}
+	return 0;
+}
+
+/* Close and free the stack */
+void reftable_stack_destroy(struct reftable_stack *st)
+{
+	char **names = NULL;
+	int err = 0;
+	if (st->merged) {
+		reftable_merged_table_free(st->merged);
+		st->merged = NULL;
+	}
+
+	err = read_lines(st->list_file, &names);
+	if (err < 0) {
+		FREE_AND_NULL(names);
+	}
+
+	if (st->readers) {
+		int i = 0;
+		struct strbuf filename = STRBUF_INIT;
+		for (i = 0; i < st->readers_len; i++) {
+			const char *name = reader_name(st->readers[i]);
+			strbuf_reset(&filename);
+			if (names && !has_name(names, name)) {
+				stack_filename(&filename, st, name);
+			}
+			reftable_reader_free(st->readers[i]);
+
+			if (filename.len) {
+				/* On Windows, can only unlink after closing. */
+				unlink(filename.buf);
+			}
+		}
+		strbuf_release(&filename);
+		st->readers_len = 0;
+		FREE_AND_NULL(st->readers);
+	}
+	FREE_AND_NULL(st->list_file);
+	FREE_AND_NULL(st->reftable_dir);
+	reftable_free(st);
+	free_names(names);
+}
+
+static struct reftable_reader **stack_copy_readers(struct reftable_stack *st,
+						   int cur_len)
+{
+	struct reftable_reader **cur =
+		reftable_calloc(sizeof(struct reftable_reader *) * cur_len);
+	int i = 0;
+	for (i = 0; i < cur_len; i++) {
+		cur[i] = st->readers[i];
+	}
+	return cur;
+}
+
+static int reftable_stack_reload_once(struct reftable_stack *st, char **names,
+				      int reuse_open)
+{
+	int cur_len = !st->merged ? 0 : st->merged->stack_len;
+	struct reftable_reader **cur = stack_copy_readers(st, cur_len);
+	int err = 0;
+	int names_len = names_length(names);
+	struct reftable_reader **new_readers =
+		reftable_calloc(sizeof(struct reftable_reader *) * names_len);
+	struct reftable_table *new_tables =
+		reftable_calloc(sizeof(struct reftable_table) * names_len);
+	int new_readers_len = 0;
+	struct reftable_merged_table *new_merged = NULL;
+	int i;
+
+	while (*names) {
+		struct reftable_reader *rd = NULL;
+		char *name = *names++;
+
+		/* this is linear; we assume compaction keeps the number of
+		   tables under control so this is not quadratic. */
+		int j = 0;
+		for (j = 0; reuse_open && j < cur_len; j++) {
+			if (cur[j] && 0 == strcmp(cur[j]->name, name)) {
+				rd = cur[j];
+				cur[j] = NULL;
+				break;
+			}
+		}
+
+		if (!rd) {
+			struct reftable_block_source src = { NULL };
+			struct strbuf table_path = STRBUF_INIT;
+			stack_filename(&table_path, st, name);
+
+			err = reftable_block_source_from_file(&src,
+							      table_path.buf);
+			strbuf_release(&table_path);
+
+			if (err < 0)
+				goto done;
+
+			err = reftable_new_reader(&rd, &src, name);
+			if (err < 0)
+				goto done;
+		}
+
+		new_readers[new_readers_len] = rd;
+		reftable_table_from_reader(&new_tables[new_readers_len], rd);
+		new_readers_len++;
+	}
+
+	/* success! */
+	err = reftable_new_merged_table(&new_merged, new_tables,
+					new_readers_len, st->config.hash_id);
+	if (err < 0)
+		goto done;
+
+	new_tables = NULL;
+	st->readers_len = new_readers_len;
+	if (st->merged) {
+		merged_table_release(st->merged);
+		reftable_merged_table_free(st->merged);
+	}
+	if (st->readers) {
+		reftable_free(st->readers);
+	}
+	st->readers = new_readers;
+	new_readers = NULL;
+	new_readers_len = 0;
+
+	new_merged->suppress_deletions = 1;
+	st->merged = new_merged;
+	for (i = 0; i < cur_len; i++) {
+		if (cur[i]) {
+			const char *name = reader_name(cur[i]);
+			struct strbuf filename = STRBUF_INIT;
+			stack_filename(&filename, st, name);
+
+			reader_close(cur[i]);
+			reftable_reader_free(cur[i]);
+
+			/* On Windows, can only unlink after closing. */
+			unlink(filename.buf);
+
+			strbuf_release(&filename);
+		}
+	}
+
+done:
+	for (i = 0; i < new_readers_len; i++) {
+		reader_close(new_readers[i]);
+		reftable_reader_free(new_readers[i]);
+	}
+	reftable_free(new_readers);
+	reftable_free(new_tables);
+	reftable_free(cur);
+	return err;
+}
+
+/* return negative if a before b. */
+static int tv_cmp(struct timeval *a, struct timeval *b)
+{
+	time_t diff = a->tv_sec - b->tv_sec;
+	int udiff = a->tv_usec - b->tv_usec;
+
+	if (diff != 0)
+		return diff;
+
+	return udiff;
+}
+
+static int reftable_stack_reload_maybe_reuse(struct reftable_stack *st,
+					     int reuse_open)
+{
+	struct timeval deadline = { 0 };
+	int err = gettimeofday(&deadline, NULL);
+	int64_t delay = 0;
+	int tries = 0;
+	if (err < 0)
+		return err;
+
+	deadline.tv_sec += 3;
+	while (1) {
+		char **names = NULL;
+		char **names_after = NULL;
+		struct timeval now = { 0 };
+		int err = gettimeofday(&now, NULL);
+		int err2 = 0;
+		if (err < 0) {
+			return err;
+		}
+
+		/* Only look at deadlines after the first few times. This
+		   simplifies debugging in GDB */
+		tries++;
+		if (tries > 3 && tv_cmp(&now, &deadline) >= 0) {
+			break;
+		}
+
+		err = read_lines(st->list_file, &names);
+		if (err < 0) {
+			free_names(names);
+			return err;
+		}
+		err = reftable_stack_reload_once(st, names, reuse_open);
+		if (err == 0) {
+			free_names(names);
+			break;
+		}
+		if (err != REFTABLE_NOT_EXIST_ERROR) {
+			free_names(names);
+			return err;
+		}
+
+		/* err == REFTABLE_NOT_EXIST_ERROR can be caused by a concurrent
+		   writer. Check if there was one by checking if the name list
+		   changed.
+		*/
+		err2 = read_lines(st->list_file, &names_after);
+		if (err2 < 0) {
+			free_names(names);
+			return err2;
+		}
+
+		if (names_equal(names_after, names)) {
+			free_names(names);
+			free_names(names_after);
+			return err;
+		}
+		free_names(names);
+		free_names(names_after);
+
+		delay = delay + (delay * rand()) / RAND_MAX + 1;
+		sleep_millisec(delay);
+	}
+
+	return 0;
+}
+
+/* -1 = error
+ 0 = up to date
+ 1 = changed. */
+static int stack_uptodate(struct reftable_stack *st)
+{
+	char **names = NULL;
+	int err = read_lines(st->list_file, &names);
+	int i = 0;
+	if (err < 0)
+		return err;
+
+	for (i = 0; i < st->readers_len; i++) {
+		if (!names[i]) {
+			err = 1;
+			goto done;
+		}
+
+		if (strcmp(st->readers[i]->name, names[i])) {
+			err = 1;
+			goto done;
+		}
+	}
+
+	if (names[st->merged->stack_len]) {
+		err = 1;
+		goto done;
+	}
+
+done:
+	free_names(names);
+	return err;
+}
+
+int reftable_stack_reload(struct reftable_stack *st)
+{
+	int err = stack_uptodate(st);
+	if (err > 0)
+		return reftable_stack_reload_maybe_reuse(st, 1);
+	return err;
+}
+
+int reftable_stack_add(struct reftable_stack *st,
+		       int (*write)(struct reftable_writer *wr, void *arg),
+		       void *arg)
+{
+	int err = stack_try_add(st, write, arg);
+	if (err < 0) {
+		if (err == REFTABLE_LOCK_ERROR) {
+			/* Ignore error return, we want to propagate
+			   REFTABLE_LOCK_ERROR.
+			*/
+			reftable_stack_reload(st);
+		}
+		return err;
+	}
+
+	if (!st->disable_auto_compact)
+		return reftable_stack_auto_compact(st);
+
+	return 0;
+}
+
+static void format_name(struct strbuf *dest, uint64_t min, uint64_t max)
+{
+	char buf[100];
+	uint32_t rnd = (uint32_t)rand();
+	snprintf(buf, sizeof(buf), "0x%012" PRIx64 "-0x%012" PRIx64 "-%08x",
+		 min, max, rnd);
+	strbuf_reset(dest);
+	strbuf_addstr(dest, buf);
+}
+
+struct reftable_addition {
+	int lock_file_fd;
+	struct strbuf lock_file_name;
+	struct reftable_stack *stack;
+
+	char **new_tables;
+	int new_tables_len;
+	uint64_t next_update_index;
+};
+
+#define REFTABLE_ADDITION_INIT                \
+	{                                     \
+		.lock_file_name = STRBUF_INIT \
+	}
+
+static int reftable_stack_init_addition(struct reftable_addition *add,
+					struct reftable_stack *st)
+{
+	int err = 0;
+	add->stack = st;
+
+	strbuf_reset(&add->lock_file_name);
+	strbuf_addstr(&add->lock_file_name, st->list_file);
+	strbuf_addstr(&add->lock_file_name, ".lock");
+
+	add->lock_file_fd = open(add->lock_file_name.buf,
+				 O_EXCL | O_CREAT | O_WRONLY, 0666);
+	if (add->lock_file_fd < 0) {
+		if (errno == EEXIST) {
+			err = REFTABLE_LOCK_ERROR;
+		} else {
+			err = REFTABLE_IO_ERROR;
+		}
+		goto done;
+	}
+	if (st->config.default_permissions) {
+		if (chmod(add->lock_file_name.buf, st->config.default_permissions) < 0) {
+			err = REFTABLE_IO_ERROR;
+			goto done;
+		}
+	}
+
+	err = stack_uptodate(st);
+	if (err < 0)
+		goto done;
+
+	if (err > 1) {
+		err = REFTABLE_LOCK_ERROR;
+		goto done;
+	}
+
+	add->next_update_index = reftable_stack_next_update_index(st);
+done:
+	if (err) {
+		reftable_addition_close(add);
+	}
+	return err;
+}
+
+static void reftable_addition_close(struct reftable_addition *add)
+{
+	int i = 0;
+	struct strbuf nm = STRBUF_INIT;
+	for (i = 0; i < add->new_tables_len; i++) {
+		stack_filename(&nm, add->stack, add->new_tables[i]);
+		unlink(nm.buf);
+		reftable_free(add->new_tables[i]);
+		add->new_tables[i] = NULL;
+	}
+	reftable_free(add->new_tables);
+	add->new_tables = NULL;
+	add->new_tables_len = 0;
+
+	if (add->lock_file_fd > 0) {
+		close(add->lock_file_fd);
+		add->lock_file_fd = 0;
+	}
+	if (add->lock_file_name.len > 0) {
+		unlink(add->lock_file_name.buf);
+		strbuf_release(&add->lock_file_name);
+	}
+
+	strbuf_release(&nm);
+}
+
+void reftable_addition_destroy(struct reftable_addition *add)
+{
+	if (!add) {
+		return;
+	}
+	reftable_addition_close(add);
+	reftable_free(add);
+}
+
+int reftable_addition_commit(struct reftable_addition *add)
+{
+	struct strbuf table_list = STRBUF_INIT;
+	int i = 0;
+	int err = 0;
+	if (add->new_tables_len == 0)
+		goto done;
+
+	for (i = 0; i < add->stack->merged->stack_len; i++) {
+		strbuf_addstr(&table_list, add->stack->readers[i]->name);
+		strbuf_addstr(&table_list, "\n");
+	}
+	for (i = 0; i < add->new_tables_len; i++) {
+		strbuf_addstr(&table_list, add->new_tables[i]);
+		strbuf_addstr(&table_list, "\n");
+	}
+
+	err = write(add->lock_file_fd, table_list.buf, table_list.len);
+	strbuf_release(&table_list);
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	err = close(add->lock_file_fd);
+	add->lock_file_fd = 0;
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	err = rename(add->lock_file_name.buf, add->stack->list_file);
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	/* success, no more state to clean up. */
+	strbuf_release(&add->lock_file_name);
+	for (i = 0; i < add->new_tables_len; i++) {
+		reftable_free(add->new_tables[i]);
+	}
+	reftable_free(add->new_tables);
+	add->new_tables = NULL;
+	add->new_tables_len = 0;
+
+	err = reftable_stack_reload(add->stack);
+done:
+	reftable_addition_close(add);
+	return err;
+}
+
+int reftable_stack_new_addition(struct reftable_addition **dest,
+				struct reftable_stack *st)
+{
+	int err = 0;
+	struct reftable_addition empty = REFTABLE_ADDITION_INIT;
+	*dest = reftable_calloc(sizeof(**dest));
+	**dest = empty;
+	err = reftable_stack_init_addition(*dest, st);
+	if (err) {
+		reftable_free(*dest);
+		*dest = NULL;
+	}
+	return err;
+}
+
+static int stack_try_add(struct reftable_stack *st,
+			 int (*write_table)(struct reftable_writer *wr,
+					    void *arg),
+			 void *arg)
+{
+	struct reftable_addition add = REFTABLE_ADDITION_INIT;
+	int err = reftable_stack_init_addition(&add, st);
+	if (err < 0)
+		goto done;
+	if (err > 0) {
+		err = REFTABLE_LOCK_ERROR;
+		goto done;
+	}
+
+	err = reftable_addition_add(&add, write_table, arg);
+	if (err < 0)
+		goto done;
+
+	err = reftable_addition_commit(&add);
+done:
+	reftable_addition_close(&add);
+	return err;
+}
+
+int reftable_addition_add(struct reftable_addition *add,
+			  int (*write_table)(struct reftable_writer *wr,
+					     void *arg),
+			  void *arg)
+{
+	struct strbuf temp_tab_file_name = STRBUF_INIT;
+	struct strbuf tab_file_name = STRBUF_INIT;
+	struct strbuf next_name = STRBUF_INIT;
+	struct reftable_writer *wr = NULL;
+	int err = 0;
+	int tab_fd = 0;
+
+	strbuf_reset(&next_name);
+	format_name(&next_name, add->next_update_index, add->next_update_index);
+
+	stack_filename(&temp_tab_file_name, add->stack, next_name.buf);
+	strbuf_addstr(&temp_tab_file_name, ".temp.XXXXXX");
+
+	tab_fd = mkstemp(temp_tab_file_name.buf);
+	if (tab_fd < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+	if (add->stack->config.default_permissions) {
+		if (chmod(temp_tab_file_name.buf, add->stack->config.default_permissions)) {
+			err = REFTABLE_IO_ERROR;
+			goto done;
+		}
+	}
+	wr = reftable_new_writer(reftable_fd_write, &tab_fd,
+				 &add->stack->config);
+	err = write_table(wr, arg);
+	if (err < 0)
+		goto done;
+
+	err = reftable_writer_close(wr);
+	if (err == REFTABLE_EMPTY_TABLE_ERROR) {
+		err = 0;
+		goto done;
+	}
+	if (err < 0)
+		goto done;
+
+	err = close(tab_fd);
+	tab_fd = 0;
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	err = stack_check_addition(add->stack, temp_tab_file_name.buf);
+	if (err < 0)
+		goto done;
+
+	if (wr->min_update_index < add->next_update_index) {
+		err = REFTABLE_API_ERROR;
+		goto done;
+	}
+
+	format_name(&next_name, wr->min_update_index, wr->max_update_index);
+	strbuf_addstr(&next_name, ".ref");
+
+	stack_filename(&tab_file_name, add->stack, next_name.buf);
+
+	/*
+	  On windows, this relies on rand() picking a unique destination name.
+	  Maybe we should do retry loop as well?
+	 */
+	err = rename(temp_tab_file_name.buf, tab_file_name.buf);
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		goto done;
+	}
+
+	add->new_tables = reftable_realloc(add->new_tables,
+					   sizeof(*add->new_tables) *
+						   (add->new_tables_len + 1));
+	add->new_tables[add->new_tables_len] = strbuf_detach(&next_name, NULL);
+	add->new_tables_len++;
+done:
+	if (tab_fd > 0) {
+		close(tab_fd);
+		tab_fd = 0;
+	}
+	if (temp_tab_file_name.len > 0) {
+		unlink(temp_tab_file_name.buf);
+	}
+
+	strbuf_release(&temp_tab_file_name);
+	strbuf_release(&tab_file_name);
+	strbuf_release(&next_name);
+	reftable_writer_free(wr);
+	return err;
+}
+
+uint64_t reftable_stack_next_update_index(struct reftable_stack *st)
+{
+	int sz = st->merged->stack_len;
+	if (sz > 0)
+		return reftable_reader_max_update_index(st->readers[sz - 1]) +
+		       1;
+	return 1;
+}
+
+static int stack_compact_locked(struct reftable_stack *st, int first, int last,
+				struct strbuf *temp_tab,
+				struct reftable_log_expiry_config *config)
+{
+	struct strbuf next_name = STRBUF_INIT;
+	int tab_fd = -1;
+	struct reftable_writer *wr = NULL;
+	int err = 0;
+
+	format_name(&next_name,
+		    reftable_reader_min_update_index(st->readers[first]),
+		    reftable_reader_max_update_index(st->readers[last]));
+
+	stack_filename(temp_tab, st, next_name.buf);
+	strbuf_addstr(temp_tab, ".temp.XXXXXX");
+
+	tab_fd = mkstemp(temp_tab->buf);
+	wr = reftable_new_writer(reftable_fd_write, &tab_fd, &st->config);
+
+	err = stack_write_compact(st, wr, first, last, config);
+	if (err < 0)
+		goto done;
+	err = reftable_writer_close(wr);
+	if (err < 0)
+		goto done;
+
+	err = close(tab_fd);
+	tab_fd = 0;
+
+done:
+	reftable_writer_free(wr);
+	if (tab_fd > 0) {
+		close(tab_fd);
+		tab_fd = 0;
+	}
+	if (err != 0 && temp_tab->len > 0) {
+		unlink(temp_tab->buf);
+		strbuf_release(temp_tab);
+	}
+	strbuf_release(&next_name);
+	return err;
+}
+
+static int stack_write_compact(struct reftable_stack *st,
+			       struct reftable_writer *wr, int first, int last,
+			       struct reftable_log_expiry_config *config)
+{
+	int subtabs_len = last - first + 1;
+	struct reftable_table *subtabs = reftable_calloc(
+		sizeof(struct reftable_table) * (last - first + 1));
+	struct reftable_merged_table *mt = NULL;
+	int err = 0;
+	struct reftable_iterator it = { NULL };
+	struct reftable_ref_record ref = { NULL };
+	struct reftable_log_record log = { NULL };
+
+	uint64_t entries = 0;
+
+	int i = 0, j = 0;
+	for (i = first, j = 0; i <= last; i++) {
+		struct reftable_reader *t = st->readers[i];
+		reftable_table_from_reader(&subtabs[j++], t);
+		st->stats.bytes += t->size;
+	}
+	reftable_writer_set_limits(wr, st->readers[first]->min_update_index,
+				   st->readers[last]->max_update_index);
+
+	err = reftable_new_merged_table(&mt, subtabs, subtabs_len,
+					st->config.hash_id);
+	if (err < 0) {
+		reftable_free(subtabs);
+		goto done;
+	}
+
+	err = reftable_merged_table_seek_ref(mt, &it, "");
+	if (err < 0)
+		goto done;
+
+	while (1) {
+		err = reftable_iterator_next_ref(&it, &ref);
+		if (err > 0) {
+			err = 0;
+			break;
+		}
+		if (err < 0) {
+			break;
+		}
+
+		if (first == 0 && reftable_ref_record_is_deletion(&ref)) {
+			continue;
+		}
+
+		err = reftable_writer_add_ref(wr, &ref);
+		if (err < 0) {
+			break;
+		}
+		entries++;
+	}
+	reftable_iterator_destroy(&it);
+
+	err = reftable_merged_table_seek_log(mt, &it, "");
+	if (err < 0)
+		goto done;
+
+	while (1) {
+		err = reftable_iterator_next_log(&it, &log);
+		if (err > 0) {
+			err = 0;
+			break;
+		}
+		if (err < 0) {
+			break;
+		}
+		if (first == 0 && reftable_log_record_is_deletion(&log)) {
+			continue;
+		}
+
+		if (config && config->min_update_index > 0 &&
+		    log.update_index < config->min_update_index) {
+			continue;
+		}
+
+		if (config && config->time > 0 &&
+		    log.value.update.time < config->time) {
+			continue;
+		}
+
+		err = reftable_writer_add_log(wr, &log);
+		if (err < 0) {
+			break;
+		}
+		entries++;
+	}
+
+done:
+	reftable_iterator_destroy(&it);
+	if (mt) {
+		merged_table_release(mt);
+		reftable_merged_table_free(mt);
+	}
+	reftable_ref_record_release(&ref);
+	reftable_log_record_release(&log);
+	st->stats.entries_written += entries;
+	return err;
+}
+
+/* <  0: error. 0 == OK, > 0 attempt failed; could retry. */
+static int stack_compact_range(struct reftable_stack *st, int first, int last,
+			       struct reftable_log_expiry_config *expiry)
+{
+	struct strbuf temp_tab_file_name = STRBUF_INIT;
+	struct strbuf new_table_name = STRBUF_INIT;
+	struct strbuf lock_file_name = STRBUF_INIT;
+	struct strbuf ref_list_contents = STRBUF_INIT;
+	struct strbuf new_table_path = STRBUF_INIT;
+	int err = 0;
+	int have_lock = 0;
+	int lock_file_fd = 0;
+	int compact_count = last - first + 1;
+	char **listp = NULL;
+	char **delete_on_success =
+		reftable_calloc(sizeof(char *) * (compact_count + 1));
+	char **subtable_locks =
+		reftable_calloc(sizeof(char *) * (compact_count + 1));
+	int i = 0;
+	int j = 0;
+	int is_empty_table = 0;
+
+	if (first > last || (!expiry && first == last)) {
+		err = 0;
+		goto done;
+	}
+
+	st->stats.attempts++;
+
+	strbuf_reset(&lock_file_name);
+	strbuf_addstr(&lock_file_name, st->list_file);
+	strbuf_addstr(&lock_file_name, ".lock");
+
+	lock_file_fd =
+		open(lock_file_name.buf, O_EXCL | O_CREAT | O_WRONLY, 0666);
+	if (lock_file_fd < 0) {
+		if (errno == EEXIST) {
+			err = 1;
+		} else {
+			err = REFTABLE_IO_ERROR;
+		}
+		goto done;
+	}
+	/* Don't want to write to the lock for now.  */
+	close(lock_file_fd);
+	lock_file_fd = 0;
+
+	have_lock = 1;
+	err = stack_uptodate(st);
+	if (err != 0)
+		goto done;
+
+	for (i = first, j = 0; i <= last; i++) {
+		struct strbuf subtab_file_name = STRBUF_INIT;
+		struct strbuf subtab_lock = STRBUF_INIT;
+		int sublock_file_fd = -1;
+
+		stack_filename(&subtab_file_name, st,
+			       reader_name(st->readers[i]));
+
+		strbuf_reset(&subtab_lock);
+		strbuf_addbuf(&subtab_lock, &subtab_file_name);
+		strbuf_addstr(&subtab_lock, ".lock");
+
+		sublock_file_fd = open(subtab_lock.buf,
+				       O_EXCL | O_CREAT | O_WRONLY, 0666);
+		if (sublock_file_fd >= 0) {
+			close(sublock_file_fd);
+		} else if (sublock_file_fd < 0) {
+			if (errno == EEXIST) {
+				err = 1;
+			} else {
+				err = REFTABLE_IO_ERROR;
+			}
+		}
+
+		subtable_locks[j] = subtab_lock.buf;
+		delete_on_success[j] = subtab_file_name.buf;
+		j++;
+
+		if (err != 0)
+			goto done;
+	}
+
+	err = unlink(lock_file_name.buf);
+	if (err < 0)
+		goto done;
+	have_lock = 0;
+
+	err = stack_compact_locked(st, first, last, &temp_tab_file_name,
+				   expiry);
+	/* Compaction + tombstones can create an empty table out of non-empty
+	 * tables. */
+	is_empty_table = (err == REFTABLE_EMPTY_TABLE_ERROR);
+	if (is_empty_table) {
+		err = 0;
+	}
+	if (err < 0)
+		goto done;
+
+	lock_file_fd =
+		open(lock_file_name.buf, O_EXCL | O_CREAT | O_WRONLY, 0666);
+	if (lock_file_fd < 0) {
+		if (errno == EEXIST) {
+			err = 1;
+		} else {
+			err = REFTABLE_IO_ERROR;
+		}
+		goto done;
+	}
+	have_lock = 1;
+	if (st->config.default_permissions) {
+		if (chmod(lock_file_name.buf, st->config.default_permissions) < 0) {
+			err = REFTABLE_IO_ERROR;
+			goto done;
+		}
+	}
+
+	format_name(&new_table_name, st->readers[first]->min_update_index,
+		    st->readers[last]->max_update_index);
+	strbuf_addstr(&new_table_name, ".ref");
+
+	stack_filename(&new_table_path, st, new_table_name.buf);
+
+	if (!is_empty_table) {
+		/* retry? */
+		err = rename(temp_tab_file_name.buf, new_table_path.buf);
+		if (err < 0) {
+			err = REFTABLE_IO_ERROR;
+			goto done;
+		}
+	}
+
+	for (i = 0; i < first; i++) {
+		strbuf_addstr(&ref_list_contents, st->readers[i]->name);
+		strbuf_addstr(&ref_list_contents, "\n");
+	}
+	if (!is_empty_table) {
+		strbuf_addbuf(&ref_list_contents, &new_table_name);
+		strbuf_addstr(&ref_list_contents, "\n");
+	}
+	for (i = last + 1; i < st->merged->stack_len; i++) {
+		strbuf_addstr(&ref_list_contents, st->readers[i]->name);
+		strbuf_addstr(&ref_list_contents, "\n");
+	}
+
+	err = write(lock_file_fd, ref_list_contents.buf, ref_list_contents.len);
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		unlink(new_table_path.buf);
+		goto done;
+	}
+	err = close(lock_file_fd);
+	lock_file_fd = 0;
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		unlink(new_table_path.buf);
+		goto done;
+	}
+
+	err = rename(lock_file_name.buf, st->list_file);
+	if (err < 0) {
+		err = REFTABLE_IO_ERROR;
+		unlink(new_table_path.buf);
+		goto done;
+	}
+	have_lock = 0;
+
+	/* Reload the stack before deleting. On windows, we can only delete the
+	   files after we closed them.
+	*/
+	err = reftable_stack_reload_maybe_reuse(st, first < last);
+
+	listp = delete_on_success;
+	while (*listp) {
+		if (strcmp(*listp, new_table_path.buf)) {
+			unlink(*listp);
+		}
+		listp++;
+	}
+
+done:
+	free_names(delete_on_success);
+
+	listp = subtable_locks;
+	while (*listp) {
+		unlink(*listp);
+		listp++;
+	}
+	free_names(subtable_locks);
+	if (lock_file_fd > 0) {
+		close(lock_file_fd);
+		lock_file_fd = 0;
+	}
+	if (have_lock) {
+		unlink(lock_file_name.buf);
+	}
+	strbuf_release(&new_table_name);
+	strbuf_release(&new_table_path);
+	strbuf_release(&ref_list_contents);
+	strbuf_release(&temp_tab_file_name);
+	strbuf_release(&lock_file_name);
+	return err;
+}
+
+int reftable_stack_compact_all(struct reftable_stack *st,
+			       struct reftable_log_expiry_config *config)
+{
+	return stack_compact_range(st, 0, st->merged->stack_len - 1, config);
+}
+
+static int stack_compact_range_stats(struct reftable_stack *st, int first,
+				     int last,
+				     struct reftable_log_expiry_config *config)
+{
+	int err = stack_compact_range(st, first, last, config);
+	if (err > 0) {
+		st->stats.failures++;
+	}
+	return err;
+}
+
+static int segment_size(struct segment *s)
+{
+	return s->end - s->start;
+}
+
+int fastlog2(uint64_t sz)
+{
+	int l = 0;
+	if (sz == 0)
+		return 0;
+	for (; sz; sz /= 2) {
+		l++;
+	}
+	return l - 1;
+}
+
+struct segment *sizes_to_segments(int *seglen, uint64_t *sizes, int n)
+{
+	struct segment *segs = reftable_calloc(sizeof(struct segment) * n);
+	int next = 0;
+	struct segment cur = { 0 };
+	int i = 0;
+
+	if (n == 0) {
+		*seglen = 0;
+		return segs;
+	}
+	for (i = 0; i < n; i++) {
+		int log = fastlog2(sizes[i]);
+		if (cur.log != log && cur.bytes > 0) {
+			struct segment fresh = {
+				.start = i,
+			};
+
+			segs[next++] = cur;
+			cur = fresh;
+		}
+
+		cur.log = log;
+		cur.end = i + 1;
+		cur.bytes += sizes[i];
+	}
+	segs[next++] = cur;
+	*seglen = next;
+	return segs;
+}
+
+struct segment suggest_compaction_segment(uint64_t *sizes, int n)
+{
+	int seglen = 0;
+	struct segment *segs = sizes_to_segments(&seglen, sizes, n);
+	struct segment min_seg = {
+		.log = 64,
+	};
+	int i = 0;
+	for (i = 0; i < seglen; i++) {
+		if (segment_size(&segs[i]) == 1) {
+			continue;
+		}
+
+		if (segs[i].log < min_seg.log) {
+			min_seg = segs[i];
+		}
+	}
+
+	while (min_seg.start > 0) {
+		int prev = min_seg.start - 1;
+		if (fastlog2(min_seg.bytes) < fastlog2(sizes[prev])) {
+			break;
+		}
+
+		min_seg.start = prev;
+		min_seg.bytes += sizes[prev];
+	}
+
+	reftable_free(segs);
+	return min_seg;
+}
+
+static uint64_t *stack_table_sizes_for_compaction(struct reftable_stack *st)
+{
+	uint64_t *sizes =
+		reftable_calloc(sizeof(uint64_t) * st->merged->stack_len);
+	int version = (st->config.hash_id == GIT_SHA1_FORMAT_ID) ? 1 : 2;
+	int overhead = header_size(version) - 1;
+	int i = 0;
+	for (i = 0; i < st->merged->stack_len; i++) {
+		sizes[i] = st->readers[i]->size - overhead;
+	}
+	return sizes;
+}
+
+int reftable_stack_auto_compact(struct reftable_stack *st)
+{
+	uint64_t *sizes = stack_table_sizes_for_compaction(st);
+	struct segment seg =
+		suggest_compaction_segment(sizes, st->merged->stack_len);
+	reftable_free(sizes);
+	if (segment_size(&seg) > 0)
+		return stack_compact_range_stats(st, seg.start, seg.end - 1,
+						 NULL);
+
+	return 0;
+}
+
+struct reftable_compaction_stats *
+reftable_stack_compaction_stats(struct reftable_stack *st)
+{
+	return &st->stats;
+}
+
+int reftable_stack_read_ref(struct reftable_stack *st, const char *refname,
+			    struct reftable_ref_record *ref)
+{
+	struct reftable_table tab = { NULL };
+	reftable_table_from_merged_table(&tab, reftable_stack_merged_table(st));
+	return reftable_table_read_ref(&tab, refname, ref);
+}
+
+int reftable_stack_read_log(struct reftable_stack *st, const char *refname,
+			    struct reftable_log_record *log)
+{
+	struct reftable_iterator it = { NULL };
+	struct reftable_merged_table *mt = reftable_stack_merged_table(st);
+	int err = reftable_merged_table_seek_log(mt, &it, refname);
+	if (err)
+		goto done;
+
+	err = reftable_iterator_next_log(&it, log);
+	if (err)
+		goto done;
+
+	if (strcmp(log->refname, refname) ||
+	    reftable_log_record_is_deletion(log)) {
+		err = 1;
+		goto done;
+	}
+
+done:
+	if (err) {
+		reftable_log_record_release(log);
+	}
+	reftable_iterator_destroy(&it);
+	return err;
+}
+
+static int stack_check_addition(struct reftable_stack *st,
+				const char *new_tab_name)
+{
+	int err = 0;
+	struct reftable_block_source src = { NULL };
+	struct reftable_reader *rd = NULL;
+	struct reftable_table tab = { NULL };
+	struct reftable_ref_record *refs = NULL;
+	struct reftable_iterator it = { NULL };
+	int cap = 0;
+	int len = 0;
+	int i = 0;
+
+	if (st->config.skip_name_check)
+		return 0;
+
+	err = reftable_block_source_from_file(&src, new_tab_name);
+	if (err < 0)
+		goto done;
+
+	err = reftable_new_reader(&rd, &src, new_tab_name);
+	if (err < 0)
+		goto done;
+
+	err = reftable_reader_seek_ref(rd, &it, "");
+	if (err > 0) {
+		err = 0;
+		goto done;
+	}
+	if (err < 0)
+		goto done;
+
+	while (1) {
+		struct reftable_ref_record ref = { NULL };
+		err = reftable_iterator_next_ref(&it, &ref);
+		if (err > 0) {
+			break;
+		}
+		if (err < 0)
+			goto done;
+
+		if (len >= cap) {
+			cap = 2 * cap + 1;
+			refs = reftable_realloc(refs, cap * sizeof(refs[0]));
+		}
+
+		refs[len++] = ref;
+	}
+
+	reftable_table_from_merged_table(&tab, reftable_stack_merged_table(st));
+
+	err = validate_ref_record_addition(tab, refs, len);
+
+done:
+	for (i = 0; i < len; i++) {
+		reftable_ref_record_release(&refs[i]);
+	}
+
+	free(refs);
+	reftable_iterator_destroy(&it);
+	reftable_reader_free(rd);
+	return err;
+}
+
+static int is_table_name(const char *s)
+{
+	const char *dot = strrchr(s, '.');
+	return dot && !strcmp(dot, ".ref");
+}
+
+static void remove_maybe_stale_table(struct reftable_stack *st, uint64_t max,
+				     const char *name)
+{
+	int err = 0;
+	uint64_t update_idx = 0;
+	struct reftable_block_source src = { NULL };
+	struct reftable_reader *rd = NULL;
+	struct strbuf table_path = STRBUF_INIT;
+	stack_filename(&table_path, st, name);
+
+	err = reftable_block_source_from_file(&src, table_path.buf);
+	if (err < 0)
+		goto done;
+
+	err = reftable_new_reader(&rd, &src, name);
+	if (err < 0)
+		goto done;
+
+	update_idx = reftable_reader_max_update_index(rd);
+	reftable_reader_free(rd);
+
+	if (update_idx <= max) {
+		unlink(table_path.buf);
+	}
+done:
+	strbuf_release(&table_path);
+}
+
+static int reftable_stack_clean_locked(struct reftable_stack *st)
+{
+	uint64_t max = reftable_merged_table_max_update_index(
+		reftable_stack_merged_table(st));
+	DIR *dir = opendir(st->reftable_dir);
+	struct dirent *d = NULL;
+	if (!dir) {
+		return REFTABLE_IO_ERROR;
+	}
+
+	while ((d = readdir(dir))) {
+		int i = 0;
+		int found = 0;
+		if (!is_table_name(d->d_name))
+			continue;
+
+		for (i = 0; !found && i < st->readers_len; i++) {
+			found = !strcmp(reader_name(st->readers[i]), d->d_name);
+		}
+		if (found)
+			continue;
+
+		remove_maybe_stale_table(st, max, d->d_name);
+	}
+
+	closedir(dir);
+	return 0;
+}
+
+int reftable_stack_clean(struct reftable_stack *st)
+{
+	struct reftable_addition *add = NULL;
+	int err = reftable_stack_new_addition(&add, st);
+	if (err < 0) {
+		goto done;
+	}
+
+	err = reftable_stack_reload(st);
+	if (err < 0) {
+		goto done;
+	}
+
+	err = reftable_stack_clean_locked(st);
+
+done:
+	reftable_addition_destroy(add);
+	return err;
+}
+
+int reftable_stack_print_directory(const char *stackdir, uint32_t hash_id)
+{
+	struct reftable_stack *stack = NULL;
+	struct reftable_write_options cfg = { .hash_id = hash_id };
+	struct reftable_merged_table *merged = NULL;
+	struct reftable_table table = { NULL };
+
+	int err = reftable_new_stack(&stack, stackdir, cfg);
+	if (err < 0)
+		goto done;
+
+	merged = reftable_stack_merged_table(stack);
+	reftable_table_from_merged_table(&table, merged);
+	err = reftable_table_print(&table);
+done:
+	if (stack)
+		reftable_stack_destroy(stack);
+	return err;
+}
diff --git a/reftable/stack.h b/reftable/stack.h
new file mode 100644
index 0000000000..f57005846e
--- /dev/null
+++ b/reftable/stack.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef STACK_H
+#define STACK_H
+
+#include "system.h"
+#include "reftable-writer.h"
+#include "reftable-stack.h"
+
+struct reftable_stack {
+	char *list_file;
+	char *reftable_dir;
+	int disable_auto_compact;
+
+	struct reftable_write_options config;
+
+	struct reftable_reader **readers;
+	size_t readers_len;
+	struct reftable_merged_table *merged;
+	struct reftable_compaction_stats stats;
+};
+
+int read_lines(const char *filename, char ***lines);
+
+struct segment {
+	int start, end;
+	int log;
+	uint64_t bytes;
+};
+
+int fastlog2(uint64_t sz);
+struct segment *sizes_to_segments(int *seglen, uint64_t *sizes, int n);
+struct segment suggest_compaction_segment(uint64_t *sizes, int n);
+
+#endif
diff --git a/reftable/stack_test.c b/reftable/stack_test.c
new file mode 100644
index 0000000000..f4c743db80
--- /dev/null
+++ b/reftable/stack_test.c
@@ -0,0 +1,978 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "stack.h"
+
+#include "system.h"
+
+#include "reftable-reader.h"
+#include "merged.h"
+#include "basics.h"
+#include "constants.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+#include "reader.h"
+
+#include <sys/types.h>
+#include <dirent.h>
+
+static void clear_dir(const char *dirname)
+{
+	struct strbuf path = STRBUF_INIT;
+	strbuf_addstr(&path, dirname);
+	remove_dir_recursively(&path, 0);
+	strbuf_release(&path);
+}
+
+static int count_dir_entries(const char *dirname)
+{
+	DIR *dir = opendir(dirname);
+	int len = 0;
+	struct dirent *d;
+	if (dir == NULL)
+		return 0;
+
+	while ((d = readdir(dir))) {
+		if (!strcmp(d->d_name, "..") || !strcmp(d->d_name, "."))
+			continue;
+		len++;
+	}
+	closedir(dir);
+	return len;
+}
+
+/*
+ * Work linenumber into the tempdir, so we can see which tests forget to
+ * cleanup.
+ */
+static char *get_tmp_template(int linenumber)
+{
+	const char *tmp = getenv("TMPDIR");
+	static char template[1024];
+	snprintf(template, sizeof(template) - 1, "%s/stack_test-%d.XXXXXX",
+		 tmp ? tmp : "/tmp", linenumber);
+	return template;
+}
+
+static char *get_tmp_dir(int linenumber)
+{
+	char *dir = get_tmp_template(linenumber);
+	EXPECT(mkdtemp(dir));
+	return dir;
+}
+
+static void test_read_file(void)
+{
+	char *fn = get_tmp_template(__LINE__);
+	int fd = mkstemp(fn);
+	char out[1024] = "line1\n\nline2\nline3";
+	int n, err;
+	char **names = NULL;
+	char *want[] = { "line1", "line2", "line3" };
+	int i = 0;
+
+	EXPECT(fd > 0);
+	n = write(fd, out, strlen(out));
+	EXPECT(n == strlen(out));
+	err = close(fd);
+	EXPECT(err >= 0);
+
+	err = read_lines(fn, &names);
+	EXPECT_ERR(err);
+
+	for (i = 0; names[i]; i++) {
+		EXPECT(0 == strcmp(want[i], names[i]));
+	}
+	free_names(names);
+	remove(fn);
+}
+
+static void test_parse_names(void)
+{
+	char buf[] = "line\n";
+	char **names = NULL;
+	parse_names(buf, strlen(buf), &names);
+
+	EXPECT(NULL != names[0]);
+	EXPECT(0 == strcmp(names[0], "line"));
+	EXPECT(NULL == names[1]);
+	free_names(names);
+}
+
+static void test_names_equal(void)
+{
+	char *a[] = { "a", "b", "c", NULL };
+	char *b[] = { "a", "b", "d", NULL };
+	char *c[] = { "a", "b", NULL };
+
+	EXPECT(names_equal(a, a));
+	EXPECT(!names_equal(a, b));
+	EXPECT(!names_equal(a, c));
+}
+
+static int write_test_ref(struct reftable_writer *wr, void *arg)
+{
+	struct reftable_ref_record *ref = arg;
+	reftable_writer_set_limits(wr, ref->update_index, ref->update_index);
+	return reftable_writer_add_ref(wr, ref);
+}
+
+struct write_log_arg {
+	struct reftable_log_record *log;
+	uint64_t update_index;
+};
+
+static int write_test_log(struct reftable_writer *wr, void *arg)
+{
+	struct write_log_arg *wla = arg;
+
+	reftable_writer_set_limits(wr, wla->update_index, wla->update_index);
+	return reftable_writer_add_log(wr, wla->log);
+}
+
+static void test_reftable_stack_add_one(void)
+{
+	char *dir = get_tmp_dir(__LINE__);
+	struct strbuf scratch = STRBUF_INIT;
+	int mask = umask(002);
+	struct reftable_write_options cfg = {
+		.default_permissions = 0660,
+	};
+	struct reftable_stack *st = NULL;
+	int err;
+	struct reftable_ref_record ref = {
+		.refname = "HEAD",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+	struct reftable_ref_record dest = { NULL };
+	struct stat stat_result = { 0 };
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st, &write_test_ref, &ref);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_read_ref(st, ref.refname, &dest);
+	EXPECT_ERR(err);
+	EXPECT(0 == strcmp("master", dest.value.symref));
+	EXPECT(st->readers_len > 0);
+
+	printf("testing print functionality:\n");
+	err = reftable_stack_print_directory(dir, GIT_SHA1_FORMAT_ID);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_print_directory(dir, GIT_SHA256_FORMAT_ID);
+	EXPECT(err == REFTABLE_FORMAT_ERROR);
+
+#ifndef GIT_WINDOWS_NATIVE
+	strbuf_addstr(&scratch, dir);
+	strbuf_addstr(&scratch, "/tables.list");
+	err = stat(scratch.buf, &stat_result);
+	EXPECT(!err);
+	EXPECT((stat_result.st_mode & 0777) == cfg.default_permissions);
+
+	strbuf_reset(&scratch);
+	strbuf_addstr(&scratch, dir);
+	strbuf_addstr(&scratch, "/");
+	/* do not try at home; not an external API for reftable. */
+	strbuf_addstr(&scratch, st->readers[0]->name);
+	err = stat(scratch.buf, &stat_result);
+	EXPECT(!err);
+	EXPECT((stat_result.st_mode & 0777) == cfg.default_permissions);
+#else
+	(void) stat_result;
+#endif
+
+	reftable_ref_record_release(&dest);
+	reftable_stack_destroy(st);
+	strbuf_release(&scratch);
+	clear_dir(dir);
+	umask(mask);
+}
+
+static void test_reftable_stack_uptodate(void)
+{
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st1 = NULL;
+	struct reftable_stack *st2 = NULL;
+	char *dir = get_tmp_dir(__LINE__);
+
+	int err;
+	struct reftable_ref_record ref1 = {
+		.refname = "HEAD",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+	struct reftable_ref_record ref2 = {
+		.refname = "branch2",
+		.update_index = 2,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+
+
+	/* simulate multi-process access to the same stack
+	   by creating two stacks for the same directory.
+	 */
+	err = reftable_new_stack(&st1, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_new_stack(&st2, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st1, &write_test_ref, &ref1);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st2, &write_test_ref, &ref2);
+	EXPECT(err == REFTABLE_LOCK_ERROR);
+
+	err = reftable_stack_reload(st2);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st2, &write_test_ref, &ref2);
+	EXPECT_ERR(err);
+	reftable_stack_destroy(st1);
+	reftable_stack_destroy(st2);
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_transaction_api(void)
+{
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err;
+	struct reftable_addition *add = NULL;
+
+	struct reftable_ref_record ref = {
+		.refname = "HEAD",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+	struct reftable_ref_record dest = { NULL };
+
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	reftable_addition_destroy(add);
+
+	err = reftable_stack_new_addition(&add, st);
+	EXPECT_ERR(err);
+
+	err = reftable_addition_add(add, &write_test_ref, &ref);
+	EXPECT_ERR(err);
+
+	err = reftable_addition_commit(add);
+	EXPECT_ERR(err);
+
+	reftable_addition_destroy(add);
+
+	err = reftable_stack_read_ref(st, ref.refname, &dest);
+	EXPECT_ERR(err);
+	EXPECT(REFTABLE_REF_SYMREF == dest.value_type);
+	EXPECT(0 == strcmp("master", dest.value.symref));
+
+	reftable_ref_record_release(&dest);
+	reftable_stack_destroy(st);
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_validate_refname(void)
+{
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err;
+	char *dir = get_tmp_dir(__LINE__);
+
+	int i;
+	struct reftable_ref_record ref = {
+		.refname = "a/b",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+	char *additions[] = { "a", "a/b/c" };
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st, &write_test_ref, &ref);
+	EXPECT_ERR(err);
+
+	for (i = 0; i < ARRAY_SIZE(additions); i++) {
+		struct reftable_ref_record ref = {
+			.refname = additions[i],
+			.update_index = 1,
+			.value_type = REFTABLE_REF_SYMREF,
+			.value.symref = "master",
+		};
+
+		err = reftable_stack_add(st, &write_test_ref, &ref);
+		EXPECT(err == REFTABLE_NAME_CONFLICT);
+	}
+
+	reftable_stack_destroy(st);
+	clear_dir(dir);
+}
+
+static int write_error(struct reftable_writer *wr, void *arg)
+{
+	return *((int *)arg);
+}
+
+static void test_reftable_stack_update_index_check(void)
+{
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err;
+	struct reftable_ref_record ref1 = {
+		.refname = "name1",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+	struct reftable_ref_record ref2 = {
+		.refname = "name2",
+		.update_index = 1,
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "master",
+	};
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st, &write_test_ref, &ref1);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st, &write_test_ref, &ref2);
+	EXPECT(err == REFTABLE_API_ERROR);
+	reftable_stack_destroy(st);
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_lock_failure(void)
+{
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err, i;
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+	for (i = -1; i != REFTABLE_EMPTY_TABLE_ERROR; i--) {
+		err = reftable_stack_add(st, &write_error, &i);
+		EXPECT(err == i);
+	}
+
+	reftable_stack_destroy(st);
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_add(void)
+{
+	int i = 0;
+	int err = 0;
+	struct reftable_write_options cfg = {
+		.exact_log_message = 1,
+	};
+	struct reftable_stack *st = NULL;
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_ref_record refs[2] = { { NULL } };
+	struct reftable_log_record logs[2] = { { NULL } };
+	int N = ARRAY_SIZE(refs);
+
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+	st->disable_auto_compact = 1;
+
+	for (i = 0; i < N; i++) {
+		char buf[256];
+		snprintf(buf, sizeof(buf), "branch%02d", i);
+		refs[i].refname = xstrdup(buf);
+		refs[i].update_index = i + 1;
+		refs[i].value_type = REFTABLE_REF_VAL1;
+		refs[i].value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+		set_test_hash(refs[i].value.val1, i);
+
+		logs[i].refname = xstrdup(buf);
+		logs[i].update_index = N + i + 1;
+		logs[i].value_type = REFTABLE_LOG_UPDATE;
+
+		logs[i].value.update.new_hash = reftable_malloc(GIT_SHA1_RAWSZ);
+		logs[i].value.update.email = xstrdup("identity@invalid");
+		set_test_hash(logs[i].value.update.new_hash, i);
+	}
+
+	for (i = 0; i < N; i++) {
+		int err = reftable_stack_add(st, &write_test_ref, &refs[i]);
+		EXPECT_ERR(err);
+	}
+
+	for (i = 0; i < N; i++) {
+		struct write_log_arg arg = {
+			.log = &logs[i],
+			.update_index = reftable_stack_next_update_index(st),
+		};
+		int err = reftable_stack_add(st, &write_test_log, &arg);
+		EXPECT_ERR(err);
+	}
+
+	err = reftable_stack_compact_all(st, NULL);
+	EXPECT_ERR(err);
+
+	for (i = 0; i < N; i++) {
+		struct reftable_ref_record dest = { NULL };
+
+		int err = reftable_stack_read_ref(st, refs[i].refname, &dest);
+		EXPECT_ERR(err);
+		EXPECT(reftable_ref_record_equal(&dest, refs + i,
+						 GIT_SHA1_RAWSZ));
+		reftable_ref_record_release(&dest);
+	}
+
+	for (i = 0; i < N; i++) {
+		struct reftable_log_record dest = { NULL };
+		int err = reftable_stack_read_log(st, refs[i].refname, &dest);
+		EXPECT_ERR(err);
+		EXPECT(reftable_log_record_equal(&dest, logs + i,
+						 GIT_SHA1_RAWSZ));
+		reftable_log_record_release(&dest);
+	}
+
+	/* cleanup */
+	reftable_stack_destroy(st);
+	for (i = 0; i < N; i++) {
+		reftable_ref_record_release(&refs[i]);
+		reftable_log_record_release(&logs[i]);
+	}
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_log_normalize(void)
+{
+	int err = 0;
+	struct reftable_write_options cfg = {
+		0,
+	};
+	struct reftable_stack *st = NULL;
+	char *dir = get_tmp_dir(__LINE__);
+
+	uint8_t h1[GIT_SHA1_RAWSZ] = { 0x01 }, h2[GIT_SHA1_RAWSZ] = { 0x02 };
+
+	struct reftable_log_record input = { .refname = "branch",
+					     .update_index = 1,
+					     .value_type = REFTABLE_LOG_UPDATE,
+					     .value = { .update = {
+								.new_hash = h1,
+								.old_hash = h2,
+							} } };
+	struct reftable_log_record dest = {
+		.update_index = 0,
+	};
+	struct write_log_arg arg = {
+		.log = &input,
+		.update_index = 1,
+	};
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	input.value.update.message = "one\ntwo";
+	err = reftable_stack_add(st, &write_test_log, &arg);
+	EXPECT(err == REFTABLE_API_ERROR);
+
+	input.value.update.message = "one";
+	err = reftable_stack_add(st, &write_test_log, &arg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_read_log(st, input.refname, &dest);
+	EXPECT_ERR(err);
+	EXPECT(0 == strcmp(dest.value.update.message, "one\n"));
+
+	input.value.update.message = "two\n";
+	arg.update_index = 2;
+	err = reftable_stack_add(st, &write_test_log, &arg);
+	EXPECT_ERR(err);
+	err = reftable_stack_read_log(st, input.refname, &dest);
+	EXPECT_ERR(err);
+	EXPECT(0 == strcmp(dest.value.update.message, "two\n"));
+
+	/* cleanup */
+	reftable_stack_destroy(st);
+	reftable_log_record_release(&dest);
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_tombstone(void)
+{
+	int i = 0;
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err;
+	struct reftable_ref_record refs[2] = { { NULL } };
+	struct reftable_log_record logs[2] = { { NULL } };
+	int N = ARRAY_SIZE(refs);
+	struct reftable_ref_record dest = { NULL };
+	struct reftable_log_record log_dest = { NULL };
+
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	/* even entries add the refs, odd entries delete them. */
+	for (i = 0; i < N; i++) {
+		const char *buf = "branch";
+		refs[i].refname = xstrdup(buf);
+		refs[i].update_index = i + 1;
+		if (i % 2 == 0) {
+			refs[i].value_type = REFTABLE_REF_VAL1;
+			refs[i].value.val1 = reftable_malloc(GIT_SHA1_RAWSZ);
+			set_test_hash(refs[i].value.val1, i);
+		}
+
+		logs[i].refname = xstrdup(buf);
+		/* update_index is part of the key. */
+		logs[i].update_index = 42;
+		if (i % 2 == 0) {
+			logs[i].value_type = REFTABLE_LOG_UPDATE;
+			logs[i].value.update.new_hash =
+				reftable_malloc(GIT_SHA1_RAWSZ);
+			set_test_hash(logs[i].value.update.new_hash, i);
+			logs[i].value.update.email =
+				xstrdup("identity@invalid");
+		}
+	}
+	for (i = 0; i < N; i++) {
+		int err = reftable_stack_add(st, &write_test_ref, &refs[i]);
+		EXPECT_ERR(err);
+	}
+
+	for (i = 0; i < N; i++) {
+		struct write_log_arg arg = {
+			.log = &logs[i],
+			.update_index = reftable_stack_next_update_index(st),
+		};
+		int err = reftable_stack_add(st, &write_test_log, &arg);
+		EXPECT_ERR(err);
+	}
+
+	err = reftable_stack_read_ref(st, "branch", &dest);
+	EXPECT(err == 1);
+	reftable_ref_record_release(&dest);
+
+	err = reftable_stack_read_log(st, "branch", &log_dest);
+	EXPECT(err == 1);
+	reftable_log_record_release(&log_dest);
+
+	err = reftable_stack_compact_all(st, NULL);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_read_ref(st, "branch", &dest);
+	EXPECT(err == 1);
+
+	err = reftable_stack_read_log(st, "branch", &log_dest);
+	EXPECT(err == 1);
+	reftable_ref_record_release(&dest);
+	reftable_log_record_release(&log_dest);
+
+	/* cleanup */
+	reftable_stack_destroy(st);
+	for (i = 0; i < N; i++) {
+		reftable_ref_record_release(&refs[i]);
+		reftable_log_record_release(&logs[i]);
+	}
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_hash_id(void)
+{
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err;
+
+	struct reftable_ref_record ref = {
+		.refname = "master",
+		.value_type = REFTABLE_REF_SYMREF,
+		.value.symref = "target",
+		.update_index = 1,
+	};
+	struct reftable_write_options cfg32 = { .hash_id = GIT_SHA256_FORMAT_ID };
+	struct reftable_stack *st32 = NULL;
+	struct reftable_write_options cfg_default = { 0 };
+	struct reftable_stack *st_default = NULL;
+	struct reftable_ref_record dest = { NULL };
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st, &write_test_ref, &ref);
+	EXPECT_ERR(err);
+
+	/* can't read it with the wrong hash ID. */
+	err = reftable_new_stack(&st32, dir, cfg32);
+	EXPECT(err == REFTABLE_FORMAT_ERROR);
+
+	/* check that we can read it back with default config too. */
+	err = reftable_new_stack(&st_default, dir, cfg_default);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_read_ref(st_default, "master", &dest);
+	EXPECT_ERR(err);
+
+	EXPECT(reftable_ref_record_equal(&ref, &dest, GIT_SHA1_RAWSZ));
+	reftable_ref_record_release(&dest);
+	reftable_stack_destroy(st);
+	reftable_stack_destroy(st_default);
+	clear_dir(dir);
+}
+
+static void test_log2(void)
+{
+	EXPECT(1 == fastlog2(3));
+	EXPECT(2 == fastlog2(4));
+	EXPECT(2 == fastlog2(5));
+}
+
+static void test_sizes_to_segments(void)
+{
+	uint64_t sizes[] = { 2, 3, 4, 5, 7, 9 };
+	/* .................0  1  2  3  4  5 */
+
+	int seglen = 0;
+	struct segment *segs =
+		sizes_to_segments(&seglen, sizes, ARRAY_SIZE(sizes));
+	EXPECT(segs[2].log == 3);
+	EXPECT(segs[2].start == 5);
+	EXPECT(segs[2].end == 6);
+
+	EXPECT(segs[1].log == 2);
+	EXPECT(segs[1].start == 2);
+	EXPECT(segs[1].end == 5);
+	reftable_free(segs);
+}
+
+static void test_sizes_to_segments_empty(void)
+{
+	int seglen = 0;
+	struct segment *segs = sizes_to_segments(&seglen, NULL, 0);
+	EXPECT(seglen == 0);
+	reftable_free(segs);
+}
+
+static void test_sizes_to_segments_all_equal(void)
+{
+	uint64_t sizes[] = { 5, 5 };
+
+	int seglen = 0;
+	struct segment *segs =
+		sizes_to_segments(&seglen, sizes, ARRAY_SIZE(sizes));
+	EXPECT(seglen == 1);
+	EXPECT(segs[0].start == 0);
+	EXPECT(segs[0].end == 2);
+	reftable_free(segs);
+}
+
+static void test_suggest_compaction_segment(void)
+{
+	uint64_t sizes[] = { 128, 64, 17, 16, 9, 9, 9, 16, 16 };
+	/* .................0    1    2  3   4  5  6 */
+	struct segment min =
+		suggest_compaction_segment(sizes, ARRAY_SIZE(sizes));
+	EXPECT(min.start == 2);
+	EXPECT(min.end == 7);
+}
+
+static void test_suggest_compaction_segment_nothing(void)
+{
+	uint64_t sizes[] = { 64, 32, 16, 8, 4, 2 };
+	struct segment result =
+		suggest_compaction_segment(sizes, ARRAY_SIZE(sizes));
+	EXPECT(result.start == result.end);
+}
+
+static void test_reflog_expire(void)
+{
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	struct reftable_log_record logs[20] = { { NULL } };
+	int N = ARRAY_SIZE(logs) - 1;
+	int i = 0;
+	int err;
+	struct reftable_log_expiry_config expiry = {
+		.time = 10,
+	};
+	struct reftable_log_record log = { NULL };
+
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	for (i = 1; i <= N; i++) {
+		char buf[256];
+		snprintf(buf, sizeof(buf), "branch%02d", i);
+
+		logs[i].refname = xstrdup(buf);
+		logs[i].update_index = i;
+		logs[i].value_type = REFTABLE_LOG_UPDATE;
+		logs[i].value.update.time = i;
+		logs[i].value.update.new_hash = reftable_malloc(GIT_SHA1_RAWSZ);
+		logs[i].value.update.email = xstrdup("identity@invalid");
+		set_test_hash(logs[i].value.update.new_hash, i);
+	}
+
+	for (i = 1; i <= N; i++) {
+		struct write_log_arg arg = {
+			.log = &logs[i],
+			.update_index = reftable_stack_next_update_index(st),
+		};
+		int err = reftable_stack_add(st, &write_test_log, &arg);
+		EXPECT_ERR(err);
+	}
+
+	err = reftable_stack_compact_all(st, NULL);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_compact_all(st, &expiry);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_read_log(st, logs[9].refname, &log);
+	EXPECT(err == 1);
+
+	err = reftable_stack_read_log(st, logs[11].refname, &log);
+	EXPECT_ERR(err);
+
+	expiry.min_update_index = 15;
+	err = reftable_stack_compact_all(st, &expiry);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_read_log(st, logs[14].refname, &log);
+	EXPECT(err == 1);
+
+	err = reftable_stack_read_log(st, logs[16].refname, &log);
+	EXPECT_ERR(err);
+
+	/* cleanup */
+	reftable_stack_destroy(st);
+	for (i = 0; i <= N; i++) {
+		reftable_log_record_release(&logs[i]);
+	}
+	clear_dir(dir);
+	reftable_log_record_release(&log);
+}
+
+static int write_nothing(struct reftable_writer *wr, void *arg)
+{
+	reftable_writer_set_limits(wr, 1, 1);
+	return 0;
+}
+
+static void test_empty_add(void)
+{
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	int err;
+	char *dir = get_tmp_dir(__LINE__);
+
+	struct reftable_stack *st2 = NULL;
+
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_add(st, &write_nothing, NULL);
+	EXPECT_ERR(err);
+
+	err = reftable_new_stack(&st2, dir, cfg);
+	EXPECT_ERR(err);
+	clear_dir(dir);
+	reftable_stack_destroy(st);
+	reftable_stack_destroy(st2);
+}
+
+static void test_reftable_stack_auto_compaction(void)
+{
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st = NULL;
+	char *dir = get_tmp_dir(__LINE__);
+
+	int err, i;
+	int N = 100;
+
+	err = reftable_new_stack(&st, dir, cfg);
+	EXPECT_ERR(err);
+
+	st->disable_auto_compact = 1; /* call manually below for coverage. */
+	for (i = 0; i < N; i++) {
+		char name[100];
+		struct reftable_ref_record ref = {
+			.refname = name,
+			.update_index = reftable_stack_next_update_index(st),
+			.value_type = REFTABLE_REF_SYMREF,
+			.value.symref = "master",
+		};
+		snprintf(name, sizeof(name), "branch%04d", i);
+
+		err = reftable_stack_add(st, &write_test_ref, &ref);
+		EXPECT_ERR(err);
+
+		err = reftable_stack_auto_compact(st);
+		EXPECT(i < 3 || st->merged->stack_len < 2 * fastlog2(i));
+	}
+
+	EXPECT(reftable_stack_compaction_stats(st)->entries_written <
+	       (uint64_t)(N * fastlog2(N)));
+
+	reftable_stack_destroy(st);
+	clear_dir(dir);
+}
+
+static void test_reftable_stack_compaction_concurrent(void)
+{
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st1 = NULL, *st2 = NULL;
+	char *dir = get_tmp_dir(__LINE__);
+
+	int err, i;
+	int N = 3;
+
+	err = reftable_new_stack(&st1, dir, cfg);
+	EXPECT_ERR(err);
+
+	for (i = 0; i < N; i++) {
+		char name[100];
+		struct reftable_ref_record ref = {
+			.refname = name,
+			.update_index = reftable_stack_next_update_index(st1),
+			.value_type = REFTABLE_REF_SYMREF,
+			.value.symref = "master",
+		};
+		snprintf(name, sizeof(name), "branch%04d", i);
+
+		err = reftable_stack_add(st1, &write_test_ref, &ref);
+		EXPECT_ERR(err);
+	}
+
+	err = reftable_new_stack(&st2, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_compact_all(st1, NULL);
+	EXPECT_ERR(err);
+
+	reftable_stack_destroy(st1);
+	reftable_stack_destroy(st2);
+
+	EXPECT(count_dir_entries(dir) == 2);
+	clear_dir(dir);
+}
+
+static void unclean_stack_close(struct reftable_stack *st)
+{
+	/* break abstraction boundary to simulate unclean shutdown. */
+	int i = 0;
+	for (; i < st->readers_len; i++) {
+		reftable_reader_free(st->readers[i]);
+	}
+	st->readers_len = 0;
+	FREE_AND_NULL(st->readers);
+}
+
+static void test_reftable_stack_compaction_concurrent_clean(void)
+{
+	struct reftable_write_options cfg = { 0 };
+	struct reftable_stack *st1 = NULL, *st2 = NULL, *st3 = NULL;
+	char *dir = get_tmp_dir(__LINE__);
+
+	int err, i;
+	int N = 3;
+
+	err = reftable_new_stack(&st1, dir, cfg);
+	EXPECT_ERR(err);
+
+	for (i = 0; i < N; i++) {
+		char name[100];
+		struct reftable_ref_record ref = {
+			.refname = name,
+			.update_index = reftable_stack_next_update_index(st1),
+			.value_type = REFTABLE_REF_SYMREF,
+			.value.symref = "master",
+		};
+		snprintf(name, sizeof(name), "branch%04d", i);
+
+		err = reftable_stack_add(st1, &write_test_ref, &ref);
+		EXPECT_ERR(err);
+	}
+
+	err = reftable_new_stack(&st2, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_compact_all(st1, NULL);
+	EXPECT_ERR(err);
+
+	unclean_stack_close(st1);
+	unclean_stack_close(st2);
+
+	err = reftable_new_stack(&st3, dir, cfg);
+	EXPECT_ERR(err);
+
+	err = reftable_stack_clean(st3);
+	EXPECT_ERR(err);
+	EXPECT(count_dir_entries(dir) == 2);
+
+	reftable_stack_destroy(st1);
+	reftable_stack_destroy(st2);
+	reftable_stack_destroy(st3);
+
+	clear_dir(dir);
+}
+
+int stack_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_empty_add);
+	RUN_TEST(test_log2);
+	RUN_TEST(test_names_equal);
+	RUN_TEST(test_parse_names);
+	RUN_TEST(test_read_file);
+	RUN_TEST(test_reflog_expire);
+	RUN_TEST(test_reftable_stack_add);
+	RUN_TEST(test_reftable_stack_add_one);
+	RUN_TEST(test_reftable_stack_auto_compaction);
+	RUN_TEST(test_reftable_stack_compaction_concurrent);
+	RUN_TEST(test_reftable_stack_compaction_concurrent_clean);
+	RUN_TEST(test_reftable_stack_hash_id);
+	RUN_TEST(test_reftable_stack_lock_failure);
+	RUN_TEST(test_reftable_stack_log_normalize);
+	RUN_TEST(test_reftable_stack_tombstone);
+	RUN_TEST(test_reftable_stack_transaction_api);
+	RUN_TEST(test_reftable_stack_update_index_check);
+	RUN_TEST(test_reftable_stack_uptodate);
+	RUN_TEST(test_reftable_stack_validate_refname);
+	RUN_TEST(test_sizes_to_segments);
+	RUN_TEST(test_sizes_to_segments_all_equal);
+	RUN_TEST(test_sizes_to_segments_empty);
+	RUN_TEST(test_suggest_compaction_segment);
+	RUN_TEST(test_suggest_compaction_segment_nothing);
+	return 0;
+}
diff --git a/reftable/system.h b/reftable/system.h
new file mode 100644
index 0000000000..4907306c0c
--- /dev/null
+++ b/reftable/system.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef SYSTEM_H
+#define SYSTEM_H
+
+/* This header glues the reftable library to the rest of Git */
+
+#include "git-compat-util.h"
+#include "strbuf.h"
+#include "hash.h" /* hash ID, sizes.*/
+#include "dir.h" /* remove_dir_recursively, for tests.*/
+
+#include <zlib.h>
+
+#ifdef NO_UNCOMPRESS2
+/*
+ * This is uncompress2, which is only available in zlib >= 1.2.9
+ * (released as of early 2017)
+ */
+int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
+		uLong *sourceLen);
+#endif
+
+int hash_size(uint32_t id);
+
+#endif
diff --git a/reftable/test_framework.c b/reftable/test_framework.c
new file mode 100644
index 0000000000..84ac972cad
--- /dev/null
+++ b/reftable/test_framework.c
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "system.h"
+#include "test_framework.h"
+
+#include "basics.h"
+
+void set_test_hash(uint8_t *p, int i)
+{
+	memset(p, (uint8_t)i, hash_size(GIT_SHA1_FORMAT_ID));
+}
+
+ssize_t strbuf_add_void(void *b, const void *data, size_t sz)
+{
+	strbuf_add(b, data, sz);
+	return sz;
+}
diff --git a/reftable/test_framework.h b/reftable/test_framework.h
new file mode 100644
index 0000000000..774cb275bf
--- /dev/null
+++ b/reftable/test_framework.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef TEST_FRAMEWORK_H
+#define TEST_FRAMEWORK_H
+
+#include "system.h"
+#include "reftable-error.h"
+
+#define EXPECT_ERR(c)                                                  \
+	if (c != 0) {                                                  \
+		fflush(stderr);                                        \
+		fflush(stdout);                                        \
+		fprintf(stderr, "%s: %d: error == %d (%s), want 0\n",  \
+			__FILE__, __LINE__, c, reftable_error_str(c)); \
+		abort();                                               \
+	}
+
+#define EXPECT_STREQ(a, b)                                               \
+	if (strcmp(a, b)) {                                              \
+		fflush(stderr);                                          \
+		fflush(stdout);                                          \
+		fprintf(stderr, "%s:%d: %s (%s) != %s (%s)\n", __FILE__, \
+			__LINE__, #a, a, #b, b);                         \
+		abort();                                                 \
+	}
+
+#define EXPECT(c)                                                          \
+	if (!(c)) {                                                        \
+		fflush(stderr);                                            \
+		fflush(stdout);                                            \
+		fprintf(stderr, "%s: %d: failed assertion %s\n", __FILE__, \
+			__LINE__, #c);                                     \
+		abort();                                                   \
+	}
+
+#define RUN_TEST(f)                          \
+	fprintf(stderr, "running %s\n", #f); \
+	fflush(stderr);                      \
+	f();
+
+void set_test_hash(uint8_t *p, int i);
+
+/* Like strbuf_add, but suitable for passing to reftable_new_writer
+ */
+ssize_t strbuf_add_void(void *b, const void *data, size_t sz);
+
+#endif
diff --git a/reftable/tree.c b/reftable/tree.c
new file mode 100644
index 0000000000..82db7995dd
--- /dev/null
+++ b/reftable/tree.c
@@ -0,0 +1,63 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "tree.h"
+
+#include "basics.h"
+#include "system.h"
+
+struct tree_node *tree_search(void *key, struct tree_node **rootp,
+			      int (*compare)(const void *, const void *),
+			      int insert)
+{
+	int res;
+	if (*rootp == NULL) {
+		if (!insert) {
+			return NULL;
+		} else {
+			struct tree_node *n =
+				reftable_calloc(sizeof(struct tree_node));
+			n->key = key;
+			*rootp = n;
+			return *rootp;
+		}
+	}
+
+	res = compare(key, (*rootp)->key);
+	if (res < 0)
+		return tree_search(key, &(*rootp)->left, compare, insert);
+	else if (res > 0)
+		return tree_search(key, &(*rootp)->right, compare, insert);
+	return *rootp;
+}
+
+void infix_walk(struct tree_node *t, void (*action)(void *arg, void *key),
+		void *arg)
+{
+	if (t->left) {
+		infix_walk(t->left, action, arg);
+	}
+	action(arg, t->key);
+	if (t->right) {
+		infix_walk(t->right, action, arg);
+	}
+}
+
+void tree_free(struct tree_node *t)
+{
+	if (t == NULL) {
+		return;
+	}
+	if (t->left) {
+		tree_free(t->left);
+	}
+	if (t->right) {
+		tree_free(t->right);
+	}
+	reftable_free(t);
+}
diff --git a/reftable/tree.h b/reftable/tree.h
new file mode 100644
index 0000000000..fbdd002e23
--- /dev/null
+++ b/reftable/tree.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef TREE_H
+#define TREE_H
+
+/* tree_node is a generic binary search tree. */
+struct tree_node {
+	void *key;
+	struct tree_node *left, *right;
+};
+
+/* looks for `key` in `rootp` using `compare` as comparison function. If insert
+ * is set, insert the key if it's not found. Else, return NULL.
+ */
+struct tree_node *tree_search(void *key, struct tree_node **rootp,
+			      int (*compare)(const void *, const void *),
+			      int insert);
+
+/* performs an infix walk of the tree. */
+void infix_walk(struct tree_node *t, void (*action)(void *arg, void *key),
+		void *arg);
+
+/*
+ * deallocates the tree nodes recursively. Keys should be deallocated separately
+ * by walking over the tree. */
+void tree_free(struct tree_node *t);
+
+#endif
diff --git a/reftable/tree_test.c b/reftable/tree_test.c
new file mode 100644
index 0000000000..cbff125588
--- /dev/null
+++ b/reftable/tree_test.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "tree.h"
+
+#include "basics.h"
+#include "record.h"
+#include "test_framework.h"
+#include "reftable-tests.h"
+
+static int test_compare(const void *a, const void *b)
+{
+	return (char *)a - (char *)b;
+}
+
+struct curry {
+	void *last;
+};
+
+static void check_increasing(void *arg, void *key)
+{
+	struct curry *c = arg;
+	if (c->last) {
+		EXPECT(test_compare(c->last, key) < 0);
+	}
+	c->last = key;
+}
+
+static void test_tree(void)
+{
+	struct tree_node *root = NULL;
+
+	void *values[11] = { NULL };
+	struct tree_node *nodes[11] = { NULL };
+	int i = 1;
+	struct curry c = { NULL };
+	do {
+		nodes[i] = tree_search(values + i, &root, &test_compare, 1);
+		i = (i * 7) % 11;
+	} while (i != 1);
+
+	for (i = 1; i < ARRAY_SIZE(nodes); i++) {
+		EXPECT(values + i == nodes[i]->key);
+		EXPECT(nodes[i] ==
+		       tree_search(values + i, &root, &test_compare, 0));
+	}
+
+	infix_walk(root, check_increasing, &c);
+	tree_free(root);
+}
+
+int tree_test_main(int argc, const char *argv[])
+{
+	RUN_TEST(test_tree);
+	return 0;
+}
diff --git a/reftable/writer.c b/reftable/writer.c
new file mode 100644
index 0000000000..35c8649c9b
--- /dev/null
+++ b/reftable/writer.c
@@ -0,0 +1,693 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#include "writer.h"
+
+#include "system.h"
+
+#include "block.h"
+#include "constants.h"
+#include "record.h"
+#include "tree.h"
+#include "reftable-error.h"
+
+/* finishes a block, and writes it to storage */
+static int writer_flush_block(struct reftable_writer *w);
+
+/* deallocates memory related to the index */
+static void writer_clear_index(struct reftable_writer *w);
+
+/* finishes writing a 'r' (refs) or 'g' (reflogs) section */
+static int writer_finish_public_section(struct reftable_writer *w);
+
+static struct reftable_block_stats *
+writer_reftable_block_stats(struct reftable_writer *w, uint8_t typ)
+{
+	switch (typ) {
+	case 'r':
+		return &w->stats.ref_stats;
+	case 'o':
+		return &w->stats.obj_stats;
+	case 'i':
+		return &w->stats.idx_stats;
+	case 'g':
+		return &w->stats.log_stats;
+	}
+	abort();
+	return NULL;
+}
+
+/* write data, queuing the padding for the next write. Returns negative for
+ * error. */
+static int padded_write(struct reftable_writer *w, uint8_t *data, size_t len,
+			int padding)
+{
+	int n = 0;
+	if (w->pending_padding > 0) {
+		uint8_t *zeroed = reftable_calloc(w->pending_padding);
+		int n = w->write(w->write_arg, zeroed, w->pending_padding);
+		if (n < 0)
+			return n;
+
+		w->pending_padding = 0;
+		reftable_free(zeroed);
+	}
+
+	w->pending_padding = padding;
+	n = w->write(w->write_arg, data, len);
+	if (n < 0)
+		return n;
+	n += padding;
+	return 0;
+}
+
+static void options_set_defaults(struct reftable_write_options *opts)
+{
+	if (opts->restart_interval == 0) {
+		opts->restart_interval = 16;
+	}
+
+	if (opts->hash_id == 0) {
+		opts->hash_id = GIT_SHA1_FORMAT_ID;
+	}
+	if (opts->block_size == 0) {
+		opts->block_size = DEFAULT_BLOCK_SIZE;
+	}
+}
+
+static int writer_version(struct reftable_writer *w)
+{
+	return (w->opts.hash_id == 0 || w->opts.hash_id == GIT_SHA1_FORMAT_ID) ?
+			     1 :
+			     2;
+}
+
+static int writer_write_header(struct reftable_writer *w, uint8_t *dest)
+{
+	memcpy(dest, "REFT", 4);
+
+	dest[4] = writer_version(w);
+
+	put_be24(dest + 5, w->opts.block_size);
+	put_be64(dest + 8, w->min_update_index);
+	put_be64(dest + 16, w->max_update_index);
+	if (writer_version(w) == 2) {
+		put_be32(dest + 24, w->opts.hash_id);
+	}
+	return header_size(writer_version(w));
+}
+
+static void writer_reinit_block_writer(struct reftable_writer *w, uint8_t typ)
+{
+	int block_start = 0;
+	if (w->next == 0) {
+		block_start = header_size(writer_version(w));
+	}
+
+	strbuf_release(&w->last_key);
+	block_writer_init(&w->block_writer_data, typ, w->block,
+			  w->opts.block_size, block_start,
+			  hash_size(w->opts.hash_id));
+	w->block_writer = &w->block_writer_data;
+	w->block_writer->restart_interval = w->opts.restart_interval;
+}
+
+static struct strbuf reftable_empty_strbuf = STRBUF_INIT;
+
+struct reftable_writer *
+reftable_new_writer(ssize_t (*writer_func)(void *, const void *, size_t),
+		    void *writer_arg, struct reftable_write_options *opts)
+{
+	struct reftable_writer *wp =
+		reftable_calloc(sizeof(struct reftable_writer));
+	strbuf_init(&wp->block_writer_data.last_key, 0);
+	options_set_defaults(opts);
+	if (opts->block_size >= (1 << 24)) {
+		/* TODO - error return? */
+		abort();
+	}
+	wp->last_key = reftable_empty_strbuf;
+	wp->block = reftable_calloc(opts->block_size);
+	wp->write = writer_func;
+	wp->write_arg = writer_arg;
+	wp->opts = *opts;
+	writer_reinit_block_writer(wp, BLOCK_TYPE_REF);
+
+	return wp;
+}
+
+void reftable_writer_set_limits(struct reftable_writer *w, uint64_t min,
+				uint64_t max)
+{
+	w->min_update_index = min;
+	w->max_update_index = max;
+}
+
+void reftable_writer_free(struct reftable_writer *w)
+{
+	reftable_free(w->block);
+	reftable_free(w);
+}
+
+struct obj_index_tree_node {
+	struct strbuf hash;
+	uint64_t *offsets;
+	size_t offset_len;
+	size_t offset_cap;
+};
+
+#define OBJ_INDEX_TREE_NODE_INIT    \
+	{                           \
+		.hash = STRBUF_INIT \
+	}
+
+static int obj_index_tree_node_compare(const void *a, const void *b)
+{
+	return strbuf_cmp(&((const struct obj_index_tree_node *)a)->hash,
+			  &((const struct obj_index_tree_node *)b)->hash);
+}
+
+static void writer_index_hash(struct reftable_writer *w, struct strbuf *hash)
+{
+	uint64_t off = w->next;
+
+	struct obj_index_tree_node want = { .hash = *hash };
+
+	struct tree_node *node = tree_search(&want, &w->obj_index_tree,
+					     &obj_index_tree_node_compare, 0);
+	struct obj_index_tree_node *key = NULL;
+	if (node == NULL) {
+		struct obj_index_tree_node empty = OBJ_INDEX_TREE_NODE_INIT;
+		key = reftable_malloc(sizeof(struct obj_index_tree_node));
+		*key = empty;
+
+		strbuf_reset(&key->hash);
+		strbuf_addbuf(&key->hash, hash);
+		tree_search((void *)key, &w->obj_index_tree,
+			    &obj_index_tree_node_compare, 1);
+	} else {
+		key = node->key;
+	}
+
+	if (key->offset_len > 0 && key->offsets[key->offset_len - 1] == off) {
+		return;
+	}
+
+	if (key->offset_len == key->offset_cap) {
+		key->offset_cap = 2 * key->offset_cap + 1;
+		key->offsets = reftable_realloc(
+			key->offsets, sizeof(uint64_t) * key->offset_cap);
+	}
+
+	key->offsets[key->offset_len++] = off;
+}
+
+static int writer_add_record(struct reftable_writer *w,
+			     struct reftable_record *rec)
+{
+	struct strbuf key = STRBUF_INIT;
+	int err = -1;
+	reftable_record_key(rec, &key);
+	if (strbuf_cmp(&w->last_key, &key) >= 0) {
+		err = REFTABLE_API_ERROR;
+		goto done;
+	}
+
+	strbuf_reset(&w->last_key);
+	strbuf_addbuf(&w->last_key, &key);
+	if (w->block_writer == NULL) {
+		writer_reinit_block_writer(w, reftable_record_type(rec));
+	}
+
+	assert(block_writer_type(w->block_writer) == reftable_record_type(rec));
+
+	if (block_writer_add(w->block_writer, rec) == 0) {
+		err = 0;
+		goto done;
+	}
+
+	err = writer_flush_block(w);
+	if (err < 0) {
+		goto done;
+	}
+
+	writer_reinit_block_writer(w, reftable_record_type(rec));
+	err = block_writer_add(w->block_writer, rec);
+	if (err < 0) {
+		/* we are writing into memory, so an error can only mean it
+		 * doesn't fit. */
+		err = REFTABLE_ENTRY_TOO_BIG_ERROR;
+		goto done;
+	}
+
+	err = 0;
+done:
+	strbuf_release(&key);
+	return err;
+}
+
+int reftable_writer_add_ref(struct reftable_writer *w,
+			    struct reftable_ref_record *ref)
+{
+	struct reftable_record rec = { NULL };
+	struct reftable_ref_record copy = *ref;
+	int err = 0;
+
+	if (ref->refname == NULL)
+		return REFTABLE_API_ERROR;
+	if (ref->update_index < w->min_update_index ||
+	    ref->update_index > w->max_update_index)
+		return REFTABLE_API_ERROR;
+
+	reftable_record_from_ref(&rec, &copy);
+	copy.update_index -= w->min_update_index;
+
+	err = writer_add_record(w, &rec);
+	if (err < 0)
+		return err;
+
+	if (!w->opts.skip_index_objects && reftable_ref_record_val1(ref)) {
+		struct strbuf h = STRBUF_INIT;
+		strbuf_add(&h, (char *)reftable_ref_record_val1(ref),
+			   hash_size(w->opts.hash_id));
+		writer_index_hash(w, &h);
+		strbuf_release(&h);
+	}
+
+	if (!w->opts.skip_index_objects && reftable_ref_record_val2(ref)) {
+		struct strbuf h = STRBUF_INIT;
+		strbuf_add(&h, reftable_ref_record_val2(ref),
+			   hash_size(w->opts.hash_id));
+		writer_index_hash(w, &h);
+		strbuf_release(&h);
+	}
+	return 0;
+}
+
+int reftable_writer_add_refs(struct reftable_writer *w,
+			     struct reftable_ref_record *refs, int n)
+{
+	int err = 0;
+	int i = 0;
+	QSORT(refs, n, reftable_ref_record_compare_name);
+	for (i = 0; err == 0 && i < n; i++) {
+		err = reftable_writer_add_ref(w, &refs[i]);
+	}
+	return err;
+}
+
+static int reftable_writer_add_log_verbatim(struct reftable_writer *w,
+					    struct reftable_log_record *log)
+{
+	struct reftable_record rec = { NULL };
+	if (w->block_writer &&
+	    block_writer_type(w->block_writer) == BLOCK_TYPE_REF) {
+		int err = writer_finish_public_section(w);
+		if (err < 0)
+			return err;
+	}
+
+	w->next -= w->pending_padding;
+	w->pending_padding = 0;
+
+	reftable_record_from_log(&rec, log);
+	return writer_add_record(w, &rec);
+}
+
+int reftable_writer_add_log(struct reftable_writer *w,
+			    struct reftable_log_record *log)
+{
+	char *input_log_message = NULL;
+	struct strbuf cleaned_message = STRBUF_INIT;
+	int err = 0;
+
+	if (log->value_type == REFTABLE_LOG_DELETION)
+		return reftable_writer_add_log_verbatim(w, log);
+
+	if (log->refname == NULL)
+		return REFTABLE_API_ERROR;
+
+	input_log_message = log->value.update.message;
+	if (!w->opts.exact_log_message && log->value.update.message) {
+		strbuf_addstr(&cleaned_message, log->value.update.message);
+		while (cleaned_message.len &&
+		       cleaned_message.buf[cleaned_message.len - 1] == '\n')
+			strbuf_setlen(&cleaned_message,
+				      cleaned_message.len - 1);
+		if (strchr(cleaned_message.buf, '\n')) {
+			/* multiple lines not allowed. */
+			err = REFTABLE_API_ERROR;
+			goto done;
+		}
+		strbuf_addstr(&cleaned_message, "\n");
+		log->value.update.message = cleaned_message.buf;
+	}
+
+	err = reftable_writer_add_log_verbatim(w, log);
+	log->value.update.message = input_log_message;
+done:
+	strbuf_release(&cleaned_message);
+	return err;
+}
+
+int reftable_writer_add_logs(struct reftable_writer *w,
+			     struct reftable_log_record *logs, int n)
+{
+	int err = 0;
+	int i = 0;
+	QSORT(logs, n, reftable_log_record_compare_key);
+
+	for (i = 0; err == 0 && i < n; i++) {
+		err = reftable_writer_add_log(w, &logs[i]);
+	}
+	return err;
+}
+
+static int writer_finish_section(struct reftable_writer *w)
+{
+	uint8_t typ = block_writer_type(w->block_writer);
+	uint64_t index_start = 0;
+	int max_level = 0;
+	int threshold = w->opts.unpadded ? 1 : 3;
+	int before_blocks = w->stats.idx_stats.blocks;
+	int err = writer_flush_block(w);
+	int i = 0;
+	struct reftable_block_stats *bstats = NULL;
+	if (err < 0)
+		return err;
+
+	while (w->index_len > threshold) {
+		struct reftable_index_record *idx = NULL;
+		int idx_len = 0;
+
+		max_level++;
+		index_start = w->next;
+		writer_reinit_block_writer(w, BLOCK_TYPE_INDEX);
+
+		idx = w->index;
+		idx_len = w->index_len;
+
+		w->index = NULL;
+		w->index_len = 0;
+		w->index_cap = 0;
+		for (i = 0; i < idx_len; i++) {
+			struct reftable_record rec = { NULL };
+			reftable_record_from_index(&rec, idx + i);
+			if (block_writer_add(w->block_writer, &rec) == 0) {
+				continue;
+			}
+
+			err = writer_flush_block(w);
+			if (err < 0)
+				return err;
+
+			writer_reinit_block_writer(w, BLOCK_TYPE_INDEX);
+
+			err = block_writer_add(w->block_writer, &rec);
+			if (err != 0) {
+				/* write into fresh block should always succeed
+				 */
+				abort();
+			}
+		}
+		for (i = 0; i < idx_len; i++) {
+			strbuf_release(&idx[i].last_key);
+		}
+		reftable_free(idx);
+	}
+
+	writer_clear_index(w);
+
+	err = writer_flush_block(w);
+	if (err < 0)
+		return err;
+
+	bstats = writer_reftable_block_stats(w, typ);
+	bstats->index_blocks = w->stats.idx_stats.blocks - before_blocks;
+	bstats->index_offset = index_start;
+	bstats->max_index_level = max_level;
+
+	/* Reinit lastKey, as the next section can start with any key. */
+	w->last_key.len = 0;
+
+	return 0;
+}
+
+struct common_prefix_arg {
+	struct strbuf *last;
+	int max;
+};
+
+static void update_common(void *void_arg, void *key)
+{
+	struct common_prefix_arg *arg = void_arg;
+	struct obj_index_tree_node *entry = key;
+	if (arg->last) {
+		int n = common_prefix_size(&entry->hash, arg->last);
+		if (n > arg->max) {
+			arg->max = n;
+		}
+	}
+	arg->last = &entry->hash;
+}
+
+struct write_record_arg {
+	struct reftable_writer *w;
+	int err;
+};
+
+static void write_object_record(void *void_arg, void *key)
+{
+	struct write_record_arg *arg = void_arg;
+	struct obj_index_tree_node *entry = key;
+	struct reftable_obj_record obj_rec = {
+		.hash_prefix = (uint8_t *)entry->hash.buf,
+		.hash_prefix_len = arg->w->stats.object_id_len,
+		.offsets = entry->offsets,
+		.offset_len = entry->offset_len,
+	};
+	struct reftable_record rec = { NULL };
+	if (arg->err < 0)
+		goto done;
+
+	reftable_record_from_obj(&rec, &obj_rec);
+	arg->err = block_writer_add(arg->w->block_writer, &rec);
+	if (arg->err == 0)
+		goto done;
+
+	arg->err = writer_flush_block(arg->w);
+	if (arg->err < 0)
+		goto done;
+
+	writer_reinit_block_writer(arg->w, BLOCK_TYPE_OBJ);
+	arg->err = block_writer_add(arg->w->block_writer, &rec);
+	if (arg->err == 0)
+		goto done;
+	obj_rec.offset_len = 0;
+	arg->err = block_writer_add(arg->w->block_writer, &rec);
+
+	/* Should be able to write into a fresh block. */
+	assert(arg->err == 0);
+
+done:;
+}
+
+static void object_record_free(void *void_arg, void *key)
+{
+	struct obj_index_tree_node *entry = key;
+
+	FREE_AND_NULL(entry->offsets);
+	strbuf_release(&entry->hash);
+	reftable_free(entry);
+}
+
+static int writer_dump_object_index(struct reftable_writer *w)
+{
+	struct write_record_arg closure = { .w = w };
+	struct common_prefix_arg common = { NULL };
+	if (w->obj_index_tree) {
+		infix_walk(w->obj_index_tree, &update_common, &common);
+	}
+	w->stats.object_id_len = common.max + 1;
+
+	writer_reinit_block_writer(w, BLOCK_TYPE_OBJ);
+
+	if (w->obj_index_tree) {
+		infix_walk(w->obj_index_tree, &write_object_record, &closure);
+	}
+
+	if (closure.err < 0)
+		return closure.err;
+	return writer_finish_section(w);
+}
+
+static int writer_finish_public_section(struct reftable_writer *w)
+{
+	uint8_t typ = 0;
+	int err = 0;
+
+	if (w->block_writer == NULL)
+		return 0;
+
+	typ = block_writer_type(w->block_writer);
+	err = writer_finish_section(w);
+	if (err < 0)
+		return err;
+	if (typ == BLOCK_TYPE_REF && !w->opts.skip_index_objects &&
+	    w->stats.ref_stats.index_blocks > 0) {
+		err = writer_dump_object_index(w);
+		if (err < 0)
+			return err;
+	}
+
+	if (w->obj_index_tree) {
+		infix_walk(w->obj_index_tree, &object_record_free, NULL);
+		tree_free(w->obj_index_tree);
+		w->obj_index_tree = NULL;
+	}
+
+	w->block_writer = NULL;
+	return 0;
+}
+
+int reftable_writer_close(struct reftable_writer *w)
+{
+	uint8_t footer[72];
+	uint8_t *p = footer;
+	int err = writer_finish_public_section(w);
+	int empty_table = w->next == 0;
+	if (err != 0)
+		goto done;
+	w->pending_padding = 0;
+	if (empty_table) {
+		/* Empty tables need a header anyway. */
+		uint8_t header[28];
+		int n = writer_write_header(w, header);
+		err = padded_write(w, header, n, 0);
+		if (err < 0)
+			goto done;
+	}
+
+	p += writer_write_header(w, footer);
+	put_be64(p, w->stats.ref_stats.index_offset);
+	p += 8;
+	put_be64(p, (w->stats.obj_stats.offset) << 5 | w->stats.object_id_len);
+	p += 8;
+	put_be64(p, w->stats.obj_stats.index_offset);
+	p += 8;
+
+	put_be64(p, w->stats.log_stats.offset);
+	p += 8;
+	put_be64(p, w->stats.log_stats.index_offset);
+	p += 8;
+
+	put_be32(p, crc32(0, footer, p - footer));
+	p += 4;
+
+	err = padded_write(w, footer, footer_size(writer_version(w)), 0);
+	if (err < 0)
+		goto done;
+
+	if (empty_table) {
+		err = REFTABLE_EMPTY_TABLE_ERROR;
+		goto done;
+	}
+
+done:
+	/* free up memory. */
+	block_writer_release(&w->block_writer_data);
+	writer_clear_index(w);
+	strbuf_release(&w->last_key);
+	return err;
+}
+
+static void writer_clear_index(struct reftable_writer *w)
+{
+	int i = 0;
+	for (i = 0; i < w->index_len; i++) {
+		strbuf_release(&w->index[i].last_key);
+	}
+
+	FREE_AND_NULL(w->index);
+	w->index_len = 0;
+	w->index_cap = 0;
+}
+
+static const int debug = 0;
+
+static int writer_flush_nonempty_block(struct reftable_writer *w)
+{
+	uint8_t typ = block_writer_type(w->block_writer);
+	struct reftable_block_stats *bstats =
+		writer_reftable_block_stats(w, typ);
+	uint64_t block_typ_off = (bstats->blocks == 0) ? w->next : 0;
+	int raw_bytes = block_writer_finish(w->block_writer);
+	int padding = 0;
+	int err = 0;
+	struct reftable_index_record ir = { .last_key = STRBUF_INIT };
+	if (raw_bytes < 0)
+		return raw_bytes;
+
+	if (!w->opts.unpadded && typ != BLOCK_TYPE_LOG) {
+		padding = w->opts.block_size - raw_bytes;
+	}
+
+	if (block_typ_off > 0) {
+		bstats->offset = block_typ_off;
+	}
+
+	bstats->entries += w->block_writer->entries;
+	bstats->restarts += w->block_writer->restart_len;
+	bstats->blocks++;
+	w->stats.blocks++;
+
+	if (debug) {
+		fprintf(stderr, "block %c off %" PRIu64 " sz %d (%d)\n", typ,
+			w->next, raw_bytes,
+			get_be24(w->block + w->block_writer->header_off + 1));
+	}
+
+	if (w->next == 0) {
+		writer_write_header(w, w->block);
+	}
+
+	err = padded_write(w, w->block, raw_bytes, padding);
+	if (err < 0)
+		return err;
+
+	if (w->index_cap == w->index_len) {
+		w->index_cap = 2 * w->index_cap + 1;
+		w->index = reftable_realloc(
+			w->index,
+			sizeof(struct reftable_index_record) * w->index_cap);
+	}
+
+	ir.offset = w->next;
+	strbuf_reset(&ir.last_key);
+	strbuf_addbuf(&ir.last_key, &w->block_writer->last_key);
+	w->index[w->index_len] = ir;
+
+	w->index_len++;
+	w->next += padding + raw_bytes;
+	w->block_writer = NULL;
+	return 0;
+}
+
+static int writer_flush_block(struct reftable_writer *w)
+{
+	if (w->block_writer == NULL)
+		return 0;
+	if (w->block_writer->entries == 0)
+		return 0;
+	return writer_flush_nonempty_block(w);
+}
+
+const struct reftable_stats *writer_stats(struct reftable_writer *w)
+{
+	return &w->stats;
+}
diff --git a/reftable/writer.h b/reftable/writer.h
new file mode 100644
index 0000000000..09b88673d9
--- /dev/null
+++ b/reftable/writer.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 Google LLC
+
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file or at
+https://developers.google.com/open-source/licenses/bsd
+*/
+
+#ifndef WRITER_H
+#define WRITER_H
+
+#include "basics.h"
+#include "block.h"
+#include "tree.h"
+#include "reftable-writer.h"
+
+struct reftable_writer {
+	ssize_t (*write)(void *, const void *, size_t);
+	void *write_arg;
+	int pending_padding;
+	struct strbuf last_key;
+
+	/* offset of next block to write. */
+	uint64_t next;
+	uint64_t min_update_index, max_update_index;
+	struct reftable_write_options opts;
+
+	/* memory buffer for writing */
+	uint8_t *block;
+
+	/* writer for the current section. NULL or points to
+	 * block_writer_data */
+	struct block_writer *block_writer;
+
+	struct block_writer block_writer_data;
+
+	/* pending index records for the current section */
+	struct reftable_index_record *index;
+	size_t index_len;
+	size_t index_cap;
+
+	/*
+	 * tree for use with tsearch; used to populate the 'o' inverse OID
+	 * map */
+	struct tree_node *obj_index_tree;
+
+	struct reftable_stats stats;
+};
+
+#endif
diff --git a/remote-curl.c b/remote-curl.c
index d69156312b..0dabef2dd7 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -1061,7 +1061,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
 	client.in = -1;
 	client.out = -1;
 	client.git_cmd = 1;
-	client.argv = client_argv;
+	strvec_pushv(&client.args, client_argv);
 	if (start_command(&client))
 		exit(1);
 	write_or_die(client.in, preamble->buf, preamble->len);
diff --git a/remote.c b/remote.c
index f958543d70..a6d8ec6c1a 100644
--- a/remote.c
+++ b/remote.c
@@ -21,33 +21,6 @@ struct counted_string {
 	size_t len;
 	const char *s;
 };
-struct rewrite {
-	const char *base;
-	size_t baselen;
-	struct counted_string *instead_of;
-	int instead_of_nr;
-	int instead_of_alloc;
-};
-struct rewrites {
-	struct rewrite **rewrite;
-	int rewrite_alloc;
-	int rewrite_nr;
-};
-
-static struct remote **remotes;
-static int remotes_alloc;
-static int remotes_nr;
-static struct hashmap remotes_hash;
-
-static struct branch **branches;
-static int branches_alloc;
-static int branches_nr;
-
-static struct branch *current_branch;
-static const char *pushremote_name;
-
-static struct rewrites rewrites;
-static struct rewrites rewrites_push;
 
 static int valid_remote(const struct remote *remote)
 {
@@ -92,17 +65,19 @@ static void add_pushurl(struct remote *remote, const char *pushurl)
 	remote->pushurl[remote->pushurl_nr++] = pushurl;
 }
 
-static void add_pushurl_alias(struct remote *remote, const char *url)
+static void add_pushurl_alias(struct remote_state *remote_state,
+			      struct remote *remote, const char *url)
 {
-	const char *pushurl = alias_url(url, &rewrites_push);
+	const char *pushurl = alias_url(url, &remote_state->rewrites_push);
 	if (pushurl != url)
 		add_pushurl(remote, pushurl);
 }
 
-static void add_url_alias(struct remote *remote, const char *url)
+static void add_url_alias(struct remote_state *remote_state,
+			  struct remote *remote, const char *url)
 {
-	add_url(remote, alias_url(url, &rewrites));
-	add_pushurl_alias(remote, url);
+	add_url(remote, alias_url(url, &remote_state->rewrites));
+	add_pushurl_alias(remote_state, remote, url);
 }
 
 struct remotes_hash_key {
@@ -127,13 +102,8 @@ static int remotes_hash_cmp(const void *unused_cmp_data,
 		return strcmp(a->name, b->name);
 }
 
-static inline void init_remotes_hash(void)
-{
-	if (!remotes_hash.cmpfn)
-		hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
-}
-
-static struct remote *make_remote(const char *name, int len)
+static struct remote *make_remote(struct remote_state *remote_state,
+				  const char *name, int len)
 {
 	struct remote *ret;
 	struct remotes_hash_key lookup;
@@ -142,12 +112,11 @@ static struct remote *make_remote(const char *name, int len)
 	if (!len)
 		len = strlen(name);
 
-	init_remotes_hash();
 	lookup.str = name;
 	lookup.len = len;
 	hashmap_entry_init(&lookup_entry, memhash(name, len));
 
-	e = hashmap_get(&remotes_hash, &lookup_entry, &lookup);
+	e = hashmap_get(&remote_state->remotes_hash, &lookup_entry, &lookup);
 	if (e)
 		return container_of(e, struct remote, ent);
 
@@ -158,15 +127,38 @@ static struct remote *make_remote(const char *name, int len)
 	refspec_init(&ret->push, REFSPEC_PUSH);
 	refspec_init(&ret->fetch, REFSPEC_FETCH);
 
-	ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc);
-	remotes[remotes_nr++] = ret;
+	ALLOC_GROW(remote_state->remotes, remote_state->remotes_nr + 1,
+		   remote_state->remotes_alloc);
+	remote_state->remotes[remote_state->remotes_nr++] = ret;
 
 	hashmap_entry_init(&ret->ent, lookup_entry.hash);
-	if (hashmap_put_entry(&remotes_hash, ret, ent))
+	if (hashmap_put_entry(&remote_state->remotes_hash, ret, ent))
 		BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
 	return ret;
 }
 
+static void remote_clear(struct remote *remote)
+{
+	int i;
+
+	free((char *)remote->name);
+	free((char *)remote->foreign_vcs);
+
+	for (i = 0; i < remote->url_nr; i++) {
+		free((char *)remote->url[i]);
+	}
+	FREE_AND_NULL(remote->pushurl);
+
+	for (i = 0; i < remote->pushurl_nr; i++) {
+		free((char *)remote->pushurl[i]);
+	}
+	FREE_AND_NULL(remote->pushurl);
+	free((char *)remote->receivepack);
+	free((char *)remote->uploadpack);
+	FREE_AND_NULL(remote->http_proxy);
+	FREE_AND_NULL(remote->http_proxy_authmethod);
+}
+
 static void add_merge(struct branch *branch, const char *name)
 {
 	ALLOC_GROW(branch->merge_name, branch->merge_nr + 1,
@@ -174,23 +166,74 @@ static void add_merge(struct branch *branch, const char *name)
 	branch->merge_name[branch->merge_nr++] = name;
 }
 
-static struct branch *make_branch(const char *name, size_t len)
+struct branches_hash_key {
+	const char *str;
+	int len;
+};
+
+static int branches_hash_cmp(const void *unused_cmp_data,
+			     const struct hashmap_entry *eptr,
+			     const struct hashmap_entry *entry_or_key,
+			     const void *keydata)
+{
+	const struct branch *a, *b;
+	const struct branches_hash_key *key = keydata;
+
+	a = container_of(eptr, const struct branch, ent);
+	b = container_of(entry_or_key, const struct branch, ent);
+
+	if (key)
+		return strncmp(a->name, key->str, key->len) ||
+		       a->name[key->len];
+	else
+		return strcmp(a->name, b->name);
+}
+
+static struct branch *find_branch(struct remote_state *remote_state,
+				  const char *name, size_t len)
+{
+	struct branches_hash_key lookup;
+	struct hashmap_entry lookup_entry, *e;
+
+	if (!len)
+		len = strlen(name);
+
+	lookup.str = name;
+	lookup.len = len;
+	hashmap_entry_init(&lookup_entry, memhash(name, len));
+
+	e = hashmap_get(&remote_state->branches_hash, &lookup_entry, &lookup);
+	if (e)
+		return container_of(e, struct branch, ent);
+
+	return NULL;
+}
+
+static void die_on_missing_branch(struct repository *repo,
+				  struct branch *branch)
+{
+	/* branch == NULL is always valid because it represents detached HEAD. */
+	if (branch &&
+	    branch != find_branch(repo->remote_state, branch->name, 0))
+		die("branch %s was not found in the repository", branch->name);
+}
+
+static struct branch *make_branch(struct remote_state *remote_state,
+				  const char *name, size_t len)
 {
 	struct branch *ret;
-	int i;
 
-	for (i = 0; i < branches_nr; i++) {
-		if (!strncmp(name, branches[i]->name, len) &&
-		    !branches[i]->name[len])
-			return branches[i];
-	}
+	ret = find_branch(remote_state, name, len);
+	if (ret)
+		return ret;
 
-	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
 	CALLOC_ARRAY(ret, 1);
-	branches[branches_nr++] = ret;
 	ret->name = xstrndup(name, len);
 	ret->refname = xstrfmt("refs/heads/%s", ret->name);
 
+	hashmap_entry_init(&ret->ent, memhash(name, len));
+	if (hashmap_put_entry(&remote_state->branches_hash, ret, ent))
+		BUG("hashmap_put overwrote entry after hashmap_get returned NULL");
 	return ret;
 }
 
@@ -229,7 +272,8 @@ static const char *skip_spaces(const char *s)
 	return s;
 }
 
-static void read_remotes_file(struct remote *remote)
+static void read_remotes_file(struct remote_state *remote_state,
+			      struct remote *remote)
 {
 	struct strbuf buf = STRBUF_INIT;
 	FILE *f = fopen_or_warn(git_path("remotes/%s", remote->name), "r");
@@ -244,7 +288,8 @@ static void read_remotes_file(struct remote *remote)
 		strbuf_rtrim(&buf);
 
 		if (skip_prefix(buf.buf, "URL:", &v))
-			add_url_alias(remote, xstrdup(skip_spaces(v)));
+			add_url_alias(remote_state, remote,
+				      xstrdup(skip_spaces(v)));
 		else if (skip_prefix(buf.buf, "Push:", &v))
 			refspec_append(&remote->push, skip_spaces(v));
 		else if (skip_prefix(buf.buf, "Pull:", &v))
@@ -254,7 +299,8 @@ static void read_remotes_file(struct remote *remote)
 	fclose(f);
 }
 
-static void read_branches_file(struct remote *remote)
+static void read_branches_file(struct remote_state *remote_state,
+			       struct remote *remote)
 {
 	char *frag;
 	struct strbuf buf = STRBUF_INIT;
@@ -286,7 +332,7 @@ static void read_branches_file(struct remote *remote)
 	else
 		frag = (char *)git_default_branch_name(0);
 
-	add_url_alias(remote, strbuf_detach(&buf, NULL));
+	add_url_alias(remote_state, remote, strbuf_detach(&buf, NULL));
 	refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
 			frag, remote->name);
 
@@ -305,10 +351,12 @@ static int handle_config(const char *key, const char *value, void *cb)
 	const char *subkey;
 	struct remote *remote;
 	struct branch *branch;
+	struct remote_state *remote_state = cb;
+
 	if (parse_config_key(key, "branch", &name, &namelen, &subkey) >= 0) {
 		if (!name)
 			return 0;
-		branch = make_branch(name, namelen);
+		branch = make_branch(remote_state, name, namelen);
 		if (!strcmp(subkey, "remote")) {
 			return git_config_string(&branch->remote_name, key, value);
 		} else if (!strcmp(subkey, "pushremote")) {
@@ -327,12 +375,14 @@ static int handle_config(const char *key, const char *value, void *cb)
 		if (!strcmp(subkey, "insteadof")) {
 			if (!value)
 				return config_error_nonbool(key);
-			rewrite = make_rewrite(&rewrites, name, namelen);
+			rewrite = make_rewrite(&remote_state->rewrites, name,
+					       namelen);
 			add_instead_of(rewrite, xstrdup(value));
 		} else if (!strcmp(subkey, "pushinsteadof")) {
 			if (!value)
 				return config_error_nonbool(key);
-			rewrite = make_rewrite(&rewrites_push, name, namelen);
+			rewrite = make_rewrite(&remote_state->rewrites_push,
+					       name, namelen);
 			add_instead_of(rewrite, xstrdup(value));
 		}
 	}
@@ -342,7 +392,8 @@ static int handle_config(const char *key, const char *value, void *cb)
 
 	/* Handle remote.* variables */
 	if (!name && !strcmp(subkey, "pushdefault"))
-		return git_config_string(&pushremote_name, key, value);
+		return git_config_string(&remote_state->pushremote_name, key,
+					 value);
 
 	if (!name)
 		return 0;
@@ -352,7 +403,7 @@ static int handle_config(const char *key, const char *value, void *cb)
 			name);
 		return 0;
 	}
-	remote = make_remote(name, namelen);
+	remote = make_remote(remote_state, name, namelen);
 	remote->origin = REMOTE_CONFIG;
 	if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
 	    current_config_scope() == CONFIG_SCOPE_WORKTREE)
@@ -422,44 +473,52 @@ static int handle_config(const char *key, const char *value, void *cb)
 	return 0;
 }
 
-static void alias_all_urls(void)
+static void alias_all_urls(struct remote_state *remote_state)
 {
 	int i, j;
-	for (i = 0; i < remotes_nr; i++) {
+	for (i = 0; i < remote_state->remotes_nr; i++) {
 		int add_pushurl_aliases;
-		if (!remotes[i])
+		if (!remote_state->remotes[i])
 			continue;
-		for (j = 0; j < remotes[i]->pushurl_nr; j++) {
-			remotes[i]->pushurl[j] = alias_url(remotes[i]->pushurl[j], &rewrites);
+		for (j = 0; j < remote_state->remotes[i]->pushurl_nr; j++) {
+			remote_state->remotes[i]->pushurl[j] =
+				alias_url(remote_state->remotes[i]->pushurl[j],
+					  &remote_state->rewrites);
 		}
-		add_pushurl_aliases = remotes[i]->pushurl_nr == 0;
-		for (j = 0; j < remotes[i]->url_nr; j++) {
+		add_pushurl_aliases = remote_state->remotes[i]->pushurl_nr == 0;
+		for (j = 0; j < remote_state->remotes[i]->url_nr; j++) {
 			if (add_pushurl_aliases)
-				add_pushurl_alias(remotes[i], remotes[i]->url[j]);
-			remotes[i]->url[j] = alias_url(remotes[i]->url[j], &rewrites);
+				add_pushurl_alias(
+					remote_state, remote_state->remotes[i],
+					remote_state->remotes[i]->url[j]);
+			remote_state->remotes[i]->url[j] =
+				alias_url(remote_state->remotes[i]->url[j],
+					  &remote_state->rewrites);
 		}
 	}
 }
 
-static void read_config(void)
+static void read_config(struct repository *repo)
 {
-	static int loaded;
 	int flag;
 
-	if (loaded)
+	if (repo->remote_state->initialized)
 		return;
-	loaded = 1;
+	repo->remote_state->initialized = 1;
 
-	current_branch = NULL;
+	repo->remote_state->current_branch = NULL;
 	if (startup_info->have_repository) {
-		const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
+		int ignore_errno;
+		const char *head_ref = refs_resolve_ref_unsafe(
+			get_main_ref_store(repo), "HEAD", 0, NULL, &flag, &ignore_errno);
 		if (head_ref && (flag & REF_ISSYMREF) &&
 		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
-			current_branch = make_branch(head_ref, strlen(head_ref));
+			repo->remote_state->current_branch = make_branch(
+				repo->remote_state, head_ref, strlen(head_ref));
 		}
 	}
-	git_config(handle_config, NULL);
-	alias_all_urls();
+	repo_config(repo, handle_config, repo->remote_state);
+	alias_all_urls(repo->remote_state);
 }
 
 static int valid_remote_nick(const char *name)
@@ -474,7 +533,9 @@ static int valid_remote_nick(const char *name)
 	return 1;
 }
 
-const char *remote_for_branch(struct branch *branch, int *explicit)
+static const char *remotes_remote_for_branch(struct remote_state *remote_state,
+					     struct branch *branch,
+					     int *explicit)
 {
 	if (branch && branch->remote_name) {
 		if (explicit)
@@ -486,32 +547,61 @@ const char *remote_for_branch(struct branch *branch, int *explicit)
 	return "origin";
 }
 
-const char *pushremote_for_branch(struct branch *branch, int *explicit)
+const char *remote_for_branch(struct branch *branch, int *explicit)
+{
+	read_config(the_repository);
+	die_on_missing_branch(the_repository, branch);
+
+	return remotes_remote_for_branch(the_repository->remote_state, branch,
+					 explicit);
+}
+
+static const char *
+remotes_pushremote_for_branch(struct remote_state *remote_state,
+			      struct branch *branch, int *explicit)
 {
 	if (branch && branch->pushremote_name) {
 		if (explicit)
 			*explicit = 1;
 		return branch->pushremote_name;
 	}
-	if (pushremote_name) {
+	if (remote_state->pushremote_name) {
 		if (explicit)
 			*explicit = 1;
-		return pushremote_name;
+		return remote_state->pushremote_name;
 	}
-	return remote_for_branch(branch, explicit);
+	return remotes_remote_for_branch(remote_state, branch, explicit);
+}
+
+const char *pushremote_for_branch(struct branch *branch, int *explicit)
+{
+	read_config(the_repository);
+	die_on_missing_branch(the_repository, branch);
+
+	return remotes_pushremote_for_branch(the_repository->remote_state,
+					     branch, explicit);
 }
 
+static struct remote *remotes_remote_get(struct remote_state *remote_state,
+					 const char *name);
+
 const char *remote_ref_for_branch(struct branch *branch, int for_push)
 {
+	read_config(the_repository);
+	die_on_missing_branch(the_repository, branch);
+
 	if (branch) {
 		if (!for_push) {
 			if (branch->merge_nr) {
 				return branch->merge_name[0];
 			}
 		} else {
-			const char *dst, *remote_name =
-				pushremote_for_branch(branch, NULL);
-			struct remote *remote = remote_get(remote_name);
+			const char *dst,
+				*remote_name = remotes_pushremote_for_branch(
+					the_repository->remote_state, branch,
+					NULL);
+			struct remote *remote = remotes_remote_get(
+				the_repository->remote_state, remote_name);
 
 			if (remote && remote->push.nr &&
 			    (dst = apply_refspecs(&remote->push,
@@ -523,41 +613,58 @@ const char *remote_ref_for_branch(struct branch *branch, int for_push)
 	return NULL;
 }
 
-static struct remote *remote_get_1(const char *name,
-				   const char *(*get_default)(struct branch *, int *))
+static struct remote *
+remotes_remote_get_1(struct remote_state *remote_state, const char *name,
+		     const char *(*get_default)(struct remote_state *,
+						struct branch *, int *))
 {
 	struct remote *ret;
 	int name_given = 0;
 
-	read_config();
-
 	if (name)
 		name_given = 1;
 	else
-		name = get_default(current_branch, &name_given);
+		name = get_default(remote_state, remote_state->current_branch,
+				   &name_given);
 
-	ret = make_remote(name, 0);
+	ret = make_remote(remote_state, name, 0);
 	if (valid_remote_nick(name) && have_git_dir()) {
 		if (!valid_remote(ret))
-			read_remotes_file(ret);
+			read_remotes_file(remote_state, ret);
 		if (!valid_remote(ret))
-			read_branches_file(ret);
+			read_branches_file(remote_state, ret);
 	}
 	if (name_given && !valid_remote(ret))
-		add_url_alias(ret, name);
+		add_url_alias(remote_state, ret, name);
 	if (!valid_remote(ret))
 		return NULL;
 	return ret;
 }
 
+static inline struct remote *
+remotes_remote_get(struct remote_state *remote_state, const char *name)
+{
+	return remotes_remote_get_1(remote_state, name,
+				    remotes_remote_for_branch);
+}
+
 struct remote *remote_get(const char *name)
 {
-	return remote_get_1(name, remote_for_branch);
+	read_config(the_repository);
+	return remotes_remote_get(the_repository->remote_state, name);
+}
+
+static inline struct remote *
+remotes_pushremote_get(struct remote_state *remote_state, const char *name)
+{
+	return remotes_remote_get_1(remote_state, name,
+				    remotes_pushremote_for_branch);
 }
 
 struct remote *pushremote_get(const char *name)
 {
-	return remote_get_1(name, pushremote_for_branch);
+	read_config(the_repository);
+	return remotes_pushremote_get(the_repository->remote_state, name);
 }
 
 int remote_is_configured(struct remote *remote, int in_repo)
@@ -572,12 +679,14 @@ int remote_is_configured(struct remote *remote, int in_repo)
 int for_each_remote(each_remote_fn fn, void *priv)
 {
 	int i, result = 0;
-	read_config();
-	for (i = 0; i < remotes_nr && !result; i++) {
-		struct remote *r = remotes[i];
-		if (!r)
+	read_config(the_repository);
+	for (i = 0; i < the_repository->remote_state->remotes_nr && !result;
+	     i++) {
+		struct remote *remote =
+			the_repository->remote_state->remotes[i];
+		if (!remote)
 			continue;
-		result = fn(r, priv);
+		result = fn(remote, priv);
 	}
 	return result;
 }
@@ -1642,7 +1751,7 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 	}
 }
 
-static void set_merge(struct branch *ret)
+static void set_merge(struct remote_state *remote_state, struct branch *ret)
 {
 	struct remote *remote;
 	char *ref;
@@ -1662,7 +1771,7 @@ static void set_merge(struct branch *ret)
 		return;
 	}
 
-	remote = remote_get(ret->remote_name);
+	remote = remotes_remote_get(remote_state, ret->remote_name);
 
 	CALLOC_ARRAY(ret->merge, ret->merge_nr);
 	for (i = 0; i < ret->merge_nr; i++) {
@@ -1683,12 +1792,13 @@ struct branch *branch_get(const char *name)
 {
 	struct branch *ret;
 
-	read_config();
+	read_config(the_repository);
 	if (!name || !*name || !strcmp(name, "HEAD"))
-		ret = current_branch;
+		ret = the_repository->remote_state->current_branch;
 	else
-		ret = make_branch(name, strlen(name));
-	set_merge(ret);
+		ret = make_branch(the_repository->remote_state, name,
+				  strlen(name));
+	set_merge(the_repository->remote_state, ret);
 	return ret;
 }
 
@@ -1759,11 +1869,14 @@ static const char *tracking_for_push_dest(struct remote *remote,
 	return ret;
 }
 
-static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
+static const char *branch_get_push_1(struct remote_state *remote_state,
+				     struct branch *branch, struct strbuf *err)
 {
 	struct remote *remote;
 
-	remote = remote_get(pushremote_for_branch(branch, NULL));
+	remote = remotes_remote_get(
+		remote_state,
+		remotes_pushremote_for_branch(remote_state, branch, NULL));
 	if (!remote)
 		return error_buf(err,
 				 _("branch '%s' has no remote for pushing"),
@@ -1821,11 +1934,15 @@ static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
 
 const char *branch_get_push(struct branch *branch, struct strbuf *err)
 {
+	read_config(the_repository);
+	die_on_missing_branch(the_repository, branch);
+
 	if (!branch)
 		return error_buf(err, _("HEAD does not point to a branch"));
 
 	if (!branch->push_tracking_ref)
-		branch->push_tracking_ref = branch_get_push_1(branch, err);
+		branch->push_tracking_ref = branch_get_push_1(
+			the_repository->remote_state, branch, err);
 	return branch->push_tracking_ref;
 }
 
@@ -2585,3 +2702,29 @@ void apply_push_cas(struct push_cas_option *cas,
 			check_if_includes_upstream(ref);
 	}
 }
+
+struct remote_state *remote_state_new(void)
+{
+	struct remote_state *r = xmalloc(sizeof(*r));
+
+	memset(r, 0, sizeof(*r));
+
+	hashmap_init(&r->remotes_hash, remotes_hash_cmp, NULL, 0);
+	hashmap_init(&r->branches_hash, branches_hash_cmp, NULL, 0);
+	return r;
+}
+
+void remote_state_clear(struct remote_state *remote_state)
+{
+	int i;
+
+	for (i = 0; i < remote_state->remotes_nr; i++) {
+		remote_clear(remote_state->remotes[i]);
+	}
+	FREE_AND_NULL(remote_state->remotes);
+	remote_state->remotes_alloc = 0;
+	remote_state->remotes_nr = 0;
+
+	hashmap_clear_and_free(&remote_state->remotes_hash, struct remote, ent);
+	hashmap_clear_and_free(&remote_state->branches_hash, struct remote, ent);
+}
diff --git a/remote.h b/remote.h
index 5a59198252..4a1209ae2c 100644
--- a/remote.h
+++ b/remote.h
@@ -23,6 +23,40 @@ enum {
 	REMOTE_BRANCHES
 };
 
+struct rewrite {
+	const char *base;
+	size_t baselen;
+	struct counted_string *instead_of;
+	int instead_of_nr;
+	int instead_of_alloc;
+};
+
+struct rewrites {
+	struct rewrite **rewrite;
+	int rewrite_alloc;
+	int rewrite_nr;
+};
+
+struct remote_state {
+	struct remote **remotes;
+	int remotes_alloc;
+	int remotes_nr;
+	struct hashmap remotes_hash;
+
+	struct hashmap branches_hash;
+
+	struct branch *current_branch;
+	const char *pushremote_name;
+
+	struct rewrites rewrites;
+	struct rewrites rewrites_push;
+
+	int initialized;
+};
+
+void remote_state_clear(struct remote_state *remote_state);
+struct remote_state *remote_state_new(void);
+
 struct remote {
 	struct hashmap_entry ent;
 
@@ -256,6 +290,7 @@ int remote_find_tracking(struct remote *remote, struct refspec_item *refspec);
  * branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD.
  */
 struct branch {
+	struct hashmap_entry ent;
 
 	/* The short name of the branch. */
 	const char *name;
diff --git a/repo-settings.c b/repo-settings.c
index b93e91a212..00ca5571a1 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -17,6 +17,9 @@ void prepare_repo_settings(struct repository *r)
 	char *strval;
 	int manyfiles;
 
+	if (!r->gitdir)
+		BUG("Cannot add settings for uninitialized repository");
+
 	if (r->settings.initialized++)
 		return;
 
diff --git a/repository.c b/repository.c
index c5b90ba93e..34610c5a33 100644
--- a/repository.c
+++ b/repository.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "object.h"
 #include "lockfile.h"
+#include "remote.h"
 #include "submodule-config.h"
 #include "sparse-index.h"
 #include "promisor-remote.h"
@@ -24,6 +25,7 @@ void initialize_the_repository(void)
 
 	the_repo.index = &the_index;
 	the_repo.objects = raw_object_store_new();
+	the_repo.remote_state = remote_state_new();
 	the_repo.parsed_objects = parsed_object_pool_new();
 
 	repo_set_hash_algo(&the_repo, GIT_HASH_SHA1);
@@ -80,6 +82,8 @@ void repo_set_gitdir(struct repository *repo,
 	expand_base_dir(&repo->objects->odb->path, o->object_dir,
 			repo->commondir, "objects");
 
+	repo->objects->odb->disable_ref_updates = o->disable_ref_updates;
+
 	free(repo->objects->alternate_db);
 	repo->objects->alternate_db = xstrdup_or_null(o->alternate_db);
 	expand_base_dir(&repo->graft_file, o->graft_file,
@@ -164,6 +168,7 @@ int repo_init(struct repository *repo,
 
 	repo->objects = raw_object_store_new();
 	repo->parsed_objects = parsed_object_pool_new();
+	repo->remote_state = remote_state_new();
 
 	if (repo_init_gitdir(repo, gitdir))
 		goto error;
@@ -270,6 +275,11 @@ void repo_clear(struct repository *repo)
 		promisor_remote_clear(repo->promisor_remote_config);
 		FREE_AND_NULL(repo->promisor_remote_config);
 	}
+
+	if (repo->remote_state) {
+		remote_state_clear(repo->remote_state);
+		FREE_AND_NULL(repo->remote_state);
+	}
 }
 
 int repo_read_index(struct repository *repo)
diff --git a/repository.h b/repository.h
index a057653981..2b5cf97f31 100644
--- a/repository.h
+++ b/repository.h
@@ -11,6 +11,7 @@ struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
 struct promisor_remote_config;
+struct remote_state;
 
 enum untracked_cache_setting {
 	UNTRACKED_CACHE_KEEP,
@@ -127,6 +128,9 @@ struct repository {
 	 */
 	struct index_state *index;
 
+	/* Repository's remotes and associated structures. */
+	struct remote_state *remote_state;
+
 	/* Repository's current hash algorithm, as serialized on disk. */
 	const struct git_hash_algo *hash_algo;
 
@@ -158,6 +162,7 @@ struct set_gitdir_args {
 	const char *graft_file;
 	const char *index_file;
 	const char *alternate_db;
+	int disable_ref_updates;
 };
 
 void repo_set_gitdir(struct repository *repo, const char *root,
diff --git a/revision.c b/revision.c
index 1981a0859f..ad4286fbdd 100644
--- a/revision.c
+++ b/revision.c
@@ -44,10 +44,15 @@ static inline int want_ancestry(const struct rev_info *revs);
 
 void show_object_with_name(FILE *out, struct object *obj, const char *name)
 {
-	const char *p;
-
 	fprintf(out, "%s ", oid_to_hex(&obj->oid));
-	for (p = name; *p && *p != '\n'; p++)
+	/*
+	 * This "for (const char *p = ..." is made as a first step towards
+	 * making use of such declarations elsewhere in our codebase.  If
+	 * it causes compilation problems on your platform, please report
+	 * it to the Git mailing list at git@vger.kernel.org. In the meantime,
+	 * adding -std=gnu99 to CFLAGS may help if you are with older GCC.
+	 */
+	for (const char *p = name; *p && *p != '\n'; p++)
 		fputc(*p, out);
 	fputc('\n', out);
 }
@@ -2295,11 +2300,11 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->left_only = 1;
 	} else if (!strcmp(arg, "--right-only")) {
 		if (revs->left_only)
-			die("--right-only is incompatible with --left-only");
+			die(_("options '%s' and '%s' cannot be used together"), "--right-only", "--left-only");
 		revs->right_only = 1;
 	} else if (!strcmp(arg, "--cherry")) {
 		if (revs->left_only)
-			die("--cherry is incompatible with --left-only");
+			die(_("options '%s' and '%s' cannot be used together"), "--cherry", "--left-only");
 		revs->cherry_mark = 1;
 		revs->right_only = 1;
 		revs->max_parents = 1;
@@ -2308,12 +2313,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->count = 1;
 	} else if (!strcmp(arg, "--cherry-mark")) {
 		if (revs->cherry_pick)
-			die("--cherry-mark is incompatible with --cherry-pick");
+			die(_("options '%s' and '%s' cannot be used together"), "--cherry-mark", "--cherry-pick");
 		revs->cherry_mark = 1;
 		revs->limited = 1; /* needs limit_list() */
 	} else if (!strcmp(arg, "--cherry-pick")) {
 		if (revs->cherry_mark)
-			die("--cherry-pick is incompatible with --cherry-mark");
+			die(_("options '%s' and '%s' cannot be used together"), "--cherry-pick", "--cherry-mark");
 		revs->cherry_pick = 1;
 		revs->limited = 1;
 	} else if (!strcmp(arg, "--objects")) {
@@ -2493,7 +2498,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if (!strcmp(arg, "--all-match")) {
 		revs->grep_filter.all_match = 1;
 	} else if (!strcmp(arg, "--invert-grep")) {
-		revs->invert_grep = 1;
+		revs->grep_filter.no_body_match = 1;
 	} else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
 		if (strcmp(optarg, "none"))
 			git_log_output_encoding = xstrdup(optarg);
@@ -2519,7 +2524,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		return opts;
 	}
 	if (revs->graph && revs->track_linear)
-		die("--show-linear-break and --graph are incompatible");
+		die(_("options '%s' and '%s' cannot be used together"), "--show-linear-break", "--graph");
 
 	return 1;
 }
@@ -2862,24 +2867,24 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	compile_grep_patterns(&revs->grep_filter);
 
 	if (revs->reverse && revs->reflog_info)
-		die("cannot combine --reverse with --walk-reflogs");
+		die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs");
 	if (revs->reflog_info && revs->limited)
 		die("cannot combine --walk-reflogs with history-limiting options");
 	if (revs->rewrite_parents && revs->children.name)
-		die("cannot combine --parents and --children");
+		die(_("options '%s' and '%s' cannot be used together"), "--parents", "--children");
 
 	/*
 	 * Limitations on the graph functionality
 	 */
 	if (revs->reverse && revs->graph)
-		die("cannot combine --reverse with --graph");
+		die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph");
 
 	if (revs->reflog_info && revs->graph)
-		die("cannot combine --walk-reflogs with --graph");
+		die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph");
 	if (revs->no_walk && revs->graph)
-		die("cannot combine --no-walk with --graph");
+		die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph");
 	if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
-		die("cannot use --grep-reflog without --walk-reflogs");
+		die(_("the option '%s' requires '%s'"), "--grep-reflog", "--walk-reflogs");
 
 	if (revs->line_level_traverse &&
 	    (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
@@ -3778,7 +3783,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
 				     (char *)message, strlen(message));
 	strbuf_release(&buf);
 	unuse_commit_buffer(commit, message);
-	return opt->invert_grep ? !retval : retval;
+	return retval;
 }
 
 static inline int want_ancestry(const struct rev_info *revs)
diff --git a/revision.h b/revision.h
index 5578bb4720..3f66147bfd 100644
--- a/revision.h
+++ b/revision.h
@@ -246,8 +246,6 @@ struct rev_info {
 
 	/* Filter by commit log message */
 	struct grep_opt	grep_filter;
-	/* Negate the match of grep_filter */
-	int invert_grep;
 
 	/* Display history graph */
 	struct git_graph *graph;
diff --git a/run-command.c b/run-command.c
index f40df01c77..69dde42f1e 100644
--- a/run-command.c
+++ b/run-command.c
@@ -340,15 +340,6 @@ static void child_close_pair(int fd[2])
 	child_close(fd[1]);
 }
 
-/*
- * parent will make it look like the child spewed a fatal error and died
- * this is needed to prevent changes to t0061.
- */
-static void fake_fatal(const char *err, va_list params)
-{
-	vreportf("fatal: ", err, params);
-}
-
 static void child_error_fn(const char *err, va_list params)
 {
 	const char msg[] = "error() should not be called in child\n";
@@ -372,15 +363,16 @@ static void NORETURN child_die_fn(const char *err, va_list params)
 static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
 {
 	static void (*old_errfn)(const char *err, va_list params);
+	report_fn die_message_routine = get_die_message_routine();
 
 	old_errfn = get_error_routine();
-	set_error_routine(fake_fatal);
+	set_error_routine(die_message_routine);
 	errno = cerr->syserr;
 
 	switch (cerr->err) {
 	case CHILD_ERR_CHDIR:
 		error_errno("exec '%s': cd to '%s' failed",
-			    cmd->argv[0], cmd->dir);
+			    cmd->args.v[0], cmd->dir);
 		break;
 	case CHILD_ERR_DUP2:
 		error_errno("dup2() in child failed");
@@ -392,12 +384,12 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
 		error_errno("sigprocmask failed restoring signals");
 		break;
 	case CHILD_ERR_ENOENT:
-		error_errno("cannot run %s", cmd->argv[0]);
+		error_errno("cannot run %s", cmd->args.v[0]);
 		break;
 	case CHILD_ERR_SILENT:
 		break;
 	case CHILD_ERR_ERRNO:
-		error_errno("cannot exec '%s'", cmd->argv[0]);
+		error_errno("cannot exec '%s'", cmd->args.v[0]);
 		break;
 	}
 	set_error_routine(old_errfn);
@@ -405,7 +397,7 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
 
 static int prepare_cmd(struct strvec *out, const struct child_process *cmd)
 {
-	if (!cmd->argv[0])
+	if (!cmd->args.v[0])
 		BUG("command is empty");
 
 	/*
@@ -415,11 +407,11 @@ static int prepare_cmd(struct strvec *out, const struct child_process *cmd)
 	strvec_push(out, SHELL_PATH);
 
 	if (cmd->git_cmd) {
-		prepare_git_cmd(out, cmd->argv);
+		prepare_git_cmd(out, cmd->args.v);
 	} else if (cmd->use_shell) {
-		prepare_shell_cmd(out, cmd->argv);
+		prepare_shell_cmd(out, cmd->args.v);
 	} else {
-		strvec_pushv(out, cmd->argv);
+		strvec_pushv(out, cmd->args.v);
 	}
 
 	/*
@@ -552,20 +544,17 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
 
 	while ((waiting = waitpid(pid, &status, 0)) < 0 && errno == EINTR)
 		;	/* nothing */
-	if (in_signal) {
-		if (WIFEXITED(status))
-			code = WEXITSTATUS(status);
-		return code;
-	}
 
 	if (waiting < 0) {
 		failed_errno = errno;
-		error_errno("waitpid for %s failed", argv0);
+		if (!in_signal)
+			error_errno("waitpid for %s failed", argv0);
 	} else if (waiting != pid) {
-		error("waitpid is confused (%s)", argv0);
+		if (!in_signal)
+			error("waitpid is confused (%s)", argv0);
 	} else if (WIFSIGNALED(status)) {
 		code = WTERMSIG(status);
-		if (code != SIGINT && code != SIGQUIT && code != SIGPIPE)
+		if (!in_signal && code != SIGINT && code != SIGQUIT && code != SIGPIPE)
 			error("%s died of signal %d", argv0, code);
 		/*
 		 * This return value is chosen so that code & 0xff
@@ -576,10 +565,12 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
 	} else if (WIFEXITED(status)) {
 		code = WEXITSTATUS(status);
 	} else {
-		error("waitpid is confused (%s)", argv0);
+		if (!in_signal)
+			error("waitpid is confused (%s)", argv0);
 	}
 
-	clear_child_for_cleanup(pid);
+	if (!in_signal)
+		clear_child_for_cleanup(pid);
 
 	errno = failed_errno;
 	return code;
@@ -655,15 +646,10 @@ static void trace_run_command(const struct child_process *cp)
 		sq_quote_buf_pretty(&buf, cp->dir);
 		strbuf_addch(&buf, ';');
 	}
-	/*
-	 * The caller is responsible for initializing cp->env from
-	 * cp->env_array if needed. We only check one place.
-	 */
-	if (cp->env)
-		trace_add_env(&buf, cp->env);
+	trace_add_env(&buf, cp->env_array.v);
 	if (cp->git_cmd)
 		strbuf_addstr(&buf, " git");
-	sq_quote_argv_pretty(&buf, cp->argv);
+	sq_quote_argv_pretty(&buf, cp->args.v);
 
 	trace_printf("%s", buf.buf);
 	strbuf_release(&buf);
@@ -676,11 +662,6 @@ int start_command(struct child_process *cmd)
 	int failed_errno;
 	char *str;
 
-	if (!cmd->argv)
-		cmd->argv = cmd->args.v;
-	if (!cmd->env)
-		cmd->env = cmd->env_array.v;
-
 	/*
 	 * In case of errors we must keep the promise to close FDs
 	 * that have been passed in via ->in and ->out.
@@ -729,7 +710,7 @@ int start_command(struct child_process *cmd)
 			str = "standard error";
 fail_pipe:
 			error("cannot create %s pipe for %s: %s",
-				str, cmd->argv[0], strerror(failed_errno));
+				str, cmd->args.v[0], strerror(failed_errno));
 			child_process_clear(cmd);
 			errno = failed_errno;
 			return -1;
@@ -758,7 +739,7 @@ fail_pipe:
 		failed_errno = errno;
 		cmd->pid = -1;
 		if (!cmd->silent_exec_failure)
-			error_errno("cannot run %s", cmd->argv[0]);
+			error_errno("cannot run %s", cmd->args.v[0]);
 		goto end_of_spawn;
 	}
 
@@ -770,7 +751,7 @@ fail_pipe:
 		set_cloexec(null_fd);
 	}
 
-	childenv = prep_childenv(cmd->env);
+	childenv = prep_childenv(cmd->env_array.v);
 	atfork_prepare(&as);
 
 	/*
@@ -868,7 +849,7 @@ fail_pipe:
 	}
 	atfork_parent(&as);
 	if (cmd->pid < 0)
-		error_errno("cannot fork() for %s", cmd->argv[0]);
+		error_errno("cannot fork() for %s", cmd->args.v[0]);
 	else if (cmd->clean_on_exit)
 		mark_child_for_cleanup(cmd->pid, cmd);
 
@@ -885,7 +866,7 @@ fail_pipe:
 		 * At this point we know that fork() succeeded, but exec()
 		 * failed. Errors have been reported to our stderr.
 		 */
-		wait_or_whine(cmd->pid, cmd->argv[0], 0);
+		wait_or_whine(cmd->pid, cmd->args.v[0], 0);
 		child_err_spew(cmd, &cerr);
 		failed_errno = errno;
 		cmd->pid = -1;
@@ -902,7 +883,7 @@ end_of_spawn:
 #else
 {
 	int fhin = 0, fhout = 1, fherr = 2;
-	const char **sargv = cmd->argv;
+	const char **sargv = cmd->args.v;
 	struct strvec nargv = STRVEC_INIT;
 
 	if (cmd->no_stdin)
@@ -929,20 +910,20 @@ end_of_spawn:
 		fhout = dup(cmd->out);
 
 	if (cmd->git_cmd)
-		cmd->argv = prepare_git_cmd(&nargv, cmd->argv);
+		cmd->args.v = prepare_git_cmd(&nargv, sargv);
 	else if (cmd->use_shell)
-		cmd->argv = prepare_shell_cmd(&nargv, cmd->argv);
+		cmd->args.v = prepare_shell_cmd(&nargv, sargv);
 
-	cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, (char**) cmd->env,
+	cmd->pid = mingw_spawnvpe(cmd->args.v[0], cmd->args.v, (char**) cmd->env_array.v,
 			cmd->dir, fhin, fhout, fherr);
 	failed_errno = errno;
 	if (cmd->pid < 0 && (!cmd->silent_exec_failure || errno != ENOENT))
-		error_errno("cannot spawn %s", cmd->argv[0]);
+		error_errno("cannot spawn %s", cmd->args.v[0]);
 	if (cmd->clean_on_exit && cmd->pid >= 0)
 		mark_child_for_cleanup(cmd->pid, cmd);
 
 	strvec_clear(&nargv);
-	cmd->argv = sargv;
+	cmd->args.v = sargv;
 	if (fhin != 0)
 		close(fhin);
 	if (fhout != 1)
@@ -992,7 +973,7 @@ end_of_spawn:
 
 int finish_command(struct child_process *cmd)
 {
-	int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
+	int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 0);
 	trace2_child_exit(cmd, ret);
 	child_process_clear(cmd);
 	invalidate_lstat_cache();
@@ -1001,7 +982,7 @@ int finish_command(struct child_process *cmd)
 
 int finish_command_in_signal(struct child_process *cmd)
 {
-	int ret = wait_or_whine(cmd->pid, cmd->argv[0], 1);
+	int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 1);
 	trace2_child_exit(cmd, ret);
 	return ret;
 }
@@ -1039,7 +1020,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
 				 const char *const *env, const char *tr2_class)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
-	cmd.argv = argv;
+	strvec_pushv(&cmd.args, argv);
 	cmd.no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0;
 	cmd.git_cmd = opt & RUN_GIT_CMD ? 1 : 0;
 	cmd.stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0;
@@ -1049,7 +1030,8 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
 	cmd.wait_after_clean = opt & RUN_WAIT_AFTER_CLEAN ? 1 : 0;
 	cmd.close_object_store = opt & RUN_CLOSE_OBJECT_STORE ? 1 : 0;
 	cmd.dir = dir;
-	cmd.env = env;
+	if (env)
+		strvec_pushv(&cmd.env_array, (const char **)env);
 	cmd.trace2_child_class = tr2_class;
 	return run_command(&cmd);
 }
@@ -1082,7 +1064,9 @@ static void *run_thread(void *data)
 
 static NORETURN void die_async(const char *err, va_list params)
 {
-	vreportf("fatal: ", err, params);
+	report_fn die_message_fn = get_die_message_routine();
+
+	die_message_fn(err, params);
 
 	if (in_async()) {
 		struct async *async = pthread_getspecific(async_key);
@@ -1335,7 +1319,8 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)
 	strvec_push(&hook.args, p);
 	while ((p = va_arg(args, const char *)))
 		strvec_push(&hook.args, p);
-	hook.env = env;
+	if (env)
+		strvec_pushv(&hook.env_array, (const char **)env);
 	hook.no_stdin = 1;
 	hook.stdout_to_stderr = 1;
 	hook.trace2_hook_name = name;
diff --git a/run-command.h b/run-command.h
index 4987826258..2be5f5d642 100644
--- a/run-command.h
+++ b/run-command.h
@@ -44,22 +44,35 @@
 struct child_process {
 
 	/**
-	 * The .argv member is set up as an array of string pointers (NULL
-	 * terminated), of which .argv[0] is the program name to run (usually
-	 * without a path). If the command to run is a git command, set argv[0] to
-	 * the command name without the 'git-' prefix and set .git_cmd = 1.
+	 * The .args is a `struct strvec', use that API to manipulate
+	 * it, e.g. strvec_pushv() to add an existing "const char **"
+	 * vector.
 	 *
-	 * Note that the ownership of the memory pointed to by .argv stays with the
-	 * caller, but it should survive until `finish_command` completes. If the
-	 * .argv member is NULL, `start_command` will point it at the .args
-	 * `strvec` (so you may use one or the other, but you must use exactly
-	 * one). The memory in .args will be cleaned up automatically during
-	 * `finish_command` (or during `start_command` when it is unsuccessful).
+	 * If the command to run is a git command, set the first
+	 * element in the strvec to the command name without the
+	 * 'git-' prefix and set .git_cmd = 1.
 	 *
+	 * The memory in .args will be cleaned up automatically during
+	 * `finish_command` (or during `start_command` when it is unsuccessful).
 	 */
-	const char **argv;
-
 	struct strvec args;
+
+	/**
+	 * Like .args the .env_array is a `struct strvec'.
+	 *
+	 * To modify the environment of the sub-process, specify an array of
+	 * environment settings. Each string in the array manipulates the
+	 * environment.
+	 *
+	 * - If the string is of the form "VAR=value", i.e. it contains '='
+	 *   the variable is added to the child process's environment.
+	 *
+	 * - If the string does not contain '=', it names an environment
+	 *   variable that will be removed from the child process's environment.
+	 *
+	 * The memory in .env_array will be cleaned up automatically during
+	 * `finish_command` (or during `start_command` when it is unsuccessful).
+	 */
 	struct strvec env_array;
 	pid_t pid;
 
@@ -96,23 +109,6 @@ struct child_process {
 	 */
 	const char *dir;
 
-	/**
-	 * To modify the environment of the sub-process, specify an array of
-	 * string pointers (NULL terminated) in .env:
-	 *
-	 * - If the string is of the form "VAR=value", i.e. it contains '='
-	 *   the variable is added to the child process's environment.
-	 *
-	 * - If the string does not contain '=', it names an environment
-	 *   variable that will be removed from the child process's environment.
-	 *
-	 * If the .env member is NULL, `start_command` will point it at the
-	 * .env_array `strvec` (so you may use one or the other, but not both).
-	 * The memory in .env_array will be cleaned up automatically during
-	 * `finish_command` (or during `start_command` when it is unsuccessful).
-	 */
-	const char *const *env;
-
 	unsigned no_stdin:1;
 	unsigned no_stdout:1;
 	unsigned no_stderr:1;
diff --git a/sequencer.c b/sequencer.c
index ea96837cde..5213d16e97 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1164,18 +1164,14 @@ static int run_rewrite_hook(const struct object_id *oldoid,
 			    const struct object_id *newoid)
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
-	const char *argv[3];
 	int code;
 	struct strbuf sb = STRBUF_INIT;
+	const char *hook_path = find_hook("post-rewrite");
 
-	argv[0] = find_hook("post-rewrite");
-	if (!argv[0])
+	if (!hook_path)
 		return 0;
 
-	argv[1] = "amend";
-	argv[2] = NULL;
-
-	proc.argv = argv;
+	strvec_pushl(&proc.args, hook_path, "amend", NULL);
 	proc.in = -1;
 	proc.stdout_to_stderr = 1;
 	proc.trace2_hook_name = "post-rewrite";
@@ -1284,6 +1280,8 @@ void print_commit_summary(struct repository *r,
 	struct pretty_print_context pctx = {0};
 	struct strbuf author_ident = STRBUF_INIT;
 	struct strbuf committer_ident = STRBUF_INIT;
+	struct ref_store *refs;
+	int resolve_errno;
 
 	commit = lookup_commit(r, oid);
 	if (!commit)
@@ -1333,9 +1331,13 @@ void print_commit_summary(struct repository *r,
 	rev.diffopt.break_opt = 0;
 	diff_setup_done(&rev.diffopt);
 
-	head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
-	if (!head)
+	refs = get_main_ref_store(the_repository);
+	head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL,
+				       &resolve_errno);
+	if (!head) {
+		errno = resolve_errno;
 		die_errno(_("unable to resolve HEAD after creating commit"));
+	}
 	if (!strcmp(head, "HEAD"))
 		head = _("detached HEAD");
 	else
@@ -3495,17 +3497,12 @@ static int error_failed_squash(struct repository *r,
 
 static int do_exec(struct repository *r, const char *command_line)
 {
-	struct strvec child_env = STRVEC_INIT;
 	const char *child_argv[] = { NULL, NULL };
 	int dirty, status;
 
 	fprintf(stderr, _("Executing: %s\n"), command_line);
 	child_argv[0] = command_line;
-	strvec_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
-	strvec_pushf(&child_env, "GIT_WORK_TREE=%s",
-		     absolute_path(get_git_work_tree()));
-	status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
-					  child_env.v);
+	status = run_command_v_opt(child_argv, RUN_USING_SHELL);
 
 	/* force re-reading of the cache */
 	if (discard_index(r->index) < 0 || repo_read_index(r) < 0)
@@ -3535,8 +3532,6 @@ static int do_exec(struct repository *r, const char *command_line)
 		status = 1;
 	}
 
-	strvec_clear(&child_env);
-
 	return status;
 }
 
@@ -4228,6 +4223,11 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts,
 
 	cmd.git_cmd = 1;
 
+	if (startup_info->original_cwd) {
+		cmd.dir = startup_info->original_cwd;
+		strvec_pushf(&cmd.env_array, "%s=%s",
+			     GIT_WORK_TREE_ENVIRONMENT, r->worktree);
+	}
 	strvec_push(&cmd.args, "checkout");
 	strvec_push(&cmd.args, commit);
 	strvec_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action);
@@ -5496,7 +5496,7 @@ static void todo_list_add_exec_commands(struct todo_list *todo_list,
 	}
 
 	/* insert or append final <commands> */
-	if (insert || nr == todo_list->nr) {
+	if (insert) {
 		ALLOC_GROW(items, nr + commands->nr, alloc);
 		COPY_ARRAY(items + nr, base_items, commands->nr);
 		nr += commands->nr;
diff --git a/setup.c b/setup.c
index a9161acbe2..7e5af7178c 100644
--- a/setup.c
+++ b/setup.c
@@ -13,6 +13,7 @@ static int work_tree_config_is_bogus;
 
 static struct startup_info the_startup_info;
 struct startup_info *startup_info = &the_startup_info;
+const char *tmp_original_cwd;
 
 /*
  * The input parameter must contain an absolute path, and it must already be
@@ -433,6 +434,69 @@ void setup_work_tree(void)
 	initialized = 1;
 }
 
+static void setup_original_cwd(void)
+{
+	struct strbuf tmp = STRBUF_INIT;
+	const char *worktree = NULL;
+	int offset = -1;
+
+	if (!tmp_original_cwd)
+		return;
+
+	/*
+	 * startup_info->original_cwd points to the current working
+	 * directory we inherited from our parent process, which is a
+	 * directory we want to avoid removing.
+	 *
+	 * For convience, we would like to have the path relative to the
+	 * worktree instead of an absolute path.
+	 *
+	 * Yes, startup_info->original_cwd is usually the same as 'prefix',
+	 * but differs in two ways:
+	 *   - prefix has a trailing '/'
+	 *   - if the user passes '-C' to git, that modifies the prefix but
+	 *     not startup_info->original_cwd.
+	 */
+
+	/* Normalize the directory */
+	strbuf_realpath(&tmp, tmp_original_cwd, 1);
+	free((char*)tmp_original_cwd);
+	tmp_original_cwd = NULL;
+	startup_info->original_cwd = strbuf_detach(&tmp, NULL);
+
+	/*
+	 * Get our worktree; we only protect the current working directory
+	 * if it's in the worktree.
+	 */
+	worktree = get_git_work_tree();
+	if (!worktree)
+		goto no_prevention_needed;
+
+	offset = dir_inside_of(startup_info->original_cwd, worktree);
+	if (offset >= 0) {
+		/*
+		 * If startup_info->original_cwd == worktree, that is already
+		 * protected and we don't need original_cwd as a secondary
+		 * protection measure.
+		 */
+		if (!*(startup_info->original_cwd + offset))
+			goto no_prevention_needed;
+
+		/*
+		 * original_cwd was inside worktree; precompose it just as
+		 * we do prefix so that built up paths will match
+		 */
+		startup_info->original_cwd = \
+			precompose_string_if_needed(startup_info->original_cwd
+						    + offset);
+		return;
+	}
+
+no_prevention_needed:
+	free((char*)startup_info->original_cwd);
+	startup_info->original_cwd = NULL;
+}
+
 static int read_worktree_config(const char *var, const char *value, void *vdata)
 {
 	struct repository_format *data = vdata;
@@ -1391,6 +1455,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 		setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
 	}
 
+	setup_original_cwd();
 
 	strbuf_release(&dir);
 	strbuf_release(&gitdir);
diff --git a/sparse-index.c b/sparse-index.c
index 7b7ff79e04..a1d505d50e 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -122,17 +122,17 @@ static int index_has_unmerged_entries(struct index_state *istate)
 	return 0;
 }
 
-int convert_to_sparse(struct index_state *istate, int flags)
+static int is_sparse_index_allowed(struct index_state *istate, int flags)
 {
-	int test_env;
-	if (istate->sparse_index || !istate->cache_nr ||
-	    !core_apply_sparse_checkout || !core_sparse_checkout_cone)
+	if (!core_apply_sparse_checkout || !core_sparse_checkout_cone)
 		return 0;
 
 	if (!istate->repo)
 		istate->repo = the_repository;
 
 	if (!(flags & SPARSE_INDEX_MEMORY_ONLY)) {
+		int test_env;
+
 		/*
 		 * The sparse index is not (yet) integrated with a split index.
 		 */
@@ -168,25 +168,41 @@ int convert_to_sparse(struct index_state *istate, int flags)
 	if (!istate->sparse_checkout_patterns->use_cone_patterns)
 		return 0;
 
+	return 1;
+}
+
+int convert_to_sparse(struct index_state *istate, int flags)
+{
 	/*
-	 * NEEDSWORK: If we have unmerged entries, then stay full.
-	 * Unmerged entries prevent the cache-tree extension from working.
+	 * If the index is already sparse, empty, or otherwise
+	 * cannot be converted to sparse, do not convert.
 	 */
-	if (index_has_unmerged_entries(istate))
+	if (istate->sparse_index || !istate->cache_nr ||
+	    !is_sparse_index_allowed(istate, flags))
 		return 0;
 
-	/* Clear and recompute the cache-tree */
-	cache_tree_free(&istate->cache_tree);
 	/*
-	 * Silently return if there is a problem with the cache tree update,
-	 * which might just be due to a conflict state in some entry.
-	 *
-	 * This might create new tree objects, so be sure to use
-	 * WRITE_TREE_MISSING_OK.
+	 * NEEDSWORK: If we have unmerged entries, then stay full.
+	 * Unmerged entries prevent the cache-tree extension from working.
 	 */
-	if (cache_tree_update(istate, WRITE_TREE_MISSING_OK))
+	if (index_has_unmerged_entries(istate))
 		return 0;
 
+	if (!cache_tree_fully_valid(istate->cache_tree)) {
+		/* Clear and recompute the cache-tree */
+		cache_tree_free(&istate->cache_tree);
+
+		/*
+		 * Silently return if there is a problem with the cache tree update,
+		 * which might just be due to a conflict state in some entry.
+		 *
+		 * This might create new tree objects, so be sure to use
+		 * WRITE_TREE_MISSING_OK.
+		 */
+		if (cache_tree_update(istate, WRITE_TREE_MISSING_OK))
+			return 0;
+	}
+
 	remove_fsmonitor(istate);
 
 	trace2_region_enter("index", "convert_to_sparse", istate->repo);
@@ -313,6 +329,18 @@ void ensure_full_index(struct index_state *istate)
 	trace2_region_leave("index", "ensure_full_index", istate->repo);
 }
 
+void ensure_correct_sparsity(struct index_state *istate)
+{
+	/*
+	 * If the index can be sparse, make it sparse. Otherwise,
+	 * ensure the index is full.
+	 */
+	if (is_sparse_index_allowed(istate, 0))
+		convert_to_sparse(istate, 0);
+	else
+		ensure_full_index(istate);
+}
+
 /*
  * This static global helps avoid infinite recursion between
  * expand_to_path() and index_file_exists().
diff --git a/sparse-index.h b/sparse-index.h
index 9f3d7bc7fa..656bd835b2 100644
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -4,6 +4,7 @@
 struct index_state;
 #define SPARSE_INDEX_MEMORY_ONLY (1 << 0)
 int convert_to_sparse(struct index_state *istate, int flags);
+void ensure_correct_sparsity(struct index_state *istate);
 
 /*
  * Some places in the codebase expect to search for a specific path.
diff --git a/strbuf.c b/strbuf.c
index b22e981655..613fee8c82 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -1006,7 +1006,12 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
 
 	/*
 	 * There is no portable way to pass timezone information to
-	 * strftime, so we handle %z and %Z here.
+	 * strftime, so we handle %z and %Z here. Likewise '%s', because
+	 * going back to an epoch time requires knowing the zone.
+	 *
+	 * Note that tz_offset is in the "[-+]HHMM" decimal form; this is what
+	 * we want for %z, but the computation for %s has to convert to number
+	 * of seconds.
 	 */
 	for (;;) {
 		const char *percent = strchrnul(fmt, '%');
@@ -1019,6 +1024,13 @@ void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm,
 			strbuf_addstr(&munged_fmt, "%%");
 			fmt++;
 			break;
+		case 's':
+			strbuf_addf(&munged_fmt, "%"PRItime,
+				    (timestamp_t)tm_to_time_t(tm) -
+				    3600 * (tz_offset / 100) -
+				    60 * (tz_offset % 100));
+			fmt++;
+			break;
 		case 'z':
 			strbuf_addf(&munged_fmt, "%+05d", tz_offset);
 			fmt++;
diff --git a/strbuf.h b/strbuf.h
index 96512f85b3..76965a17d4 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -160,7 +160,7 @@ void strbuf_grow(struct strbuf *sb, size_t amount);
 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");
+		BUG("strbuf_setlen() beyond buffer");
 	sb->len = len;
 	if (sb->buf != strbuf_slopbuf)
 		sb->buf[len] = '\0';
diff --git a/sub-process.c b/sub-process.c
index dfa790d3ff..cae56ae6b8 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -187,7 +187,7 @@ static int handshake_capabilities(struct child_process *process,
 				*supported_capabilities |= capabilities[i].flag;
 		} else {
 			die("subprocess '%s' requested unsupported capability '%s'",
-			    process->argv[0], p);
+			    process->args.v[0], p);
 		}
 	}
 
diff --git a/symlinks.c b/symlinks.c
index 5232d02020..c667baa949 100644
--- a/symlinks.c
+++ b/symlinks.c
@@ -279,7 +279,9 @@ static void do_remove_scheduled_dirs(int new_len)
 {
 	while (removal.len > new_len) {
 		removal.buf[removal.len] = '\0';
-		if (rmdir(removal.buf))
+		if ((startup_info->original_cwd &&
+		     !strcmp(removal.buf, startup_info->original_cwd)) ||
+		    rmdir(removal.buf))
 			break;
 		do {
 			removal.len--;
@@ -293,6 +295,10 @@ void schedule_dir_for_removal(const char *name, int len)
 {
 	int match_len, last_slash, i, previous_slash;
 
+	if (startup_info->original_cwd &&
+	    !strcmp(name, startup_info->original_cwd))
+		return;	/* Do not remove the current working directory */
+
 	match_len = last_slash = i =
 		longest_path_match(name, len, removal.buf, removal.len,
 				   &previous_slash);
diff --git a/t/Makefile b/t/Makefile
index 882d26eee3..46cd5fc527 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -71,12 +71,10 @@ clean-chainlint:
 
 check-chainlint:
 	@mkdir -p '$(CHAINLINTTMP_SQ)' && \
-	err=0 && \
-	for i in $(CHAINLINTTESTS); do \
-		$(CHAINLINT) <chainlint/$$i.test | \
-		sed -e '/^# LINT: /d' >'$(CHAINLINTTMP_SQ)'/$$i.actual && \
-		diff -u chainlint/$$i.expect '$(CHAINLINTTMP_SQ)'/$$i.actual || err=1; \
-	done && exit $$err
+	sed -e '/^# LINT: /d' $(patsubst %,chainlint/%.test,$(CHAINLINTTESTS)) >'$(CHAINLINTTMP_SQ)'/tests && \
+	sed -e '/^[ 	]*$$/d' $(patsubst %,chainlint/%.expect,$(CHAINLINTTESTS)) >'$(CHAINLINTTMP_SQ)'/expect && \
+	$(CHAINLINT) '$(CHAINLINTTMP_SQ)'/tests | grep -v '^[	]*$$' >'$(CHAINLINTTMP_SQ)'/actual && \
+	diff -u '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual
 
 test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
 	test-lint-filenames
diff --git a/t/README b/t/README
index 29f72354bf..f48e0542cd 100644
--- a/t/README
+++ b/t/README
@@ -466,6 +466,12 @@ explicitly providing repositories when accessing submodule objects is
 complete or needs to be abandoned for whatever reason (in which case the
 migrated codepaths still retain their performance benefits).
 
+GIT_TEST_REQUIRE_PREREQ=<list> allows specifying a space separated list of
+prereqs that are required to succeed. If a prereq in this list is triggered by
+a test and then fails then the whole test run will abort. This can help to make
+sure the expected tests are executed and not silently skipped when their
+dependency breaks or is simply not present in a new environment.
+
 Naming Tests
 ------------
 
diff --git a/t/aggregate-results.sh b/t/aggregate-results.sh
index 7913e206ed..7f2b83bdc8 100755
--- a/t/aggregate-results.sh
+++ b/t/aggregate-results.sh
@@ -6,6 +6,7 @@ success=0
 failed=0
 broken=0
 total=0
+missing_prereq=
 
 while read file
 do
@@ -30,10 +31,26 @@ do
 			broken=$(($broken + $value)) ;;
 		total)
 			total=$(($total + $value)) ;;
+		missing_prereq)
+			missing_prereq="$missing_prereq,$value" ;;
 		esac
 	done <"$file"
 done
 
+if test -n "$missing_prereq"
+then
+	unique_missing_prereq=$(
+		echo $missing_prereq |
+		tr -s "," "\n" |
+		grep -v '^$' |
+		sort -u |
+		paste -s -d ' ')
+	if test -n "$unique_missing_prereq"
+	then
+		printf "\nmissing prereq: $unique_missing_prereq\n\n"
+	fi
+fi
+
 if test -n "$failed_tests"
 then
 	printf "\nfailed test(s):$failed_tests\n\n"
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index d3b299e75c..09e86f9ba0 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -161,7 +161,7 @@ test_expect_success 'blame huge graft' '
 			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
 			git commit -a -m "$i$j" &&
 			commit=$(git rev-parse --verify HEAD) &&
-			graft="$graft$commit "
+			graft="$graft$commit " || return 1
 		done
 	done &&
 	printf "%s " $graft >.git/info/grafts &&
diff --git a/t/chainlint.sed b/t/chainlint.sed
index 8a25c5b855..dc4ce37cb5 100644
--- a/t/chainlint.sed
+++ b/t/chainlint.sed
@@ -24,9 +24,9 @@
 # in order to avoid misinterpreting the ")" in constructs such as "x=$(...)"
 # and "case $x in *)" as ending the subshell.
 #
-# Lines missing a final "&&" are flagged with "?!AMP?!", and lines which chain
-# commands with ";" internally rather than "&&" are flagged "?!SEMI?!". A line
-# may be flagged for both violations.
+# Lines missing a final "&&" are flagged with "?!AMP?!", as are lines which
+# chain commands with ";" internally rather than "&&". A line may be flagged
+# for both violations.
 #
 # Detection of a missing &&-link in a multi-line subshell is complicated by the
 # fact that the last statement before the closing ")" must not end with "&&".
@@ -47,8 +47,8 @@
 # "?!AMP?!" violation is removed from the "bar" line (retrieved from the "hold"
 # area) since the final statement of a subshell must not end with "&&". The
 # final line of a subshell may still break the &&-chain by using ";" internally
-# to chain commands together rather than "&&", so "?!SEMI?!" is never removed
-# from a line (even though "?!AMP?!" might be).
+# to chain commands together rather than "&&", but an internal "?!AMP?!" is
+# never removed from a line even though a line-ending "?!AMP?!" might be.
 #
 # Care is taken to recognize the last _statement_ of a multi-line subshell, not
 # necessarily the last textual _line_ within the subshell, since &&-chaining
@@ -62,26 +62,20 @@
 # receives similar treatment.
 #
 # Swallowing here-docs with arbitrary tags requires a bit of finesse. When a
-# line such as "cat <<EOF >out" is seen, the here-doc tag is moved to the front
-# of the line enclosed in angle brackets as a sentinel, giving "<EOF>cat >out".
+# line such as "cat <<EOF" is seen, the here-doc tag is copied to the front of
+# the line enclosed in angle brackets as a sentinel, giving "<EOF>cat <<EOF".
 # As each subsequent line is read, it is appended to the target line and a
 # (whitespace-loose) back-reference match /^<(.*)>\n\1$/ is attempted to see if
 # the content inside "<...>" matches the entirety of the newly-read line. For
 # instance, if the next line read is "some data", when concatenated with the
-# target line, it becomes "<EOF>cat >out\nsome data", and a match is attempted
+# target line, it becomes "<EOF>cat <<EOF\nsome data", and a match is attempted
 # to see if "EOF" matches "some data". Since it doesn't, the next line is
 # attempted. When a line consisting of only "EOF" (and possible whitespace) is
-# encountered, it is appended to the target line giving "<EOF>cat >out\nEOF",
+# encountered, it is appended to the target line giving "<EOF>cat <<EOF\nEOF",
 # in which case the "EOF" inside "<...>" does match the text following the
 # newline, thus the closing here-doc tag has been found. The closing tag line
 # and the "<...>" prefix on the target line are then discarded, leaving just
-# the target line "cat >out".
-#
-# To facilitate regression testing (and manual debugging), a ">" annotation is
-# applied to the line containing ")" which closes a subshell, ">>" to a line
-# closing a nested subshell, and ">>>" to a line closing both at once. This
-# makes it easy to detect whether the heuristics correctly identify
-# end-of-subshell.
+# the target line "cat <<EOF".
 #------------------------------------------------------------------------------
 
 # incomplete line -- slurp up next line
@@ -94,9 +88,9 @@
 
 # here-doc -- swallow it to avoid false hits within its body (but keep the
 # command to which it was attached)
-/<<[ 	]*[-\\'"]*[A-Za-z0-9_]/ {
-	s/^\(.*\)<<[ 	]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
-	s/[ 	]*<<//
+/<<-*[ 	]*[\\'"]*[A-Za-z0-9_]/ {
+	/"[^"]*<<[^"]*"/bnotdoc
+	s/^\(.*<<-*[ 	]*\)[\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1\2/
 	:hered
 	N
 	/^<\([^>]*\)>.*\n[ 	]*\1[ 	]*$/!{
@@ -106,6 +100,7 @@
 	s/^<[^>]*>//
 	s/\n.*$//
 }
+:notdoc
 
 # one-liner "(...) &&"
 /^[ 	]*!*[ 	]*(..*)[ 	]*&&[ 	]*$/boneline
@@ -126,7 +121,7 @@ b
 # "&&" (but not ";" in a string)
 :oneline
 /;/{
-	/"[^"]*;[^"]*"/!s/^/?!SEMI?!/
+	/"[^"]*;[^"]*"/!s/;/; ?!AMP?!/
 }
 b
 
@@ -136,11 +131,15 @@ b
 	h
 	bnextln
 }
-# "(..." line -- split off and stash "(", then process "..." as its own line
+# "(..." line -- "(" opening subshell cuddled with command; temporarily replace
+# "(" with sentinel "^" and process the line as if "(" had been seen solo on
+# the preceding line; this temporary replacement prevents several rules from
+# accidentally thinking "(" introduces a nested subshell; "^" is changed back
+# to "(" at output time
 x
-s/.*/(/
+s/.*//
 x
-s/(//
+s/(/^/
 bslurp
 
 :nextln
@@ -157,8 +156,10 @@ s/.*\n//
 	/"[^'"]*'[^'"]*"/!bsqstr
 }
 :folded
-# here-doc -- swallow it
-/<<[ 	]*[-\\'"]*[A-Za-z0-9_]/bheredoc
+# here-doc -- swallow it (but not "<<" in a string)
+/<<-*[ 	]*[\\'"]*[A-Za-z0-9_]/{
+	/"[^"]*<<[^"]*"/!bheredoc
+}
 # comment or empty line -- discard since final non-comment, non-empty line
 # before closing ")", "done", "elsif", "else", or "fi" will need to be
 # re-visited to drop "suspect" marking since final line of those constructs
@@ -171,12 +172,12 @@ s/.*\n//
 	/"[^"]*#[^"]*"/!s/[ 	]#.*$//
 }
 # one-liner "case ... esac"
-/^[ 	]*case[ 	]*..*esac/bchkchn
+/^[ 	^]*case[ 	]*..*esac/bchkchn
 # multi-line "case ... esac"
-/^[ 	]*case[ 	]..*[ 	]in/bcase
+/^[ 	^]*case[ 	]..*[ 	]in/bcase
 # multi-line "for ... done" or "while ... done"
-/^[ 	]*for[ 	]..*[ 	]in/bcont
-/^[ 	]*while[ 	]/bcont
+/^[ 	^]*for[ 	]..*[ 	]in/bcont
+/^[ 	^]*while[ 	]/bcont
 /^[ 	]*do[ 	]/bcont
 /^[ 	]*do[ 	]*$/bcont
 /;[ 	]*do/bcont
@@ -187,7 +188,7 @@ s/.*\n//
 /||[ 	]*exit[ 	]/bcont
 /||[ 	]*exit[ 	]*$/bcont
 # multi-line "if...elsif...else...fi"
-/^[ 	]*if[ 	]/bcont
+/^[ 	^]*if[ 	]/bcont
 /^[ 	]*then[ 	]/bcont
 /^[ 	]*then[ 	]*$/bcont
 /;[ 	]*then/bcont
@@ -200,15 +201,15 @@ s/.*\n//
 /^[ 	]*fi[ 	]*[<>|]/bdone
 /^[ 	]*fi[ 	]*)/bdone
 # nested one-liner "(...) &&"
-/^[ 	]*(.*)[ 	]*&&[ 	]*$/bchkchn
+/^[ 	^]*(.*)[ 	]*&&[ 	]*$/bchkchn
 # nested one-liner "(...)"
-/^[ 	]*(.*)[ 	]*$/bchkchn
+/^[ 	^]*(.*)[ 	]*$/bchkchn
 # nested one-liner "(...) >x" (or "2>x" or "<x" or "|x")
-/^[ 	]*(.*)[ 	]*[0-9]*[<>|]/bchkchn
+/^[ 	^]*(.*)[ 	]*[0-9]*[<>|]/bchkchn
 # nested multi-line "(...\n...)"
-/^[ 	]*(/bnest
+/^[ 	^]*(/bnest
 # multi-line "{...\n...}"
-/^[ 	]*{/bblock
+/^[ 	^]*{/bblock
 # closing ")" on own line -- exit subshell
 /^[ 	]*)/bclssolo
 # "$((...))" -- arithmetic expansion; not closing ")"
@@ -230,16 +231,18 @@ s/.*\n//
 # string and not ";;" in one-liner "case...esac")
 /;/{
 	/;;/!{
-		/"[^"]*;[^"]*"/!s/^/?!SEMI?!/
+		/"[^"]*;[^"]*"/!s/;/; ?!AMP?!/
 	}
 }
 # line ends with pipe "...|" -- valid; not missing "&&"
 /|[ 	]*$/bcont
 # missing end-of-line "&&" -- mark suspect
-/&&[ 	]*$/!s/^/?!AMP?!/
+/&&[ 	]*$/!s/$/ ?!AMP?!/
 :cont
 # retrieve and print previous line
 x
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 n
 bslurp
 
@@ -280,8 +283,7 @@ bfolded
 # found here-doc -- swallow it to avoid false hits within its body (but keep
 # the command to which it was attached)
 :heredoc
-s/^\(.*\)<<[ 	]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
-s/[ 	]*<<//
+s/^\(.*\)<<\(-*[ 	]*\)[\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\3>\1?!HERE?!\2\3/
 :hdocsub
 N
 /^<\([^>]*\)>.*\n[ 	]*\1[ 	]*$/!{
@@ -295,7 +297,15 @@ bfolded
 # found "case ... in" -- pass through untouched
 :case
 x
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 n
+:cascom
+/^[ 	]*#/{
+	N
+	s/.*\n//
+	bcascom
+}
 /^[ 	]*esac/bslurp
 bcase
 
@@ -303,7 +313,7 @@ bcase
 # that line legitimately lacks "&&"
 :else
 x
-s/?!AMP?!//
+s/\( ?!AMP?!\)* ?!AMP?!$//
 x
 bcont
 
@@ -311,7 +321,7 @@ bcont
 # "suspect" from final contained line since that line legitimately lacks "&&"
 :done
 x
-s/?!AMP?!//
+s/\( ?!AMP?!\)* ?!AMP?!$//
 x
 # is 'done' or 'fi' cuddled with ")" to close subshell?
 /done.*)/bclose
@@ -322,11 +332,18 @@ bchkchn
 :nest
 x
 :nstslrp
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 n
+:nstcom
+# comment -- not closing ")" if in comment
+/^[ 	]*#/{
+	N
+	s/.*\n//
+	bnstcom
+}
 # closing ")" on own line -- stop nested slurp
 /^[ 	]*)/bnstcl
-# comment -- not closing ")" if in comment
-/^[ 	]*#/bnstcnt
 # "$((...))" -- arithmetic expansion; not closing ")"
 /\$(([^)][^)]*))[^)]*$/bnstcnt
 # "$(...)" -- command substitution; not closing ")"
@@ -337,7 +354,6 @@ n
 x
 bnstslrp
 :nstcl
-s/^/>>/
 # is it "))" which closes nested and parent subshells?
 /)[ 	]*)/bslurp
 bchkchn
@@ -345,7 +361,15 @@ bchkchn
 # found multi-line "{...\n...}" block -- pass through untouched
 :block
 x
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 n
+:blkcom
+/^[ 	]*#/{
+	N
+	s/.*\n//
+	bblkcom
+}
 # closing "}" -- stop block slurp
 /}/bchkchn
 bblock
@@ -354,16 +378,22 @@ bblock
 # since that line legitimately lacks "&&" and exit subshell loop
 :clssolo
 x
-s/?!AMP?!//
+s/\( ?!AMP?!\)* ?!AMP?!$//
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 p
 x
-s/^/>/
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 b
 
 # found closing "...)" -- exit subshell loop
 :close
 x
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 p
 x
-s/^/>/
+s/^\([ 	]*\)^/\1(/
+s/?!HERE?!/<</g
 b
diff --git a/t/chainlint/arithmetic-expansion.expect b/t/chainlint/arithmetic-expansion.expect
index 09457d3196..46ee1046af 100644
--- a/t/chainlint/arithmetic-expansion.expect
+++ b/t/chainlint/arithmetic-expansion.expect
@@ -2,8 +2,8 @@
 	foo &&
 	bar=$((42 + 1)) &&
 	baz
->) &&
+) &&
 (
-?!AMP?!	bar=$((42 + 1))
+	bar=$((42 + 1)) ?!AMP?!
 	baz
->)
+)
diff --git a/t/chainlint/bash-array.expect b/t/chainlint/bash-array.expect
index c4a830d1c1..4c34eaee45 100644
--- a/t/chainlint/bash-array.expect
+++ b/t/chainlint/bash-array.expect
@@ -2,9 +2,9 @@
 	foo &&
 	bar=(gumbo stumbo wumbo) &&
 	baz
->) &&
+) &&
 (
 	foo &&
 	bar=${#bar[@]} &&
 	baz
->)
+)
diff --git a/t/chainlint/blank-line.expect b/t/chainlint/blank-line.expect
index 3be939ed38..f76fde1ffb 100644
--- a/t/chainlint/blank-line.expect
+++ b/t/chainlint/blank-line.expect
@@ -1,4 +1,4 @@
 (
 	nothing &&
 	something
->)
+)
diff --git a/t/chainlint/blank-line.test b/t/chainlint/blank-line.test
index f6dd14302b..0fdf15b3e1 100644
--- a/t/chainlint/blank-line.test
+++ b/t/chainlint/blank-line.test
@@ -3,7 +3,7 @@
 	nothing &&
 
 	something
-# LINT: swallow blank lines since final _statement_ before subshell end is
+# LINT: ignore blank lines since final _statement_ before subshell end is
 # LINT: significant to "&&"-check, not final _line_ (which might be blank)
 
 
diff --git a/t/chainlint/block-comment.expect b/t/chainlint/block-comment.expect
new file mode 100644
index 0000000000..d10b2eeaf2
--- /dev/null
+++ b/t/chainlint/block-comment.expect
@@ -0,0 +1,6 @@
+(
+	{
+		echo a &&
+		echo b
+	}
+)
diff --git a/t/chainlint/block-comment.test b/t/chainlint/block-comment.test
new file mode 100644
index 0000000000..df2beea888
--- /dev/null
+++ b/t/chainlint/block-comment.test
@@ -0,0 +1,8 @@
+(
+	{
+		# show a
+		echo a &&
+		# show b
+		echo b
+	}
+)
diff --git a/t/chainlint/block.expect b/t/chainlint/block.expect
index fed7e89ae8..da60257ebc 100644
--- a/t/chainlint/block.expect
+++ b/t/chainlint/block.expect
@@ -7,6 +7,6 @@
 	bar &&
 	{
 		echo c
-?!AMP?!	}
+	} ?!AMP?!
 	baz
->)
+)
diff --git a/t/chainlint/block.test b/t/chainlint/block.test
index d859151af1..0a82fd579f 100644
--- a/t/chainlint/block.test
+++ b/t/chainlint/block.test
@@ -1,6 +1,5 @@
 (
-# LINT: missing "&&" in block not currently detected (for consistency with
-# LINT: --chain-lint at top level and to provide escape hatch if needed)
+# LINT: missing "&&" after first "echo"
 	foo &&
 	{
 		echo a
diff --git a/t/chainlint/broken-chain.expect b/t/chainlint/broken-chain.expect
index 55b0f42a53..cfb58fb6b9 100644
--- a/t/chainlint/broken-chain.expect
+++ b/t/chainlint/broken-chain.expect
@@ -1,6 +1,6 @@
 (
 	foo &&
-?!AMP?!	bar
+	bar ?!AMP?!
 	baz &&
 	wop
->)
+)
diff --git a/t/chainlint/broken-chain.test b/t/chainlint/broken-chain.test
index 3cc67b65d0..2a44aa73b7 100644
--- a/t/chainlint/broken-chain.test
+++ b/t/chainlint/broken-chain.test
@@ -1,6 +1,6 @@
 (
 	foo &&
-# LINT: missing "&&" from 'bar'
+# LINT: missing "&&" from "bar"
 	bar
 	baz &&
 # LINT: final statement before closing ")" legitimately lacks "&&"
diff --git a/t/chainlint/case-comment.expect b/t/chainlint/case-comment.expect
new file mode 100644
index 0000000000..1e4b054bda
--- /dev/null
+++ b/t/chainlint/case-comment.expect
@@ -0,0 +1,8 @@
+(
+	case "$x" in
+	x) foo ;;
+	*)
+		bar
+		;;
+	esac
+)
diff --git a/t/chainlint/case-comment.test b/t/chainlint/case-comment.test
new file mode 100644
index 0000000000..641c157b98
--- /dev/null
+++ b/t/chainlint/case-comment.test
@@ -0,0 +1,11 @@
+(
+	case "$x" in
+	# found foo
+	x) foo ;;
+	# found other
+	*)
+		# treat it as bar
+		bar
+		;;
+	esac
+)
diff --git a/t/chainlint/case.expect b/t/chainlint/case.expect
index 41f121fbbf..31f280d8ce 100644
--- a/t/chainlint/case.expect
+++ b/t/chainlint/case.expect
@@ -4,16 +4,16 @@
 	*) bar ;;
 	esac &&
 	foobar
->) &&
+) &&
 (
 	case "$x" in
 	x) foo ;;
 	*) bar ;;
-?!AMP?!	esac
+	esac ?!AMP?!
 	foobar
->) &&
+) &&
 (
 	case "$x" in 1) true;; esac &&
-?!AMP?!	case "$y" in 2) false;; esac
+	case "$y" in 2) false;; esac ?!AMP?!
 	foobar
->)
+)
diff --git a/t/chainlint/case.test b/t/chainlint/case.test
index 5ef6ff7db5..4cb086bf87 100644
--- a/t/chainlint/case.test
+++ b/t/chainlint/case.test
@@ -1,5 +1,5 @@
 (
-# LINT: "...)" arms in 'case' not misinterpreted as subshell-closing ")"
+# LINT: "...)" arms in "case" not misinterpreted as subshell-closing ")"
 	case "$x" in
 	x) foo ;;
 	*) bar ;;
@@ -7,7 +7,7 @@
 	foobar
 ) &&
 (
-# LINT: missing "&&" on 'esac'
+# LINT: missing "&&" on "esac"
 	case "$x" in
 	x) foo ;;
 	*) bar ;;
@@ -15,7 +15,7 @@
 	foobar
 ) &&
 (
-# LINT: "...)" arm in one-liner 'case' not misinterpreted as closing ")"
+# LINT: "...)" arm in one-liner "case" not misinterpreted as closing ")"
 	case "$x" in 1) true;; esac &&
 # LINT: same but missing "&&"
 	case "$y" in 2) false;; esac
diff --git a/t/chainlint/close-nested-and-parent-together.expect b/t/chainlint/close-nested-and-parent-together.expect
index 2a910f9d66..72d482f76d 100644
--- a/t/chainlint/close-nested-and-parent-together.expect
+++ b/t/chainlint/close-nested-and-parent-together.expect
@@ -1,4 +1,3 @@
-(
-cd foo &&
+(cd foo &&
 	(bar &&
->>>		baz))
+		baz))
diff --git a/t/chainlint/close-subshell.expect b/t/chainlint/close-subshell.expect
index 184688718a..0f87db9ae6 100644
--- a/t/chainlint/close-subshell.expect
+++ b/t/chainlint/close-subshell.expect
@@ -1,25 +1,25 @@
 (
 	foo
->) &&
+) &&
 (
 	bar
->) >out &&
+) >out &&
 (
 	baz
->) 2>err &&
+) 2>err &&
 (
 	boo
->) <input &&
+) <input &&
 (
 	bip
->) | wuzzle &&
+) | wuzzle &&
 (
 	bop
->) | fazz 	fozz &&
+) | fazz 	fozz &&
 (
 	bup
->) |
+) |
 fuzzle &&
 (
 	yop
->)
+)
diff --git a/t/chainlint/command-substitution.expect b/t/chainlint/command-substitution.expect
index ad4118e537..c72e4df9e7 100644
--- a/t/chainlint/command-substitution.expect
+++ b/t/chainlint/command-substitution.expect
@@ -2,8 +2,8 @@
 	foo &&
 	bar=$(gobble) &&
 	baz
->) &&
+) &&
 (
-?!AMP?!	bar=$(gobble blocks)
+	bar=$(gobble blocks) ?!AMP?!
 	baz
->)
+)
diff --git a/t/chainlint/comment.expect b/t/chainlint/comment.expect
index 3be939ed38..f76fde1ffb 100644
--- a/t/chainlint/comment.expect
+++ b/t/chainlint/comment.expect
@@ -1,4 +1,4 @@
 (
 	nothing &&
 	something
->)
+)
diff --git a/t/chainlint/complex-if-in-cuddled-loop.expect b/t/chainlint/complex-if-in-cuddled-loop.expect
index 9674b88cf2..2fca183409 100644
--- a/t/chainlint/complex-if-in-cuddled-loop.expect
+++ b/t/chainlint/complex-if-in-cuddled-loop.expect
@@ -1,10 +1,9 @@
-(
-for i in a b c; do
+(for i in a b c; do
    if test "$(echo $(waffle bat))" = "eleventeen" &&
      test "$x" = "$y"; then
      :
    else
      echo >file
    fi
-> done) &&
+ done) &&
 test ! -f file
diff --git a/t/chainlint/complex-if-in-cuddled-loop.test b/t/chainlint/complex-if-in-cuddled-loop.test
index 571bbd85cd..5efeda58b2 100644
--- a/t/chainlint/complex-if-in-cuddled-loop.test
+++ b/t/chainlint/complex-if-in-cuddled-loop.test
@@ -1,4 +1,4 @@
-# LINT: 'for' loop cuddled with "(" and ")" and nested 'if' with complex
+# LINT: "for" loop cuddled with "(" and ")" and nested "if" with complex
 # LINT: multi-line condition; indented with spaces, not tabs
 (for i in a b c; do
    if test "$(echo $(waffle bat))" = "eleventeen" &&
diff --git a/t/chainlint/cuddled-if-then-else.expect b/t/chainlint/cuddled-if-then-else.expect
index ab2a026fbc..1d8ed58c49 100644
--- a/t/chainlint/cuddled-if-then-else.expect
+++ b/t/chainlint/cuddled-if-then-else.expect
@@ -1,7 +1,6 @@
-(
-if test -z ""; then
+(if test -z ""; then
     echo empty
  else
     echo bizzy
-> fi) &&
+ fi) &&
 echo foobar
diff --git a/t/chainlint/cuddled-if-then-else.test b/t/chainlint/cuddled-if-then-else.test
index eed774a9d6..7c53f4efe3 100644
--- a/t/chainlint/cuddled-if-then-else.test
+++ b/t/chainlint/cuddled-if-then-else.test
@@ -1,4 +1,4 @@
-# LINT: 'if' cuddled with "(" and ")"; indented with spaces, not tabs
+# LINT: "if" cuddled with "(" and ")"; indented with spaces, not tabs
 (if test -z ""; then
     echo empty
  else
diff --git a/t/chainlint/cuddled-loop.expect b/t/chainlint/cuddled-loop.expect
index 8c0260d7f1..9cf260708e 100644
--- a/t/chainlint/cuddled-loop.expect
+++ b/t/chainlint/cuddled-loop.expect
@@ -1,5 +1,4 @@
-(
- while read x
+( while read x
   do foobar bop || exit 1
->  done <file ) &&
+  done <file ) &&
 outside subshell
diff --git a/t/chainlint/cuddled-loop.test b/t/chainlint/cuddled-loop.test
index a841d781f0..3c2a62f751 100644
--- a/t/chainlint/cuddled-loop.test
+++ b/t/chainlint/cuddled-loop.test
@@ -1,4 +1,4 @@
-# LINT: 'while' loop cuddled with "(" and ")", with embedded (allowed)
+# LINT: "while" loop cuddled with "(" and ")", with embedded (allowed)
 # LINT: "|| exit {n}" to exit loop early, and using redirection "<" to feed
 # LINT: loop; indented with spaces, not tabs
 ( while read x
diff --git a/t/chainlint/cuddled.expect b/t/chainlint/cuddled.expect
index b506d46221..c3e0be4047 100644
--- a/t/chainlint/cuddled.expect
+++ b/t/chainlint/cuddled.expect
@@ -1,21 +1,17 @@
-(
-cd foo &&
+(cd foo &&
 	bar
->) &&
+) &&
 
-(
-?!AMP?!cd foo
+(cd foo ?!AMP?!
 	bar
->) &&
+) &&
 
 (
 	cd foo &&
->	bar) &&
+	bar) &&
 
-(
-cd foo &&
->	bar) &&
+(cd foo &&
+	bar) &&
 
-(
-?!AMP?!cd foo
->	bar)
+(cd foo ?!AMP?!
+	bar)
diff --git a/t/chainlint/cuddled.test b/t/chainlint/cuddled.test
index 0499fa4180..257b5b5eed 100644
--- a/t/chainlint/cuddled.test
+++ b/t/chainlint/cuddled.test
@@ -1,5 +1,4 @@
-# LINT: first subshell statement cuddled with opening "("; for implementation
-# LINT: simplicity, "(..." is split into two lines, "(" and "..."
+# LINT: first subshell statement cuddled with opening "("
 (cd foo &&
 	bar
 ) &&
diff --git a/t/chainlint/exit-loop.expect b/t/chainlint/exit-loop.expect
index 84d8bdebc0..f76aa60466 100644
--- a/t/chainlint/exit-loop.expect
+++ b/t/chainlint/exit-loop.expect
@@ -5,7 +5,7 @@
 		bar &&
 		baz
 	done
->) &&
+) &&
 (
 	while true
 	do
@@ -13,7 +13,7 @@
 		bar &&
 		baz
 	done
->) &&
+) &&
 (
 	i=0 &&
 	while test $i -lt 10
@@ -21,4 +21,4 @@
 		echo $i || exit
 		i=$(($i + 1))
 	done
->)
+)
diff --git a/t/chainlint/exit-subshell.expect b/t/chainlint/exit-subshell.expect
index bf78454f74..da80339f78 100644
--- a/t/chainlint/exit-subshell.expect
+++ b/t/chainlint/exit-subshell.expect
@@ -2,4 +2,4 @@
 	foo || exit 1
 	bar &&
 	baz
->)
+)
diff --git a/t/chainlint/for-loop.expect b/t/chainlint/for-loop.expect
index c33cf56ee7..6671b8cd84 100644
--- a/t/chainlint/for-loop.expect
+++ b/t/chainlint/for-loop.expect
@@ -1,11 +1,11 @@
 (
 	for i in a b c
 	do
-?!AMP?!		echo $i
-		cat
-?!AMP?!	done
+		echo $i ?!AMP?!
+		cat <<-EOF
+	done ?!AMP?!
 	for i in a b c; do
 		echo $i &&
 		cat $i
 	done
->)
+)
diff --git a/t/chainlint/for-loop.test b/t/chainlint/for-loop.test
index 7db76262bc..6cb3428158 100644
--- a/t/chainlint/for-loop.test
+++ b/t/chainlint/for-loop.test
@@ -1,17 +1,17 @@
 (
-# LINT: 'for', 'do', 'done' do not need "&&"
+# LINT: "for", "do", "done" do not need "&&"
 	for i in a b c
 	do
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
 		echo $i
 # LINT: last statement of while does not need "&&"
 		cat <<-\EOF
 		bar
 		EOF
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
 	done
 
-# LINT: 'do' on same line as 'for'
+# LINT: "do" on same line as "for"
 	for i in a b c; do
 		echo $i &&
 		cat $i
diff --git a/t/chainlint/here-doc-close-subshell.expect b/t/chainlint/here-doc-close-subshell.expect
index f011e335e5..2af9ced71c 100644
--- a/t/chainlint/here-doc-close-subshell.expect
+++ b/t/chainlint/here-doc-close-subshell.expect
@@ -1,2 +1,2 @@
 (
->	cat)
+	cat <<-INPUT)
diff --git a/t/chainlint/here-doc-multi-line-command-subst.expect b/t/chainlint/here-doc-multi-line-command-subst.expect
index e5fb752d2f..f8b3aa73c4 100644
--- a/t/chainlint/here-doc-multi-line-command-subst.expect
+++ b/t/chainlint/here-doc-multi-line-command-subst.expect
@@ -1,5 +1,5 @@
 (
-	x=$(bobble &&
-?!AMP?!>>		wiffle)
+	x=$(bobble <<-END &&
+		wiffle) ?!AMP?!
 	echo $x
->)
+)
diff --git a/t/chainlint/here-doc-multi-line-string.expect b/t/chainlint/here-doc-multi-line-string.expect
index 32038a070c..2578191ca8 100644
--- a/t/chainlint/here-doc-multi-line-string.expect
+++ b/t/chainlint/here-doc-multi-line-string.expect
@@ -1,4 +1,4 @@
 (
-?!AMP?!	cat && echo "multi-line	string"
+	cat <<-TXT && echo "multi-line	string" ?!AMP?!
 	bap
->)
+)
diff --git a/t/chainlint/here-doc.expect b/t/chainlint/here-doc.expect
index 534b065e38..110059ba58 100644
--- a/t/chainlint/here-doc.expect
+++ b/t/chainlint/here-doc.expect
@@ -1,9 +1,7 @@
-boodle wobba        gorgo snoot        wafta snurb &&
+boodle wobba        gorgo snoot        wafta snurb <<EOF &&
 
-cat >foo &&
+cat <<-Arbitrary_Tag_42 >foo &&
 
-cat >bar &&
+cat <<zump >boo &&
 
-cat >boo &&
-
-horticulture
+horticulture <<EOF
diff --git a/t/chainlint/here-doc.test b/t/chainlint/here-doc.test
index ad4ce8afd9..3f5f92cad3 100644
--- a/t/chainlint/here-doc.test
+++ b/t/chainlint/here-doc.test
@@ -14,13 +14,6 @@ boz
 woz
 Arbitrary_Tag_42
 
-# LINT: swallow 'quoted' here-doc
-cat <<'FUMP' >bar &&
-snoz
-boz
-woz
-FUMP
-
 # LINT: swallow "quoted" here-doc
 cat <<"zump" >boo &&
 snoz
diff --git a/t/chainlint/if-in-loop.expect b/t/chainlint/if-in-loop.expect
index 03d3ceb22d..03b82a3e58 100644
--- a/t/chainlint/if-in-loop.expect
+++ b/t/chainlint/if-in-loop.expect
@@ -3,10 +3,10 @@
 	do
 		if false
 		then
-?!AMP?!			echo "err"
+			echo "err" ?!AMP?!
 			exit 1
-?!AMP?!		fi
+		fi ?!AMP?!
 		foo
-?!AMP?!	done
+	done ?!AMP?!
 	bar
->)
+)
diff --git a/t/chainlint/if-in-loop.test b/t/chainlint/if-in-loop.test
index daf22da164..f0cf19cfad 100644
--- a/t/chainlint/if-in-loop.test
+++ b/t/chainlint/if-in-loop.test
@@ -3,13 +3,13 @@
 	do
 		if false
 		then
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
 			echo "err"
 			exit 1
-# LINT: missing "&&" on 'fi'
+# LINT: missing "&&" on "fi"
 		fi
 		foo
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
 	done
 	bar
 )
diff --git a/t/chainlint/if-then-else.expect b/t/chainlint/if-then-else.expect
index 5953c7bfbc..44d86c3597 100644
--- a/t/chainlint/if-then-else.expect
+++ b/t/chainlint/if-then-else.expect
@@ -1,19 +1,20 @@
 (
 	if test -n ""
 	then
-?!AMP?!		echo very
+		echo very ?!AMP?!
 		echo empty
 	elif test -z ""
+	then
 		echo foo
 	else
 		echo foo &&
-		cat
-?!AMP?!	fi
+		cat <<-EOF
+	fi ?!AMP?!
 	echo poodle
->) &&
+) &&
 (
 	if test -n ""; then
 		echo very &&
-?!AMP?!		echo empty
-	if
->)
+		echo empty
+	fi
+)
diff --git a/t/chainlint/if-then-else.test b/t/chainlint/if-then-else.test
index 9bd8e9a4c6..2055336c2b 100644
--- a/t/chainlint/if-then-else.test
+++ b/t/chainlint/if-then-else.test
@@ -1,28 +1,29 @@
 (
-# LINT: 'if', 'then', 'elif', 'else', 'fi' do not need "&&"
+# LINT: "if", "then", "elif", "else", "fi" do not need "&&"
 	if test -n ""
 	then
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
 		echo very
-# LINT: last statement before 'elif' does not need "&&"
+# LINT: last statement before "elif" does not need "&&"
 		echo empty
 	elif test -z ""
-# LINT: last statement before 'else' does not need "&&"
+	then
+# LINT: last statement before "else" does not need "&&"
 		echo foo
 	else
 		echo foo &&
-# LINT: last statement before 'fi' does not need "&&"
+# LINT: last statement before "fi" does not need "&&"
 		cat <<-\EOF
 		bar
 		EOF
-# LINT: missing "&&" on 'fi'
+# LINT: missing "&&" on "fi"
 	fi
 	echo poodle
 ) &&
 (
-# LINT: 'then' on same line as 'if'
+# LINT: "then" on same line as "if"
 	if test -n ""; then
 		echo very &&
 		echo empty
-	if
+	fi
 )
diff --git a/t/chainlint/incomplete-line.expect b/t/chainlint/incomplete-line.expect
index 2f3ebabdc2..ffac8f9018 100644
--- a/t/chainlint/incomplete-line.expect
+++ b/t/chainlint/incomplete-line.expect
@@ -1,4 +1,4 @@
 line 1 line 2 line 3 line 4 &&
 (
 	line 5 	line 6 	line 7 	line 8
->)
+)
diff --git a/t/chainlint/inline-comment.expect b/t/chainlint/inline-comment.expect
index fc9f250ac4..dd0dace077 100644
--- a/t/chainlint/inline-comment.expect
+++ b/t/chainlint/inline-comment.expect
@@ -1,9 +1,8 @@
 (
 	foobar &&
-?!AMP?!	barfoo
+	barfoo ?!AMP?!
 	flibble "not a # comment"
->) &&
+) &&
 
-(
-cd foo &&
->	flibble "not a # comment")
+(cd foo &&
+	flibble "not a # comment")
diff --git a/t/chainlint/loop-in-if.expect b/t/chainlint/loop-in-if.expect
index 088e622c31..e1be42376c 100644
--- a/t/chainlint/loop-in-if.expect
+++ b/t/chainlint/loop-in-if.expect
@@ -3,10 +3,10 @@
 	then
 		while true
 		do
-?!AMP?!			echo "pop"
+			echo "pop" ?!AMP?!
 			echo "glup"
-?!AMP?!		done
+		done ?!AMP?!
 		foo
-?!AMP?!	fi
+	fi ?!AMP?!
 	bar
->)
+)
diff --git a/t/chainlint/loop-in-if.test b/t/chainlint/loop-in-if.test
index 93e8ba8e4d..dfcc3f98fb 100644
--- a/t/chainlint/loop-in-if.test
+++ b/t/chainlint/loop-in-if.test
@@ -3,13 +3,13 @@
 	then
 		while true
 		do
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
 			echo "pop"
 			echo "glup"
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
 		done
 		foo
-# LINT: missing "&&" on 'fi'
+# LINT: missing "&&" on "fi"
 	fi
 	bar
 )
diff --git a/t/chainlint/multi-line-nested-command-substitution.expect b/t/chainlint/multi-line-nested-command-substitution.expect
index 59b6c8b850..300058341b 100644
--- a/t/chainlint/multi-line-nested-command-substitution.expect
+++ b/t/chainlint/multi-line-nested-command-substitution.expect
@@ -3,16 +3,16 @@
 	x=$(
 		echo bar |
 		cat
->>	) &&
+	) &&
 	echo ok
->) |
+) |
 sort &&
 (
 	bar &&
 	x=$(echo bar |
 		cat
->>	) &&
+	) &&
 	y=$(echo baz |
->>		fip) &&
+		fip) &&
 	echo fail
->)
+)
diff --git a/t/chainlint/multi-line-string.expect b/t/chainlint/multi-line-string.expect
index 170cb59993..ab0dadf748 100644
--- a/t/chainlint/multi-line-string.expect
+++ b/t/chainlint/multi-line-string.expect
@@ -1,15 +1,9 @@
 (
 	x="line 1		line 2		line 3" &&
-?!AMP?!	y='line 1		line2'
+	y="line 1		line2" ?!AMP?!
 	foobar
->) &&
-(
-	echo "there's nothing to see here" &&
-	exit
->) &&
+) &&
 (
 	echo "xyz" "abc		def		ghi" &&
-	echo 'xyz' 'abc		def		ghi' &&
-	echo 'xyz' "abc		def		ghi" &&
 	barfoo
->)
+)
diff --git a/t/chainlint/multi-line-string.test b/t/chainlint/multi-line-string.test
index 287ab89705..4a0af2107d 100644
--- a/t/chainlint/multi-line-string.test
+++ b/t/chainlint/multi-line-string.test
@@ -3,25 +3,13 @@
 		line 2
 		line 3" &&
 # LINT: missing "&&" on assignment
-	y='line 1
-		line2'
+	y="line 1
+		line2"
 	foobar
 ) &&
 (
-# LINT: apostrophe (in a contraction) within string not misinterpreted as
-# LINT: starting multi-line single-quoted string
-	echo "there's nothing to see here" &&
-	exit
-) &&
-(
 	echo "xyz" "abc
 		def
 		ghi" &&
-	echo 'xyz' 'abc
-		def
-		ghi' &&
-	echo 'xyz' "abc
-		def
-		ghi" &&
 	barfoo
 )
diff --git a/t/chainlint/negated-one-liner.expect b/t/chainlint/negated-one-liner.expect
index cf18429d03..ad4c2d949e 100644
--- a/t/chainlint/negated-one-liner.expect
+++ b/t/chainlint/negated-one-liner.expect
@@ -1,5 +1,5 @@
 ! (foo && bar) &&
 ! (foo && bar) >baz &&
 
-?!SEMI?!! (foo; bar) &&
-?!SEMI?!! (foo; bar) >baz
+! (foo; ?!AMP?! bar) &&
+! (foo; ?!AMP?! bar) >baz
diff --git a/t/chainlint/nested-cuddled-subshell.expect b/t/chainlint/nested-cuddled-subshell.expect
index c2a59ffc33..2a86885ee6 100644
--- a/t/chainlint/nested-cuddled-subshell.expect
+++ b/t/chainlint/nested-cuddled-subshell.expect
@@ -1,19 +1,19 @@
 (
 	(cd foo &&
 		bar
->>	) &&
+	) &&
 	(cd foo &&
 		bar
-?!AMP?!>>	)
+	) ?!AMP?!
 	(
 		cd foo &&
->>		bar) &&
+		bar) &&
 	(
 		cd foo &&
-?!AMP?!>>		bar)
+		bar) ?!AMP?!
 	(cd foo &&
->>		bar) &&
+		bar) &&
 	(cd foo &&
-?!AMP?!>>		bar)
+		bar) ?!AMP?!
 	foobar
->)
+)
diff --git a/t/chainlint/nested-here-doc.expect b/t/chainlint/nested-here-doc.expect
index 0c9ef1cfc6..e3bef63f75 100644
--- a/t/chainlint/nested-here-doc.expect
+++ b/t/chainlint/nested-here-doc.expect
@@ -1,7 +1,7 @@
-cat >foop &&
+cat <<ARBITRARY >foop &&
 
 (
-	cat &&
-?!AMP?!	cat
+	cat <<-INPUT_END &&
+	cat <<-EOT ?!AMP?!
 	foobar
->)
+)
diff --git a/t/chainlint/nested-subshell-comment.expect b/t/chainlint/nested-subshell-comment.expect
index 15b68d4373..be4b27a305 100644
--- a/t/chainlint/nested-subshell-comment.expect
+++ b/t/chainlint/nested-subshell-comment.expect
@@ -2,10 +2,8 @@
 	foo &&
 	(
 		bar &&
-		# bottles wobble while fiddles gobble
-		# minor numbers of cows (or do they?)
 		baz &&
 		snaff
-?!AMP?!>>	)
+	) ?!AMP?!
 	fuzzy
->)
+)
diff --git a/t/chainlint/nested-subshell-comment.test b/t/chainlint/nested-subshell-comment.test
index 0ff136ab3c..0215cdb192 100644
--- a/t/chainlint/nested-subshell-comment.test
+++ b/t/chainlint/nested-subshell-comment.test
@@ -7,7 +7,7 @@
 		# minor numbers of cows (or do they?)
 		baz &&
 		snaff
-# LINT: missing "&&" on ')'
+# LINT: missing "&&" on ")"
 	)
 	fuzzy
 )
diff --git a/t/chainlint/nested-subshell.expect b/t/chainlint/nested-subshell.expect
index c8165ad19e..41a48adaa2 100644
--- a/t/chainlint/nested-subshell.expect
+++ b/t/chainlint/nested-subshell.expect
@@ -3,10 +3,10 @@
 	(
 		echo a &&
 		echo b
->>	) >file &&
+	) >file &&
 	cd foo &&
 	(
 		echo a
 		echo b
->>	) >file
->)
+	) >file
+)
diff --git a/t/chainlint/nested-subshell.test b/t/chainlint/nested-subshell.test
index 998b05a47d..440ee9992d 100644
--- a/t/chainlint/nested-subshell.test
+++ b/t/chainlint/nested-subshell.test
@@ -7,7 +7,6 @@
 
 	cd foo &&
 	(
-# LINT: nested multi-line subshell not presently checked for missing "&&"
 		echo a
 		echo b
 	) >file
diff --git a/t/chainlint/not-heredoc.expect b/t/chainlint/not-heredoc.expect
new file mode 100644
index 0000000000..2e9bb135fe
--- /dev/null
+++ b/t/chainlint/not-heredoc.expect
@@ -0,0 +1,14 @@
+echo "<<<<<<< ours" &&
+echo ourside &&
+echo "=======" &&
+echo theirside &&
+echo ">>>>>>> theirs" &&
+
+(
+	echo "<<<<<<< ours" &&
+	echo ourside &&
+	echo "=======" &&
+	echo theirside &&
+	echo ">>>>>>> theirs" ?!AMP?!
+	poodle
+) >merged
diff --git a/t/chainlint/not-heredoc.test b/t/chainlint/not-heredoc.test
new file mode 100644
index 0000000000..9aa57346cd
--- /dev/null
+++ b/t/chainlint/not-heredoc.test
@@ -0,0 +1,16 @@
+# LINT: "<< ours" inside string is not here-doc
+echo "<<<<<<< ours" &&
+echo ourside &&
+echo "=======" &&
+echo theirside &&
+echo ">>>>>>> theirs" &&
+
+(
+# LINT: "<< ours" inside string is not here-doc
+	echo "<<<<<<< ours" &&
+	echo ourside &&
+	echo "=======" &&
+	echo theirside &&
+	echo ">>>>>>> theirs"
+	poodle
+) >merged
diff --git a/t/chainlint/one-liner.expect b/t/chainlint/one-liner.expect
index 237f227349..57a7a444c1 100644
--- a/t/chainlint/one-liner.expect
+++ b/t/chainlint/one-liner.expect
@@ -2,8 +2,8 @@
 (foo && bar) |
 (foo && bar) >baz &&
 
-?!SEMI?!(foo; bar) &&
-?!SEMI?!(foo; bar) |
-?!SEMI?!(foo; bar) >baz
+(foo; ?!AMP?! bar) &&
+(foo; ?!AMP?! bar) |
+(foo; ?!AMP?! bar) >baz &&
 
 (foo "bar; baz")
diff --git a/t/chainlint/one-liner.test b/t/chainlint/one-liner.test
index ec9acb9825..be9858fa29 100644
--- a/t/chainlint/one-liner.test
+++ b/t/chainlint/one-liner.test
@@ -3,10 +3,10 @@
 (foo && bar) |
 (foo && bar) >baz &&
 
-# LINT: top-level one-liner subshell missing internal "&&"
+# LINT: top-level one-liner subshell missing internal "&&" and broken &&-chain
 (foo; bar) &&
 (foo; bar) |
-(foo; bar) >baz
+(foo; bar) >baz &&
 
 # LINT: ";" in string not misinterpreted as broken &&-chain
 (foo "bar; baz")
diff --git a/t/chainlint/p4-filespec.expect b/t/chainlint/p4-filespec.expect
index 98b3d881fd..1290fd1ff2 100644
--- a/t/chainlint/p4-filespec.expect
+++ b/t/chainlint/p4-filespec.expect
@@ -1,4 +1,4 @@
 (
 	p4 print -1 //depot/fiddle#42 >file &&
 	foobar
->)
+)
diff --git a/t/chainlint/pipe.expect b/t/chainlint/pipe.expect
index 211b901dbc..2cfc028297 100644
--- a/t/chainlint/pipe.expect
+++ b/t/chainlint/pipe.expect
@@ -3,6 +3,6 @@
 	bar |
 	baz &&
 	fish |
-?!AMP?!	cow
+	cow ?!AMP?!
 	sunder
->)
+)
diff --git a/t/chainlint/pipe.test b/t/chainlint/pipe.test
index e6af4de916..dd82534c66 100644
--- a/t/chainlint/pipe.test
+++ b/t/chainlint/pipe.test
@@ -4,7 +4,7 @@
 	bar |
 	baz &&
 
-# LINT: final line of pipe sequence ('cow') lacking "&&"
+# LINT: final line of pipe sequence ("cow") lacking "&&"
 	fish |
 	cow
 
diff --git a/t/chainlint/semicolon.expect b/t/chainlint/semicolon.expect
index 1d79384606..ed0b3707ae 100644
--- a/t/chainlint/semicolon.expect
+++ b/t/chainlint/semicolon.expect
@@ -1,20 +1,19 @@
 (
-?!AMP?!?!SEMI?!	cat foo ; echo bar
-?!SEMI?!	cat foo ; echo bar
->) &&
+	cat foo ; ?!AMP?! echo bar ?!AMP?!
+	cat foo ; ?!AMP?! echo bar
+) &&
 (
-?!SEMI?!	cat foo ; echo bar &&
-?!SEMI?!	cat foo ; echo bar
->) &&
+	cat foo ; ?!AMP?! echo bar &&
+	cat foo ; ?!AMP?! echo bar
+) &&
 (
 	echo "foo; bar" &&
-?!SEMI?!	cat foo; echo bar
->) &&
+	cat foo; ?!AMP?! echo bar
+) &&
 (
-?!SEMI?!	foo;
->) &&
-(
-cd foo &&
+	foo;
+) &&
+(cd foo &&
 	for i in a b c; do
-?!SEMI?!		echo;
->	done)
+		echo;
+	done)
diff --git a/t/chainlint/semicolon.test b/t/chainlint/semicolon.test
index d82c8ebbc0..67e1192c50 100644
--- a/t/chainlint/semicolon.test
+++ b/t/chainlint/semicolon.test
@@ -15,11 +15,11 @@
 	cat foo; echo bar
 ) &&
 (
-# LINT: unnecessary terminating semicolon
+# LINT: semicolon unnecessary but legitimate
 	foo;
 ) &&
 (cd foo &&
 	for i in a b c; do
-# LINT: unnecessary terminating semicolon
+# LINT: semicolon unnecessary but legitimate
 		echo;
 	done)
diff --git a/t/chainlint/subshell-here-doc.expect b/t/chainlint/subshell-here-doc.expect
index 74723e7340..029d129299 100644
--- a/t/chainlint/subshell-here-doc.expect
+++ b/t/chainlint/subshell-here-doc.expect
@@ -1,11 +1,10 @@
 (
-	echo wobba 	       gorgo snoot 	       wafta snurb &&
-?!AMP?!	cat >bip
-	echo >bop
->) &&
+	echo wobba 	       gorgo snoot 	       wafta snurb <<-EOF &&
+	cat <<EOF >bip ?!AMP?!
+	echo <<-EOF >bop
+) &&
 (
-	cat >bup &&
-	cat >bup2 &&
-	cat >bup3 &&
+	cat <<-ARBITRARY >bup &&
+	cat <<-ARBITRARY3 >bup3 &&
 	meep
->)
+)
diff --git a/t/chainlint/subshell-here-doc.test b/t/chainlint/subshell-here-doc.test
index f6b3ba4214..d40eb65583 100644
--- a/t/chainlint/subshell-here-doc.test
+++ b/t/chainlint/subshell-here-doc.test
@@ -8,10 +8,10 @@
 	nevermore...
 	EOF
 
-# LINT: missing "&&" on 'cat'
+# LINT: missing "&&" on "cat"
 	cat <<EOF >bip
 	fish fly high
-	EOF
+EOF
 
 # LINT: swallow here-doc (EOF is last line of subshell)
 	echo <<-\EOF >bop
@@ -27,10 +27,6 @@
 	glink
 	FIZZ
 	ARBITRARY
-	cat <<-'ARBITRARY2' >bup2 &&
-	glink
-	FIZZ
-	ARBITRARY2
 	cat <<-"ARBITRARY3" >bup3 &&
 	glink
 	FIZZ
diff --git a/t/chainlint/subshell-one-liner.expect b/t/chainlint/subshell-one-liner.expect
index 51162821d7..b7015361bf 100644
--- a/t/chainlint/subshell-one-liner.expect
+++ b/t/chainlint/subshell-one-liner.expect
@@ -2,13 +2,13 @@
 	(foo && bar) &&
 	(foo && bar) |
 	(foo && bar) >baz &&
-?!SEMI?!	(foo; bar) &&
-?!SEMI?!	(foo; bar) |
-?!SEMI?!	(foo; bar) >baz &&
+	(foo; ?!AMP?! bar) &&
+	(foo; ?!AMP?! bar) |
+	(foo; ?!AMP?! bar) >baz &&
 	(foo || exit 1) &&
 	(foo || exit 1) |
 	(foo || exit 1) >baz &&
-?!AMP?!	(foo && bar)
-?!AMP?!?!SEMI?!	(foo && bar; baz)
+	(foo && bar) ?!AMP?!
+	(foo && bar; ?!AMP?! baz) ?!AMP?!
 	foobar
->)
+)
diff --git a/t/chainlint/t7900-subtree.expect b/t/chainlint/t7900-subtree.expect
index c9913429e6..1cccc7bf7e 100644
--- a/t/chainlint/t7900-subtree.expect
+++ b/t/chainlint/t7900-subtree.expect
@@ -1,10 +1,10 @@
 (
 	chks="sub1sub2sub3sub4" &&
-	chks_sub=$(cat | sed 's,^,sub dir/,'
->>) &&
+	chks_sub=$(cat <<TXT | sed "s,^,sub dir/,"
+) &&
 	chkms="main-sub1main-sub2main-sub3main-sub4" &&
-	chkms_sub=$(cat | sed 's,^,sub dir/,'
->>) &&
+	chkms_sub=$(cat <<TXT | sed "s,^,sub dir/,"
+) &&
 	subfiles=$(git ls-files) &&
 	check_equal "$subfiles" "$chkms$chks"
->)
+)
diff --git a/t/chainlint/t7900-subtree.test b/t/chainlint/t7900-subtree.test
index 277d8358df..02f3129232 100644
--- a/t/chainlint/t7900-subtree.test
+++ b/t/chainlint/t7900-subtree.test
@@ -3,7 +3,7 @@
 sub2
 sub3
 sub4" &&
-	chks_sub=$(cat <<TXT | sed 's,^,sub dir/,'
+	chks_sub=$(cat <<TXT | sed "s,^,sub dir/,"
 $chks
 TXT
 ) &&
@@ -11,7 +11,7 @@ TXT
 main-sub2
 main-sub3
 main-sub4" &&
-	chkms_sub=$(cat <<TXT | sed 's,^,sub dir/,'
+	chkms_sub=$(cat <<TXT | sed "s,^,sub dir/,"
 $chkms
 TXT
 ) &&
diff --git a/t/chainlint/while-loop.expect b/t/chainlint/while-loop.expect
index 13cff2c0a5..0d3a9b3d12 100644
--- a/t/chainlint/while-loop.expect
+++ b/t/chainlint/while-loop.expect
@@ -1,11 +1,11 @@
 (
 	while true
 	do
-?!AMP?!		echo foo
-		cat
-?!AMP?!	done
+		echo foo ?!AMP?!
+		cat <<-EOF
+	done ?!AMP?!
 	while true; do
 		echo foo &&
 		cat bar
 	done
->)
+)
diff --git a/t/chainlint/while-loop.test b/t/chainlint/while-loop.test
index f1df085bf0..d09fb016e4 100644
--- a/t/chainlint/while-loop.test
+++ b/t/chainlint/while-loop.test
@@ -1,17 +1,17 @@
 (
-# LINT: 'while, 'do', 'done' do not need "&&"
+# LINT: "while", "do", "done" do not need "&&"
 	while true
 	do
-# LINT: missing "&&" on 'echo'
+# LINT: missing "&&" on "echo"
 		echo foo
 # LINT: last statement of while does not need "&&"
 		cat <<-\EOF
 		bar
 		EOF
-# LINT: missing "&&" on 'done'
+# LINT: missing "&&" on "done"
 	done
 
-# LINT: 'do' on same line as 'while'
+# LINT: "do" on same line as "while"
 	while true; do
 		echo foo &&
 		cat bar
diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
index 7b4278462b..e37396dd9c 100644
--- a/t/helper/test-drop-caches.c
+++ b/t/helper/test-drop-caches.c
@@ -3,6 +3,7 @@
 
 #if defined(GIT_WINDOWS_NATIVE)
 #include "lazyload.h"
+#include <winnt.h>
 
 static int cmd_sync(void)
 {
@@ -86,7 +87,8 @@ static int cmd_dropcaches(void)
 {
 	HANDLE hProcess = GetCurrentProcess();
 	HANDLE hToken;
-	DECLARE_PROC_ADDR(ntdll.dll, DWORD, NtSetSystemInformation, INT, PVOID, ULONG);
+	DECLARE_PROC_ADDR(ntdll.dll, DWORD, NTAPI, NtSetSystemInformation, INT, PVOID,
+		ULONG);
 	SYSTEM_MEMORY_LIST_COMMAND command;
 	int status;
 
diff --git a/t/helper/test-genzeros.c b/t/helper/test-genzeros.c
index 9532f5bac9..8ca988d621 100644
--- a/t/helper/test-genzeros.c
+++ b/t/helper/test-genzeros.c
@@ -3,18 +3,31 @@
 
 int cmd__genzeros(int argc, const char **argv)
 {
-	long count;
+	/* static, so that it is NUL-initialized */
+	static const char zeros[256 * 1024];
+	intmax_t count;
+	ssize_t n;
 
 	if (argc > 2) {
 		fprintf(stderr, "usage: %s [<count>]\n", argv[0]);
 		return 1;
 	}
 
-	count = argc > 1 ? strtol(argv[1], NULL, 0) : -1L;
+	count = argc > 1 ? strtoimax(argv[1], NULL, 0) : -1;
 
-	while (count < 0 || count--) {
-		if (putchar(0) == EOF)
+	/* Writing out individual NUL bytes is slow... */
+	while (count < 0)
+		if (write(1, zeros, ARRAY_SIZE(zeros)) < 0)
 			return -1;
+
+	while (count > 0) {
+		n = write(1, zeros, count < ARRAY_SIZE(zeros) ?
+			  count : ARRAY_SIZE(zeros));
+
+		if (n < 0)
+			return -1;
+
+		count -= n;
 	}
 
 	return 0;
diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index b52c174acc..b736ef1642 100644
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,82 +1,39 @@
 #include "test-tool.h"
 #include "cache.h"
 #include "config.h"
-#include "blob.h"
-#include "commit.h"
-#include "tree.h"
-#include "sparse-index.h"
-
-static void print_cache_entry(struct cache_entry *ce)
-{
-	const char *type;
-	printf("%06o ", ce->ce_mode & 0177777);
-
-	if (S_ISSPARSEDIR(ce->ce_mode))
-		type = tree_type;
-	else if (S_ISGITLINK(ce->ce_mode))
-		type = commit_type;
-	else
-		type = blob_type;
-
-	printf("%s %s\t%s\n",
-	       type,
-	       oid_to_hex(&ce->oid),
-	       ce->name);
-}
-
-static void print_cache(struct index_state *istate)
-{
-	int i;
-	for (i = 0; i < istate->cache_nr; i++)
-		print_cache_entry(istate->cache[i]);
-}
 
 int cmd__read_cache(int argc, const char **argv)
 {
-	struct repository *r = the_repository;
 	int i, cnt = 1;
 	const char *name = NULL;
-	int table = 0, expand = 0;
 
 	initialize_the_repository();
-	prepare_repo_settings(r);
-	r->settings.command_requires_full_index = 0;
 
-	for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
-		if (skip_prefix(*argv, "--print-and-refresh=", &name))
-			continue;
-		if (!strcmp(*argv, "--table"))
-			table = 1;
-		else if (!strcmp(*argv, "--expand"))
-			expand = 1;
+	if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
+		argc--;
+		argv++;
 	}
 
-	if (argc == 1)
-		cnt = strtol(argv[0], NULL, 0);
+	if (argc == 2)
+		cnt = strtol(argv[1], NULL, 0);
 	setup_git_directory();
 	git_config(git_default_config, NULL);
 
 	for (i = 0; i < cnt; i++) {
-		repo_read_index(r);
-
-		if (expand)
-			ensure_full_index(r->index);
-
+		read_cache();
 		if (name) {
 			int pos;
 
-			refresh_index(r->index, REFRESH_QUIET,
+			refresh_index(&the_index, REFRESH_QUIET,
 				      NULL, NULL, NULL);
-			pos = index_name_pos(r->index, name, strlen(name));
+			pos = index_name_pos(&the_index, name, strlen(name));
 			if (pos < 0)
 				die("%s not in index", name);
 			printf("%s is%s up to date\n", name,
-			       ce_uptodate(r->index->cache[pos]) ? "" : " not");
+			       ce_uptodate(the_index.cache[pos]) ? "" : " not");
 			write_file(name, "%d\n", i);
 		}
-		if (table)
-			print_cache(r->index);
-		discard_index(r->index);
+		discard_cache();
 	}
 	return 0;
 }
diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 9d6fa7a377..27072ba94d 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -55,9 +55,10 @@ static int read_midx_file(const char *object_dir, int show_objects)
 			printf("%s %"PRIu64"\t%s\n",
 			       oid_to_hex(&oid), e.offset, e.p->pack_name);
 		}
-		return 0;
 	}
 
+	close_midx(m);
+
 	return 0;
 }
 
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index b314b81a45..3e4ddaee70 100644
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -5,6 +5,48 @@
 #include "object-store.h"
 #include "repository.h"
 
+struct flag_definition {
+	const char *name;
+	uint64_t mask;
+};
+
+#define FLAG_DEF(x)     \
+	{               \
+#x, (x) \
+	}
+
+static unsigned int parse_flags(const char *str, struct flag_definition *defs)
+{
+	struct string_list masks = STRING_LIST_INIT_DUP;
+	int i = 0;
+	unsigned int result = 0;
+
+	if (!strcmp(str, "0"))
+		return 0;
+
+	string_list_split(&masks, str, ',', 64);
+	for (; i < masks.nr; i++) {
+		const char *name = masks.items[i].string;
+		struct flag_definition *def = defs;
+		int found = 0;
+		while (def->name) {
+			if (!strcmp(def->name, name)) {
+				result |= def->mask;
+				found = 1;
+				break;
+			}
+			def++;
+		}
+		if (!found)
+			die("unknown flag \"%s\"", name);
+	}
+
+	string_list_clear(&masks, 0);
+	return result;
+}
+
+static struct flag_definition empty_flags[] = { { NULL, 0 } };
+
 static const char *notnull(const char *arg, const char *name)
 {
 	if (!arg)
@@ -12,9 +54,10 @@ static const char *notnull(const char *arg, const char *name)
 	return arg;
 }
 
-static unsigned int arg_flags(const char *arg, const char *name)
+static unsigned int arg_flags(const char *arg, const char *name,
+			      struct flag_definition *defs)
 {
-	return atoi(notnull(arg, name));
+	return parse_flags(notnull(arg, name), defs);
 }
 
 static const char **get_store(const char **argv, struct ref_store **refs)
@@ -64,10 +107,13 @@ static const char **get_store(const char **argv, struct ref_store **refs)
 	return argv + 1;
 }
 
+static struct flag_definition pack_flags[] = { FLAG_DEF(PACK_REFS_PRUNE),
+					       FLAG_DEF(PACK_REFS_ALL),
+					       { NULL, 0 } };
 
 static int cmd_pack_refs(struct ref_store *refs, const char **argv)
 {
-	unsigned int flags = arg_flags(*argv++, "flags");
+	unsigned int flags = arg_flags(*argv++, "flags", pack_flags);
 
 	return refs_pack_refs(refs, flags);
 }
@@ -81,16 +127,27 @@ static int cmd_create_symref(struct ref_store *refs, const char **argv)
 	return refs_create_symref(refs, refname, target, logmsg);
 }
 
+static struct flag_definition transaction_flags[] = {
+	FLAG_DEF(REF_NO_DEREF),
+	FLAG_DEF(REF_FORCE_CREATE_REFLOG),
+	FLAG_DEF(REF_SKIP_OID_VERIFICATION),
+	FLAG_DEF(REF_SKIP_REFNAME_VERIFICATION),
+	{ NULL, 0 }
+};
+
 static int cmd_delete_refs(struct ref_store *refs, const char **argv)
 {
-	unsigned int flags = arg_flags(*argv++, "flags");
+	unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
 	const char *msg = *argv++;
 	struct string_list refnames = STRING_LIST_INIT_NODUP;
+	int result;
 
 	while (*argv)
 		string_list_append(&refnames, *argv++);
 
-	return refs_delete_refs(refs, msg, &refnames, flags);
+	result = refs_delete_refs(refs, msg, &refnames, flags);
+	string_list_clear(&refnames, 0);
+	return result;
 }
 
 static int cmd_rename_ref(struct ref_store *refs, const char **argv)
@@ -120,12 +177,13 @@ static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
 {
 	struct object_id oid = *null_oid();
 	const char *refname = notnull(*argv++, "refname");
-	int resolve_flags = arg_flags(*argv++, "resolve-flags");
+	int resolve_flags = arg_flags(*argv++, "resolve-flags", empty_flags);
 	int flags;
 	const char *ref;
+	int ignore_errno;
 
 	ref = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
-				      &oid, &flags);
+				      &oid, &flags, &ignore_errno);
 	printf("%s %s 0x%x\n", oid_to_hex(&oid), ref ? ref : "(null)", flags);
 	return ref ? 0 : 1;
 }
@@ -151,9 +209,9 @@ static int each_reflog(struct object_id *old_oid, struct object_id *new_oid,
 		       const char *committer, timestamp_t timestamp,
 		       int tz, const char *msg, void *cb_data)
 {
-	printf("%s %s %s %"PRItime" %d %s\n",
-	       oid_to_hex(old_oid), oid_to_hex(new_oid),
-	       committer, timestamp, tz, msg);
+	printf("%s %s %s %" PRItime " %+05d%s%s", oid_to_hex(old_oid),
+	       oid_to_hex(new_oid), committer, timestamp, tz,
+	       *msg == '\n' ? "" : "\t", msg);
 	return 0;
 }
 
@@ -181,11 +239,10 @@ static int cmd_reflog_exists(struct ref_store *refs, const char **argv)
 static int cmd_create_reflog(struct ref_store *refs, const char **argv)
 {
 	const char *refname = notnull(*argv++, "refname");
-	int force_create = arg_flags(*argv++, "force-create");
 	struct strbuf err = STRBUF_INIT;
 	int ret;
 
-	ret = refs_create_reflog(refs, refname, force_create, &err);
+	ret = refs_create_reflog(refs, refname, &err);
 	if (err.len)
 		puts(err.buf);
 	return ret;
@@ -208,11 +265,11 @@ static int cmd_delete_ref(struct ref_store *refs, const char **argv)
 	const char *msg = notnull(*argv++, "msg");
 	const char *refname = notnull(*argv++, "refname");
 	const char *sha1_buf = notnull(*argv++, "old-sha1");
-	unsigned int flags = arg_flags(*argv++, "flags");
+	unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
 	struct object_id old_oid;
 
 	if (get_oid_hex(sha1_buf, &old_oid))
-		die("not sha-1");
+		die("cannot parse %s as %s", sha1_buf, the_hash_algo->name);
 
 	return refs_delete_ref(refs, msg, refname, &old_oid, flags);
 }
@@ -223,13 +280,14 @@ static int cmd_update_ref(struct ref_store *refs, const char **argv)
 	const char *refname = notnull(*argv++, "refname");
 	const char *new_sha1_buf = notnull(*argv++, "new-sha1");
 	const char *old_sha1_buf = notnull(*argv++, "old-sha1");
-	unsigned int flags = arg_flags(*argv++, "flags");
+	unsigned int flags = arg_flags(*argv++, "flags", transaction_flags);
 	struct object_id old_oid;
 	struct object_id new_oid;
 
-	if (get_oid_hex(old_sha1_buf, &old_oid) ||
-	    get_oid_hex(new_sha1_buf, &new_oid))
-		die("not sha-1");
+	if (get_oid_hex(old_sha1_buf, &old_oid))
+		die("cannot parse %s as %s", old_sha1_buf, the_hash_algo->name);
+	if (get_oid_hex(new_sha1_buf, &new_oid))
+		die("cannot parse %s as %s", new_sha1_buf, the_hash_algo->name);
 
 	return refs_update_ref(refs, msg, refname,
 			       &new_oid, &old_oid,
diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c
new file mode 100644
index 0000000000..26b03d7b78
--- /dev/null
+++ b/t/helper/test-reftable.c
@@ -0,0 +1,21 @@
+#include "reftable/reftable-tests.h"
+#include "test-tool.h"
+
+int cmd__reftable(int argc, const char **argv)
+{
+	basics_test_main(argc, argv);
+	block_test_main(argc, argv);
+	merged_test_main(argc, argv);
+	pq_test_main(argc, argv);
+	record_test_main(argc, argv);
+	refname_test_main(argc, argv);
+	readwrite_test_main(argc, argv);
+	stack_test_main(argc, argv);
+	tree_test_main(argc, argv);
+	return 0;
+}
+
+int cmd__dump_reftable(int argc, const char **argv)
+{
+	return reftable_dump_main(argc, (char *const *)argv);
+}
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 3c4fb86223..913775a14b 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -31,7 +31,7 @@ static int parallel_next(struct child_process *cp,
 	if (number_callbacks >= 4)
 		return 0;
 
-	strvec_pushv(&cp->args, d->argv);
+	strvec_pushv(&cp->args, d->args.v);
 	strbuf_addstr(err, "preloaded output of a child\n");
 	number_callbacks++;
 	return 1;
@@ -274,7 +274,7 @@ static int quote_stress_test(int argc, const char **argv)
 		if (i < skip)
 			continue;
 
-		cp.argv = args.v;
+		strvec_pushv(&cp.args, args.v);
 		strbuf_reset(&out);
 		if (pipe_command(&cp, NULL, 0, &out, 0, NULL, 0) < 0)
 			return error("Failed to spawn child process");
@@ -396,7 +396,7 @@ int cmd__run_command(int argc, const char **argv)
 	}
 	if (argc < 3)
 		return 1;
-	proc.argv = (const char **)argv + 2;
+	strvec_pushv(&proc.args, (const char **)argv + 2);
 
 	if (!strcmp(argv[1], "start-command-ENOENT")) {
 		if (start_command(&proc) < 0 && errno == ENOENT)
@@ -408,7 +408,8 @@ int cmd__run_command(int argc, const char **argv)
 		exit(run_command(&proc));
 
 	jobs = atoi(argv[2]);
-	proc.argv = (const char **)argv + 3;
+	strvec_clear(&proc.args);
+	strvec_pushv(&proc.args, (const char **)argv + 3);
 
 	if (!strcmp(argv[1], "run-command-parallel"))
 		exit(run_processes_parallel(jobs, parallel_next,
diff --git a/t/helper/test-subprocess.c b/t/helper/test-subprocess.c
index 92b69de635..ff22f2fa2c 100644
--- a/t/helper/test-subprocess.c
+++ b/t/helper/test-subprocess.c
@@ -15,6 +15,6 @@ int cmd__subprocess(int argc, const char **argv)
 		argv++;
 	}
 	cp.git_cmd = 1;
-	cp.argv = (const char **)argv + 1;
+	strvec_pushv(&cp.args, (const char **)argv + 1);
 	return run_command(&cp);
 }
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 3ce5585e53..338a57b104 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -53,13 +53,15 @@ static struct test_cmd cmds[] = {
 	{ "pcre2-config", cmd__pcre2_config },
 	{ "pkt-line", cmd__pkt_line },
 	{ "prio-queue", cmd__prio_queue },
-	{ "proc-receive", cmd__proc_receive},
+	{ "proc-receive", cmd__proc_receive },
 	{ "progress", cmd__progress },
 	{ "reach", cmd__reach },
 	{ "read-cache", cmd__read_cache },
 	{ "read-graph", cmd__read_graph },
 	{ "read-midx", cmd__read_midx },
 	{ "ref-store", cmd__ref_store },
+	{ "reftable", cmd__reftable },
+	{ "dump-reftable", cmd__dump_reftable },
 	{ "regex", cmd__regex },
 	{ "repository", cmd__repository },
 	{ "revision-walking", cmd__revision_walking },
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 9f0f522850..48cee1f4a2 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -19,6 +19,7 @@ int cmd__dump_cache_tree(int argc, const char **argv);
 int cmd__dump_fsmonitor(int argc, const char **argv);
 int cmd__dump_split_index(int argc, const char **argv);
 int cmd__dump_untracked_cache(int argc, const char **argv);
+int cmd__dump_reftable(int argc, const char **argv);
 int cmd__example_decorate(int argc, const char **argv);
 int cmd__fast_rebase(int argc, const char **argv);
 int cmd__genrandom(int argc, const char **argv);
@@ -49,6 +50,7 @@ int cmd__read_cache(int argc, const char **argv);
 int cmd__read_graph(int argc, const char **argv);
 int cmd__read_midx(int argc, const char **argv);
 int cmd__ref_store(int argc, const char **argv);
+int cmd__reftable(int argc, const char **argv);
 int cmd__regex(int argc, const char **argv);
 int cmd__repository(int argc, const char **argv);
 int cmd__revision_walking(int argc, const char **argv);
diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index f93633f895..59b124bb5f 100644
--- a/t/helper/test-trace2.c
+++ b/t/helper/test-trace2.c
@@ -262,8 +262,9 @@ static int print_usage(void)
  *    [] the "cmd_name" event has been generated.
  *    [] this writes various "def_param" events for interesting config values.
  *
- * We further assume that if we return (rather than exit()), trace2_cmd_exit()
- * will be called by test-tool.c:cmd_main().
+ * We return from here and let test-tool.c::cmd_main() pass the exit
+ * code to common-main.c::main(), which will use it to call
+ * trace2_cmd_exit().
  */
 int cmd__trace2(int argc, const char **argv)
 {
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index a3f285f515..3e7ee1386a 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -90,7 +90,12 @@ test_lazy_prereq RFC1991 '
 GPGSSH_KEY_PRIMARY="${GNUPGHOME}/ed25519_ssh_signing_key"
 GPGSSH_KEY_SECONDARY="${GNUPGHOME}/rsa_2048_ssh_signing_key"
 GPGSSH_KEY_UNTRUSTED="${GNUPGHOME}/untrusted_ssh_signing_key"
+GPGSSH_KEY_EXPIRED="${GNUPGHOME}/expired_ssh_signing_key"
+GPGSSH_KEY_NOTYETVALID="${GNUPGHOME}/notyetvalid_ssh_signing_key"
+GPGSSH_KEY_TIMEBOXEDVALID="${GNUPGHOME}/timeboxed_valid_ssh_signing_key"
+GPGSSH_KEY_TIMEBOXEDINVALID="${GNUPGHOME}/timeboxed_invalid_ssh_signing_key"
 GPGSSH_KEY_WITH_PASSPHRASE="${GNUPGHOME}/protected_ssh_signing_key"
+GPGSSH_KEY_ECDSA="${GNUPGHOME}/ecdsa_ssh_signing_key"
 GPGSSH_KEY_PASSPHRASE="super_secret"
 GPGSSH_ALLOWED_SIGNERS="${GNUPGHOME}/ssh.all_valid.allowedSignersFile"
 
@@ -105,21 +110,63 @@ test_lazy_prereq GPGSSH '
 	echo $ssh_version | grep -q "find-principals:missing signature file"
 	test $? = 0 || exit 1;
 
-	# some broken versions of ssh-keygen segfault on find-principals;
-	# avoid testing with them.
-	ssh-keygen -Y find-principals -f /dev/null -s /dev/null
-	test $? = 139 && exit 1
-
+	# Setup some keys and an allowed signers file
 	mkdir -p "${GNUPGHOME}" &&
 	chmod 0700 "${GNUPGHOME}" &&
 	(setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
 	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
-	echo "\"principal with number 1\" $(cat "${GPGSSH_KEY_PRIMARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
 	ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
-	echo "\"principal with number 2\" $(cat "${GPGSSH_KEY_SECONDARY}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
 	ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
-	echo "\"principal with number 3\" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")" >> "${GPGSSH_ALLOWED_SIGNERS}" &&
-	ssh-keygen -t ed25519 -N "" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null
+	ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null &&
+	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null &&
+
+	cat >"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+	"principal with number 1" $(cat "${GPGSSH_KEY_PRIMARY}.pub")"
+	"principal with number 2" $(cat "${GPGSSH_KEY_SECONDARY}.pub")"
+	"principal with number 3" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")"
+	"principal with number 4" $(cat "${GPGSSH_KEY_ECDSA}.pub")"
+	EOF
+
+	# Verify if at least one key and ssh-keygen works as expected
+	echo "testpayload" |
+	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_PRIMARY}" >gpgssh_prereq.sig &&
+	ssh-keygen -Y find-principals -f "${GPGSSH_ALLOWED_SIGNERS}" -s gpgssh_prereq.sig &&
+	echo "testpayload" |
+	ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with number 1" -s gpgssh_prereq.sig
+'
+
+test_lazy_prereq GPGSSH_VERIFYTIME '
+	# Check if ssh-keygen has a verify-time option by passing an invalid date to it
+	ssh-keygen -Overify-time=INVALID -Y check-novalidate -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
+
+	# Set up keys with key lifetimes
+	ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
+	key_valid=$(cat "${GPGSSH_KEY_TIMEBOXEDVALID}.pub") &&
+	ssh-keygen -t ed25519 -N "" -C "timeboxed invalid key" -f "${GPGSSH_KEY_TIMEBOXEDINVALID}" >/dev/null &&
+	key_invalid=$(cat "${GPGSSH_KEY_TIMEBOXEDINVALID}.pub") &&
+	ssh-keygen -t ed25519 -N "" -C "expired key" -f "${GPGSSH_KEY_EXPIRED}" >/dev/null &&
+	key_expired=$(cat "${GPGSSH_KEY_EXPIRED}.pub") &&
+	ssh-keygen -t ed25519 -N "" -C "not yet valid key" -f "${GPGSSH_KEY_NOTYETVALID}" >/dev/null &&
+	key_notyetvalid=$(cat "${GPGSSH_KEY_NOTYETVALID}.pub") &&
+
+	# Timestamps outside of test_tick span
+	ts2005a=20050401000000 ts2005b=200504020000 &&
+	# Timestamps within test_tick span
+	ts2005c=20050407000000 ts2005d=200504100000 &&
+	# Definitely not yet valid / expired timestamps
+	ts2000=20000101000000 ts2999=29990101000000 &&
+
+	cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+	"timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
+	"timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
+	"principal with expired key" valid-before="$ts2000" $key_expired"
+	"principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
+	EOF
+
+	# and verify ssh-keygen verifies the key lifetime
+	echo "testpayload" |
+	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
+	! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
 '
 
 sanitize_pgp() {
diff --git a/t/lib-pager.sh b/t/lib-pager.sh
index 3aa7a3ffd8..e5eb28df4e 100644
--- a/t/lib-pager.sh
+++ b/t/lib-pager.sh
@@ -3,7 +3,7 @@
 test_expect_success 'determine default pager' '
 	test_might_fail git config --unset core.pager &&
 	less=$(
-		unset PAGER GIT_PAGER;
+		sane_unset PAGER GIT_PAGER &&
 		git var GIT_PAGER
 	) &&
 	test -n "$less"
diff --git a/t/perf/p0005-status.sh b/t/perf/p0005-status.sh
index 0b0aa9858f..ca58d6c9b5 100755
--- a/t/perf/p0005-status.sh
+++ b/t/perf/p0005-status.sh
@@ -24,17 +24,17 @@ 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 branch br_base            master
-		git branch br_ballast         p0006-ballast
-		git config --local core.sparsecheckout 1
+		echo Assuming synthetic repo from many-files.sh &&
+		git branch br_base            master &&
+		git branch br_ballast         p0006-ballast &&
+		git config --local core.sparsecheckout 1 &&
 		cat >.git/info/sparse-checkout <<-EOF
 		/*
 		!ballast/*
 		EOF
 	else
-		echo Assuming non-synthetic repo...
-		git branch br_base            $(git rev-list HEAD | tail -n 1)
+		echo Assuming non-synthetic repo... &&
+		git branch br_base            $(git rev-list HEAD | tail -n 1) &&
 		git branch br_ballast         HEAD
 	fi &&
 	git checkout -q br_ballast &&
diff --git a/t/perf/p0006-read-tree-checkout.sh b/t/perf/p0006-read-tree-checkout.sh
index 78cc23fe2f..900b385c4b 100755
--- a/t/perf/p0006-read-tree-checkout.sh
+++ b/t/perf/p0006-read-tree-checkout.sh
@@ -24,21 +24,21 @@ 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 branch br_base            master
-		git branch br_ballast         p0006-ballast^
-		git branch br_ballast_alias   p0006-ballast^
-		git branch br_ballast_plus_1  p0006-ballast
-		git config --local core.sparsecheckout 1
+		echo Assuming synthetic repo from many-files.sh &&
+		git branch br_base            master &&
+		git branch br_ballast         p0006-ballast^ &&
+		git branch br_ballast_alias   p0006-ballast^ &&
+		git branch br_ballast_plus_1  p0006-ballast &&
+		git config --local core.sparsecheckout 1 &&
 		cat >.git/info/sparse-checkout <<-EOF
 		/*
 		!ballast/*
 		EOF
 	else
-		echo Assuming non-synthetic repo...
-		git branch br_base            $(git rev-list HEAD | tail -n 1)
-		git branch br_ballast         HEAD^ || error "no ancestor commit from current head"
-		git branch br_ballast_alias   HEAD^
+		echo Assuming non-synthetic repo... &&
+		git branch br_base            $(git rev-list HEAD | tail -n 1) &&
+		git branch br_ballast         HEAD^ || error "no ancestor commit from current head" &&
+		git branch br_ballast_alias   HEAD^ &&
 		git branch br_ballast_plus_1  HEAD
 	fi &&
 	git checkout -q br_ballast &&
diff --git a/t/perf/p0007-write-cache.sh b/t/perf/p0007-write-cache.sh
index 09595264f0..25d8ff7443 100755
--- a/t/perf/p0007-write-cache.sh
+++ b/t/perf/p0007-write-cache.sh
@@ -9,8 +9,8 @@ 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
+		echo Assuming synthetic repo from many-files.sh &&
+		git config --local core.sparsecheckout 1 &&
 		cat >.git/info/sparse-checkout <<-EOF
 		/*
 		!ballast/*
diff --git a/t/perf/p0100-globbing.sh b/t/perf/p0100-globbing.sh
index dd18a9ce2b..439e9c8e3c 100755
--- a/t/perf/p0100-globbing.sh
+++ b/t/perf/p0100-globbing.sh
@@ -19,9 +19,9 @@ test_expect_success 'setup' '
 		printf "a" >>refname &&
 		for j in $(test_seq 1 $i)
 		do
-			printf "a*" >>refglob.$i
+			printf "a*" >>refglob.$i || return 1
 		done &&
-		echo b >>refglob.$i
+		echo b >>refglob.$i || return 1
 	done &&
 	test_commit test $(cat refname).t "" $(cat refname).t
 '
diff --git a/t/perf/p1400-update-ref.sh b/t/perf/p1400-update-ref.sh
index dda8a74866..a75969cbb1 100755
--- a/t/perf/p1400-update-ref.sh
+++ b/t/perf/p1400-update-ref.sh
@@ -13,7 +13,7 @@ test_expect_success "setup" '
 	do
 		printf "start\ncreate refs/heads/%d PRE\ncommit\n" $i &&
 		printf "start\nupdate refs/heads/%d POST PRE\ncommit\n" $i &&
-		printf "start\ndelete refs/heads/%d POST\ncommit\n" $i
+		printf "start\ndelete refs/heads/%d POST\ncommit\n" $i || return 1
 	done >instructions
 '
 
@@ -22,7 +22,7 @@ test_perf "update-ref" '
 	do
 		git update-ref refs/heads/branch PRE &&
 		git update-ref refs/heads/branch POST PRE &&
-		git update-ref -d refs/heads/branch
+		git update-ref -d refs/heads/branch || return 1
 	done
 '
 
diff --git a/t/perf/p1451-fsck-skip-list.sh b/t/perf/p1451-fsck-skip-list.sh
index c2b97d2487..f767d834f2 100755
--- a/t/perf/p1451-fsck-skip-list.sh
+++ b/t/perf/p1451-fsck-skip-list.sh
@@ -15,7 +15,7 @@ test_expect_success "setup $n bad commits" '
 		echo "committer C <c@example.com> 1234567890 +0000" &&
 		echo "data <<EOF" &&
 		echo "$i.Q." &&
-		echo "EOF"
+		echo "EOF" || return 1
 	done | q_to_nul | git fast-import
 '
 
diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh
index 597626276f..cb777c74a2 100755
--- a/t/perf/p2000-sparse-operations.sh
+++ b/t/perf/p2000-sparse-operations.sh
@@ -110,5 +110,12 @@ test_perf_on_all git add -A
 test_perf_on_all git add .
 test_perf_on_all git commit -a -m A
 test_perf_on_all git checkout -f -
+test_perf_on_all git reset
+test_perf_on_all git reset --hard
+test_perf_on_all git reset -- does-not-exist
+test_perf_on_all git diff
+test_perf_on_all git diff --cached
+test_perf_on_all git blame $SPARSE_CONE/a
+test_perf_on_all git blame $SPARSE_CONE/f3/a
 
 test_done
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index 43d5a34e8c..e6b0277729 100755
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -22,7 +22,7 @@ test_expect_success 'setup rebasing on top of a lot of changes' '
 		git add unrelated-file$i &&
 		test_tick &&
 		git commit -m commit$i-reverse unrelated-file$i ||
-		break
+		return 1
 	done &&
 	git checkout to-rebase &&
 	test_commit our-patch interesting-file
diff --git a/t/perf/p4002-diff-color-moved.sh b/t/perf/p4002-diff-color-moved.sh
new file mode 100755
index 0000000000..ab2af931c0
--- /dev/null
+++ b/t/perf/p4002-diff-color-moved.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+test_description='Tests diff --color-moved performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+# The endpoints of the diff can be customized by setting TEST_REV_A
+# and TEST_REV_B in the environment when running this test.
+
+rev="${TEST_REV_A:-v2.28.0}"
+if ! rev_a="$(git rev-parse --quiet --verify "$rev")"
+then
+	skip_all="skipping because '$rev' was not found. \
+		  Use TEST_REV_A and TEST_REV_B to set the revs to use"
+	test_done
+fi
+rev="${TEST_REV_B:-v2.29.0}"
+if ! rev_b="$(git rev-parse --quiet --verify "$rev")"
+then
+	skip_all="skipping because '$rev' was not found. \
+		  Use TEST_REV_A and TEST_REV_B to set the revs to use"
+	test_done
+fi
+
+GIT_PAGER_IN_USE=1
+test_export GIT_PAGER_IN_USE rev_a rev_b
+
+test_perf 'diff --no-color-moved --no-color-moved-ws large change' '
+	git diff --no-color-moved --no-color-moved-ws $rev_a $rev_b
+'
+
+test_perf 'diff --color-moved --no-color-moved-ws large change' '
+	git diff --color-moved=zebra --no-color-moved-ws $rev_a $rev_b
+'
+
+test_perf 'diff --color-moved-ws=allow-indentation-change large change' '
+	git diff --color-moved=zebra --color-moved-ws=allow-indentation-change \
+		$rev_a $rev_b
+'
+
+test_perf 'log --no-color-moved --no-color-moved-ws' '
+	git log --no-color-moved --no-color-moved-ws --no-merges --patch \
+		-n1000 $rev_b
+'
+
+test_perf 'log --color-moved --no-color-moved-ws' '
+	git log --color-moved=zebra --no-color-moved-ws --no-merges --patch \
+		-n1000 $rev_b
+'
+
+test_perf 'log --color-moved-ws=allow-indentation-change' '
+	git log --color-moved=zebra --color-moved-ws=allow-indentation-change \
+		--no-merges --patch -n1000 $rev_b
+'
+
+test_done
diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index 228593d9ad..c16f6a3ff6 100755
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -21,8 +21,8 @@ test_expect_success 'set up thread-counting tests' '
 	threads= &&
 	while test $t -gt 0
 	do
-		threads="$t $threads"
-		t=$((t / 2))
+		threads="$t $threads" &&
+		t=$((t / 2)) || return 1
 	done
 '
 
diff --git a/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
index 35c0cbdf49..af173a7b73 100755
--- a/t/perf/p5303-many-packs.sh
+++ b/t/perf/p5303-many-packs.sh
@@ -126,11 +126,11 @@ done
 # Measure pack loading with 10,000 packs.
 test_expect_success 'generate lots of packs' '
 	for i in $(test_seq 10000); do
-		echo "blob"
-		echo "data <<EOF"
-		echo "blob $i"
-		echo "EOF"
-		echo "checkpoint"
+		echo "blob" &&
+		echo "data <<EOF" &&
+		echo "blob $i" &&
+		echo "EOF" &&
+		echo "checkpoint" || return 1
 	done |
 	git -c fastimport.unpackLimit=0 fast-import
 '
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
index 5eb5044a10..c8be58f3c7 100755
--- a/t/perf/p7519-fsmonitor.sh
+++ b/t/perf/p7519-fsmonitor.sh
@@ -119,10 +119,10 @@ test_expect_success "one time repo setup" '
 	fi &&
 
 	mkdir 1_file 10_files 100_files 1000_files 10000_files &&
-	for i in $(test_seq 1 10); do touch 10_files/$i; done &&
-	for i in $(test_seq 1 100); do touch 100_files/$i; done &&
-	for i in $(test_seq 1 1000); do touch 1000_files/$i; done &&
-	for i in $(test_seq 1 10000); do touch 10000_files/$i; done &&
+	for i in $(test_seq 1 10); do touch 10_files/$i || return 1; done &&
+	for i in $(test_seq 1 100); do touch 100_files/$i || return 1; done &&
+	for i in $(test_seq 1 1000); do touch 1000_files/$i || return 1; done &&
+	for i in $(test_seq 1 10000); do touch 10000_files/$i || return 1; done &&
 	git add 1_file 10_files 100_files 1000_files 10000_files &&
 	git commit -qm "Add files" &&
 
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 780a7402d5..407252bac7 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -161,7 +161,7 @@ test_run_perf_ () {
 	test_cleanup=:
 	test_export_="test_cleanup"
 	export test_cleanup test_export_
-	"$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c '
+	"$GTIME" -f "%E %U %S" -o test_time.$i "$TEST_SHELL_PATH" -c '
 . '"$TEST_DIRECTORY"/test-lib-functions.sh'
 test_export () {
 	test_export_="$test_export_ $*"
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 7603ad2f82..3235ab4d53 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -331,7 +331,7 @@ test_expect_success 'init with separate gitdir' '
 
 test_expect_success 'explicit bare & --separate-git-dir incompatible' '
 	test_must_fail git init --bare --separate-git-dir goop.git bare.git 2>err &&
-	test_i18ngrep "mutually exclusive" err
+	test_i18ngrep "cannot be used together" err
 '
 
 test_expect_success 'implicit bare & --separate-git-dir incompatible' '
diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index a5ec6a0315..eba75a2490 100755
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -48,7 +48,7 @@ test_expect_success !MINGW 'a constipated git dies with SIGPIPE' '
 '
 
 test_expect_success !MINGW 'a constipated git dies with SIGPIPE even if parent ignores it' '
-	OUT=$( ((trap "" PIPE; large_git; echo $? 1>&3) | :) 3>&1 ) &&
+	OUT=$( ((trap "" PIPE && large_git; echo $? 1>&3) | :) 3>&1 ) &&
 	test_match_signal 13 "$OUT"
 '
 
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 6b757d7169..794186961e 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -63,6 +63,10 @@ check_show 'format-local:%%z' "$TIME" '%z'
 check_show 'format:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 16:13:20'
 check_show 'format-local:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 09:13:20' '' EST5
 
+check_show 'format:%s' '123456789 +1234' 123456789
+check_show 'format:%s' '123456789 -1234' 123456789
+check_show 'format-local:%s' '123456789 -1234' 123456789
+
 # arbitrary time absurdly far in the future
 FUTURE="5758122296 -0400"
 check_show iso       "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT,TIME_T_IS_64BIT
diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh
index 53af92d571..e56f4b9ac5 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -27,6 +27,26 @@ test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identities are strict' '
 	)
 '
 
+test_expect_success 'get GIT_DEFAULT_BRANCH without configuration' '
+	(
+		sane_unset GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
+		git init defbranch &&
+		git -C defbranch symbolic-ref --short HEAD >expect &&
+		git var GIT_DEFAULT_BRANCH >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'get GIT_DEFAULT_BRANCH with configuration' '
+	test_config init.defaultbranch foo &&
+	(
+		sane_unset GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
+		echo foo >expect &&
+		git var GIT_DEFAULT_BRANCH >actual &&
+		test_cmp expect actual
+	)
+'
+
 # For git var -l, we check only a representative variable;
 # testing the whole output would make our test too brittle with
 # respect to unrelated changes in the test suite's environment.
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 42d2314804..5575dade8e 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -200,7 +200,7 @@ test_expect_success 'setup' '
 	do
 		: >$dir/not-ignored &&
 		: >$dir/ignored-and-untracked &&
-		: >$dir/ignored-but-in-index
+		: >$dir/ignored-but-in-index || return 1
 	done &&
 	git add -f ignored-but-in-index a/ignored-but-in-index &&
 	cat <<-\EOF >a/.gitignore &&
diff --git a/t/t0011-hashmap.sh b/t/t0011-hashmap.sh
index e094975b13..1cb6aa6824 100755
--- a/t/t0011-hashmap.sh
+++ b/t/t0011-hashmap.sh
@@ -220,7 +220,7 @@ test_expect_success 'grow / shrink' '
 	for n in $(test_seq 51)
 	do
 		echo put key$n value$n >> in &&
-		echo NULL >> expect
+		echo NULL >> expect || return 1
 	done &&
 	echo size >> in &&
 	echo 64 51 >> expect &&
@@ -231,7 +231,7 @@ test_expect_success 'grow / shrink' '
 	for n in $(test_seq 12)
 	do
 		echo remove key$n >> in &&
-		echo value$n >> expect
+		echo value$n >> expect || return 1
 	done &&
 	echo size >> in &&
 	echo 256 40 >> expect &&
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index f25ae8b5e1..35cc8c3b39 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -5,6 +5,7 @@ test_description='CRLF conversion'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 has_cr() {
@@ -22,10 +23,10 @@ test_expect_success setup '
 
 	git config core.autocrlf false &&
 
-	for w in Hello world how are you; do echo $w; done >one &&
+	test_write_lines Hello world how are you >one &&
 	mkdir dir &&
-	for w in I am very very fine thank you; do echo $w; done >dir/two &&
-	for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
+	test_write_lines I am very very fine thank you >dir/two &&
+	test_write_lines Oh here is NULQin text here | q_to_nul >three &&
 	git add . &&
 
 	git commit -m initial &&
@@ -35,7 +36,7 @@ test_expect_success setup '
 	two=$(git rev-parse HEAD:dir/two) &&
 	three=$(git rev-parse HEAD:three) &&
 
-	for w in Some extra lines here; do echo $w; done >>one &&
+	test_write_lines Some extra lines here >>one &&
 	git diff >patch.file &&
 	patched=$(git hash-object --stdin <one) &&
 	git read-tree --reset -u HEAD
@@ -46,7 +47,7 @@ test_expect_success 'safecrlf: autocrlf=input, all CRLF' '
 	git config core.autocrlf input &&
 	git config core.safecrlf true &&
 
-	for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
+	test_write_lines I am all CRLF | append_cr >allcrlf &&
 	test_must_fail git add allcrlf
 '
 
@@ -55,7 +56,7 @@ test_expect_success 'safecrlf: autocrlf=input, mixed LF/CRLF' '
 	git config core.autocrlf input &&
 	git config core.safecrlf true &&
 
-	for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
+	test_write_lines Oh here is CRLFQ in text | q_to_cr >mixed &&
 	test_must_fail git add mixed
 '
 
@@ -64,7 +65,7 @@ test_expect_success 'safecrlf: autocrlf=true, all LF' '
 	git config core.autocrlf true &&
 	git config core.safecrlf true &&
 
-	for w in I am all LF; do echo $w; done >alllf &&
+	test_write_lines I am all LF >alllf &&
 	test_must_fail git add alllf
 '
 
@@ -73,7 +74,7 @@ test_expect_success 'safecrlf: autocrlf=true mixed LF/CRLF' '
 	git config core.autocrlf true &&
 	git config core.safecrlf true &&
 
-	for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
+	test_write_lines Oh here is CRLFQ in text | q_to_cr >mixed &&
 	test_must_fail git add mixed
 '
 
@@ -82,10 +83,10 @@ test_expect_success 'safecrlf: print warning only once' '
 	git config core.autocrlf input &&
 	git config core.safecrlf warn &&
 
-	for w in I am all LF; do echo $w; done >doublewarn &&
+	test_write_lines I am all LF >doublewarn &&
 	git add doublewarn &&
 	git commit -m "nowarn" &&
-	for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn &&
+	test_write_lines Oh here is CRLFQ in text | q_to_cr >doublewarn &&
 	git add doublewarn 2>err &&
 	grep "CRLF will be replaced by LF" err >err.warnings &&
 	test_line_count = 1 err.warnings
@@ -103,7 +104,7 @@ test_expect_success 'safecrlf: no warning with safecrlf=false' '
 	git config core.autocrlf input &&
 	git config core.safecrlf false &&
 
-	for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
+	test_write_lines I am all CRLF | append_cr >allcrlf &&
 	git add allcrlf 2>err &&
 	test_must_be_empty err
 '
@@ -351,9 +352,9 @@ test_expect_success 'setting up for new autocrlf tests' '
 	git config core.autocrlf false &&
 	git config core.safecrlf false &&
 	rm -rf .????* * &&
-	for w in I am all LF; do echo $w; done >alllf &&
-	for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >mixed &&
-	for w in I am all CRLF; do echo $w; done | append_cr >allcrlf &&
+	test_write_lines I am all LF >alllf &&
+	test_write_lines Oh here is CRLFQ in text | q_to_cr >mixed &&
+	test_write_lines I am all CRLF | append_cr >allcrlf &&
 	git add -A . &&
 	git commit -m "alllf, allcrlf and mixed only" &&
 	git tag -a -m "message" autocrlf-checkpoint
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 33dfc9cd56..bad37abad2 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -76,13 +76,13 @@ test_expect_success setup '
 	git config filter.rot13.clean ./rot13.sh &&
 
 	{
-	    echo "*.t filter=rot13"
+	    echo "*.t filter=rot13" &&
 	    echo "*.i ident"
 	} >.gitattributes &&
 
 	{
-	    echo a b c d e f g h i j k l m
-	    echo n o p q r s t u v w x y z
+	    echo a b c d e f g h i j k l m &&
+	    echo n o p q r s t u v w x y z &&
 	    echo '\''$Id$'\''
 	} >test &&
 	cat test >test.t &&
@@ -118,17 +118,17 @@ test_expect_success check '
 # If an expanded ident ever gets into the repository, we want to make sure that
 # it is collapsed before being expanded again on checkout
 test_expect_success expanded_in_repo '
-	{
-		echo "File with expanded keywords"
-		echo "\$Id\$"
-		echo "\$Id:\$"
-		echo "\$Id: 0000000000000000000000000000000000000000 \$"
-		echo "\$Id: NoSpaceAtEnd\$"
-		echo "\$Id:NoSpaceAtFront \$"
-		echo "\$Id:NoSpaceAtEitherEnd\$"
-		echo "\$Id: NoTerminatingSymbol"
-		echo "\$Id: Foreign Commit With Spaces \$"
-	} >expanded-keywords.0 &&
+	cat >expanded-keywords.0 <<-\EOF &&
+	File with expanded keywords
+	$Id$
+	$Id:$
+	$Id: 0000000000000000000000000000000000000000 $
+	$Id: NoSpaceAtEnd$
+	$Id:NoSpaceAtFront $
+	$Id:NoSpaceAtEitherEnd$
+	$Id: NoTerminatingSymbol
+	$Id: Foreign Commit With Spaces $
+	EOF
 
 	{
 		cat expanded-keywords.0 &&
@@ -139,17 +139,17 @@ test_expect_success expanded_in_repo '
 	git commit -m "File with keywords expanded" &&
 	id=$(git rev-parse --verify :expanded-keywords) &&
 
-	{
-		echo "File with expanded keywords"
-		echo "\$Id: $id \$"
-		echo "\$Id: $id \$"
-		echo "\$Id: $id \$"
-		echo "\$Id: $id \$"
-		echo "\$Id: $id \$"
-		echo "\$Id: $id \$"
-		echo "\$Id: NoTerminatingSymbol"
-		echo "\$Id: Foreign Commit With Spaces \$"
-	} >expected-output.0 &&
+	cat >expected-output.0 <<-EOF &&
+	File with expanded keywords
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: NoTerminatingSymbol
+	\$Id: Foreign Commit With Spaces \$
+	EOF
 	{
 		cat expected-output.0 &&
 		printf "\$Id: NoTerminatingSymbolAtEOF"
@@ -159,7 +159,7 @@ test_expect_success expanded_in_repo '
 		printf "\$Id: NoTerminatingSymbolAtEOF"
 	} >expected-output-crlf &&
 	{
-		echo "expanded-keywords ident"
+		echo "expanded-keywords ident" &&
 		echo "expanded-keywords-crlf ident text eol=crlf"
 	} >>.gitattributes &&
 
@@ -285,7 +285,7 @@ test_expect_success 'required filter with absent smudge field' '
 test_expect_success 'filtering large input to small output should use little memory' '
 	test_config filter.devnull.clean "cat >/dev/null" &&
 	test_config filter.devnull.required true &&
-	for i in $(test_seq 1 30); do printf "%1048576d" 1; done >30MB &&
+	for i in $(test_seq 1 30); do printf "%1048576d" 1 || return 1; done >30MB &&
 	echo "30MB filter=devnull" >.gitattributes &&
 	GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
 '
@@ -303,7 +303,7 @@ test_expect_success 'filter that does not read is fine' '
 test_expect_success EXPENSIVE 'filter large file' '
 	test_config filter.largefile.smudge cat &&
 	test_config filter.largefile.clean cat &&
-	for i in $(test_seq 1 2048); do printf "%1048576d" 1; done >2GB &&
+	for i in $(test_seq 1 2048); do printf "%1048576d" 1 || return 1; done >2GB &&
 	echo "2GB filter=largefile" >.gitattributes &&
 	git add 2GB 2>err &&
 	test_must_be_empty err &&
@@ -643,7 +643,7 @@ test_expect_success PERL 'required process filter should process multiple packet
 		for FILE in "$TEST_ROOT"/*.file
 		do
 			cp "$FILE" . &&
-			rot13.sh <"$FILE" >"$FILE.rot13"
+			rot13.sh <"$FILE" >"$FILE.rot13" || return 1
 		done &&
 
 		echo "*.file filter=protocol" >.gitattributes &&
@@ -682,7 +682,7 @@ test_expect_success PERL 'required process filter should process multiple packet
 
 		for FILE in *.file
 		do
-			test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE
+			test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE || return 1
 		done
 	)
 '
diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index cdcafcdff7..f426a185bb 100755
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -15,8 +15,8 @@ test_expect_success setup '
 
 	echo "one text" > .gitattributes &&
 
-	for w in Hello world how are you; do echo $w; done >one &&
-	for w in I am very very fine thank you; do echo $w; done >two &&
+	test_write_lines Hello world how are you >one &&
+	test_write_lines I am very very fine thank you >two &&
 	git add . &&
 
 	git commit -m initial &&
diff --git a/t/t0032-reftable-unittest.sh b/t/t0032-reftable-unittest.sh
new file mode 100755
index 0000000000..0ed14971a5
--- /dev/null
+++ b/t/t0032-reftable-unittest.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Google LLC
+#
+
+test_description='reftable unittests'
+
+. ./test-lib.sh
+
+test_expect_success 'unittests' '
+	TMPDIR=$(pwd) && export TMPDIR &&
+	test-tool reftable
+'
+
+test_done
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 96f0123cca..2fe6ae6a4e 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -224,7 +224,7 @@ test_expect_success SYMLINKS 'real path works on symlinks' '
 	mkdir second &&
 	ln -s ../first second/other &&
 	mkdir third &&
-	dir="$(cd .git; pwd -P)" &&
+	dir="$(cd .git && pwd -P)" &&
 	dir2=third/../second/other/.git &&
 	test "$dir" = "$(test-tool path-utils real_path $dir2)" &&
 	file="$dir"/index &&
@@ -232,7 +232,7 @@ test_expect_success SYMLINKS 'real path works on symlinks' '
 	basename=blub &&
 	test "$dir/$basename" = "$(cd .git && test-tool path-utils real_path "$basename")" &&
 	ln -s ../first/file .git/syml &&
-	sym="$(cd first; pwd -P)"/file &&
+	sym="$(cd first && pwd -P)"/file &&
 	test "$sym" = "$(test-tool path-utils real_path "$dir2/syml")"
 '
 
diff --git a/t/t0069-oidtree.sh b/t/t0069-oidtree.sh
index 74cc59bf8a..889db50818 100755
--- a/t/t0069-oidtree.sh
+++ b/t/t0069-oidtree.sh
@@ -28,7 +28,7 @@ test_expect_success 'oidtree insert and contains' '
 	EOF
 	{
 		echoid insert 444 1 2 3 4 5 a b c d e &&
-		echoid contains 44 441 440 444 4440 4444
+		echoid contains 44 441 440 444 4440 4444 &&
 		echo clear
 	} | test-tool oidtree >actual &&
 	test_cmp expect actual
@@ -37,11 +37,11 @@ test_expect_success 'oidtree insert and contains' '
 test_expect_success 'oidtree each' '
 	echoid "" 123 321 321 >expect &&
 	{
-		echoid insert f 9 8 123 321 a b c d e
-		echo each 12300
-		echo each 3211
-		echo each 3210
-		echo each 32100
+		echoid insert f 9 8 123 321 a b c d e &&
+		echo each 12300 &&
+		echo each 3211 &&
+		echo each 3210 &&
+		echo each 32100 &&
 		echo clear
 	} | test-tool oidtree >actual &&
 	test_cmp expect actual
diff --git a/t/t0071-sort.sh b/t/t0071-sort.sh
index a8ab174879..6f9a501c72 100755
--- a/t/t0071-sort.sh
+++ b/t/t0071-sort.sh
@@ -2,6 +2,7 @@
 
 test_description='verify sort functions'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'llist_mergesort()' '
diff --git a/t/t0095-bloom.sh b/t/t0095-bloom.sh
index 7e4ab1795f..5945973552 100755
--- a/t/t0095-bloom.sh
+++ b/t/t0095-bloom.sh
@@ -84,7 +84,7 @@ test_expect_success 'get bloom filter for commit with 10 changes' '
 	mkdir smallDir &&
 	for i in $(test_seq 0 9)
 	do
-		echo $i >smallDir/$i
+		echo $i >smallDir/$i || return 1
 	done &&
 	git add smallDir &&
 	git commit -m "commit with 10 changes" &&
@@ -102,7 +102,7 @@ test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' '
 	mkdir bigDir &&
 	for i in $(test_seq 0 511)
 	do
-		echo $i >bigDir/$i
+		echo $i >bigDir/$i || return 1
 	done &&
 	git add bigDir &&
 	git commit -m "commit with 513 changes" &&
diff --git a/t/t0110-urlmatch-normalization.sh b/t/t0110-urlmatch-normalization.sh
index f99529d838..4dc9fecf72 100755
--- a/t/t0110-urlmatch-normalization.sh
+++ b/t/t0110-urlmatch-normalization.sh
@@ -47,7 +47,7 @@ test_expect_success 'url authority' '
 	test-tool urlmatch-normalization "scheme://@host" &&
 	test-tool urlmatch-normalization "scheme://%00@host" &&
 	! test-tool urlmatch-normalization "scheme://%%@host" &&
-	! test-tool urlmatch-normalization "scheme://host_" &&
+	test-tool urlmatch-normalization "scheme://host_" &&
 	test-tool urlmatch-normalization "scheme://user:pass@host/" &&
 	test-tool urlmatch-normalization "scheme://@host/" &&
 	test-tool urlmatch-normalization "scheme://host/" &&
diff --git a/t/t0200-gettext-basic.sh b/t/t0200-gettext-basic.sh
index 8853d8afb9..522fb2ae69 100755
--- a/t/t0200-gettext-basic.sh
+++ b/t/t0200-gettext-basic.sh
@@ -5,6 +5,7 @@
 
 test_description='Gettext support for Git'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gettext.sh
 
 test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
index 6c74df0dc6..8724ce1052 100755
--- a/t/t0201-gettext-fallbacks.sh
+++ b/t/t0201-gettext-fallbacks.sh
@@ -8,6 +8,7 @@ test_description='Gettext Shell fallbacks'
 GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease
 export GIT_INTERNAL_GETTEXT_TEST_FALLBACKS
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gettext.sh
 
 test_expect_success "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
diff --git a/t/t0202-gettext-perl.sh b/t/t0202-gettext-perl.sh
index a29d166e00..df2ea34932 100755
--- a/t/t0202-gettext-perl.sh
+++ b/t/t0202-gettext-perl.sh
@@ -5,6 +5,7 @@
 
 test_description='Perl gettext interface (Git::I18N)'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gettext.sh
 
 if ! test_have_prereq PERL; then
diff --git a/t/t0204-gettext-reencode-sanity.sh b/t/t0204-gettext-reencode-sanity.sh
index 8437e51eb5..4f2e0dcb02 100755
--- a/t/t0204-gettext-reencode-sanity.sh
+++ b/t/t0204-gettext-reencode-sanity.sh
@@ -5,6 +5,7 @@
 
 test_description="Gettext reencoding of our *.po/*.mo files works"
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-gettext.sh
 
 # The constants used in a tricky observation for undefined behaviour
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index c76485b1b6..f17abd298c 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -469,7 +469,7 @@ test_expect_success 'rev-list dies for missing objects on cmd line' '
 		git -C repo rev-list --ignore-missing --objects \
 			--exclude-promisor-objects "$OBJ" &&
 		git -C repo rev-list --ignore-missing --objects-edge-aggressive \
-			--exclude-promisor-objects "$OBJ"
+			--exclude-promisor-objects "$OBJ" || return 1
 	done
 '
 
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 9c05f5e1f5..ca5c5510c7 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -8,6 +8,8 @@ test_description='Two way merge with read-tree -m -u $H $M
 This is identical to t1001, but uses -u to update the work tree as well.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh
index 83b09e1310..12e30d77d0 100755
--- a/t/t1005-read-tree-reset.sh
+++ b/t/t1005-read-tree-reset.sh
@@ -2,6 +2,7 @@
 
 test_description='read-tree -u --reset'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 658628375c..39382fa195 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -211,14 +211,14 @@ done
 test_expect_success "--batch-check for a non-existent named object" '
     test "foobar42 missing
 foobar84 missing" = \
-    "$( ( echo foobar42; echo_without_newline foobar84; ) | git cat-file --batch-check)"
+    "$( ( echo foobar42 && echo_without_newline foobar84 ) | git cat-file --batch-check)"
 '
 
 test_expect_success "--batch-check for a non-existent hash" '
     test "0000000000000000000000000000000000000042 missing
 0000000000000000000000000000000000000084 missing" = \
-    "$( ( echo 0000000000000000000000000000000000000042;
-	 echo_without_newline 0000000000000000000000000000000000000084; ) |
+    "$( ( echo 0000000000000000000000000000000000000042 &&
+	 echo_without_newline 0000000000000000000000000000000000000084 ) |
        git cat-file --batch-check)"
 '
 
@@ -226,8 +226,8 @@ test_expect_success "--batch for an existent and a non-existent hash" '
     test "$tag_sha1 tag $tag_size
 $tag_content
 0000000000000000000000000000000000000000 missing" = \
-    "$( ( echo $tag_sha1;
-	 echo_without_newline 0000000000000000000000000000000000000000; ) |
+    "$( ( echo $tag_sha1 &&
+	 echo_without_newline 0000000000000000000000000000000000000000 ) |
        git cat-file --batch)"
 '
 
@@ -283,7 +283,7 @@ test_expect_success "--batch-check with multiple sha1s gives correct format" '
 
 test_expect_success 'setup blobs which are likely to delta' '
 	test-tool genrandom foo 10240 >foo &&
-	{ cat foo; echo plus; } >foo-plus &&
+	{ cat foo && echo plus; } >foo-plus &&
 	git add foo foo-plus &&
 	git commit -m foo &&
 	cat >blobs <<-\EOF
@@ -452,9 +452,8 @@ test_expect_success 'the --allow-unknown-type option does not consider replaceme
 	# Create it manually, as "git replace" will die on bogus
 	# types.
 	head=$(git rev-parse --verify HEAD) &&
-	test_when_finished "rm -rf .git/refs/replace" &&
-	mkdir -p .git/refs/replace &&
-	echo $head >.git/refs/replace/$bogus_short_sha1 &&
+	test_when_finished "test-tool ref-store main delete-refs 0 msg refs/replace/$bogus_short_sha1" &&
+	test-tool ref-store main update-ref msg "refs/replace/$bogus_short_sha1" $head $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
 	cat >expect <<-EOF &&
 	commit
diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index 4512fb0b6e..ad5936e54d 100755
--- a/t/t1008-read-tree-overlay.sh
+++ b/t/t1008-read-tree-overlay.sh
@@ -5,6 +5,7 @@ test_description='test multi-tree read-tree without merging'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
index 48bfad07ab..3c08194526 100755
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
@@ -6,10 +6,10 @@ TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
-	for d in a a. a0
+	for d in a a- a0
 	do
 		mkdir "$d" && echo "$d/one" >"$d/one" &&
-		git add "$d"
+		git add "$d" || return 1
 	done &&
 	echo zero >one &&
 	git update-index --add --info-only one &&
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index c2df75e495..9fdbb2af80 100755
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -11,9 +11,9 @@ test_description='Try various core-level commands in subdirectory.
 
 test_expect_success setup '
 	long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
-	for c in $long; do echo $c; done >one &&
+	test_write_lines $long >one &&
 	mkdir dir &&
-	for c in x y z $long a b c; do echo $c; done >dir/two &&
+	test_write_lines x y z $long a b c >dir/two &&
 	cp one original.one &&
 	cp dir/two original.two
 '
@@ -22,7 +22,7 @@ test_expect_success 'update-index and ls-files' '
 	git update-index --add one &&
 	case "$(git ls-files)" in
 	one) echo pass one ;;
-	*) echo bad one; exit 1 ;;
+	*) echo bad one; return 1 ;;
 	esac &&
 	(
 		cd dir &&
@@ -34,7 +34,7 @@ test_expect_success 'update-index and ls-files' '
 	) &&
 	case "$(git ls-files)" in
 	dir/two"$LF"one) echo pass both ;;
-	*) echo bad; exit 1 ;;
+	*) echo bad; return 1 ;;
 	esac
 '
 
@@ -57,7 +57,7 @@ test_expect_success 'diff-files' '
 	echo d >>dir/two &&
 	case "$(git diff-files --name-only)" in
 	dir/two"$LF"one) echo pass top ;;
-	*) echo bad top; exit 1 ;;
+	*) echo bad top; return 1 ;;
 	esac &&
 	# diff should not omit leading paths
 	(
diff --git a/t/t1022-read-tree-partial-clone.sh b/t/t1022-read-tree-partial-clone.sh
index a763e27c7d..a9953b6a71 100755
--- a/t/t1022-read-tree-partial-clone.sh
+++ b/t/t1022-read-tree-partial-clone.sh
@@ -4,9 +4,6 @@ test_description='git read-tree in partial clones'
 
 TEST_NO_CREATE_REPO=1
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 
 test_expect_success 'read-tree in partial clone prefetches in one batch' '
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 6bc1d76fb1..4f3aa17c99 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -51,42 +51,32 @@ EOF
 test_expect_success 'add a large file or two' '
 	git add large1 huge large2 &&
 	# make sure we got a single packfile and no loose objects
-	bad= count=0 idx= &&
+	count=0 idx= &&
 	for p in .git/objects/pack/pack-*.pack
 	do
-		count=$(( $count + 1 ))
-		if test_path_is_file "$p" &&
-		   idx=${p%.pack}.idx && test_path_is_file "$idx"
-		then
-			continue
-		fi
-		bad=t
+		count=$(( $count + 1 )) &&
+		test_path_is_file "$p" &&
+		idx=${p%.pack}.idx &&
+		test_path_is_file "$idx" || return 1
 	done &&
-	test -z "$bad" &&
 	test $count = 1 &&
 	cnt=$(git show-index <"$idx" | wc -l) &&
 	test $cnt = 2 &&
 	for l in .git/objects/$OIDPATH_REGEX
 	do
-		test_path_is_file "$l" || continue
-		bad=t
+		test_path_is_missing "$l" || return 1
 	done &&
-	test -z "$bad" &&
 
 	# attempt to add another copy of the same
 	git add large3 &&
 	bad= count=0 &&
 	for p in .git/objects/pack/pack-*.pack
 	do
-		count=$(( $count + 1 ))
-		if test_path_is_file "$p" &&
-		   idx=${p%.pack}.idx && test_path_is_file "$idx"
-		then
-			continue
-		fi
-		bad=t
+		count=$(( $count + 1 )) &&
+		test_path_is_file "$p" &&
+		idx=${p%.pack}.idx &&
+		test_path_is_file "$idx" || return 1
 	done &&
-	test -z "$bad" &&
 	test $count = 1
 '
 
@@ -115,7 +105,7 @@ test_expect_success 'packsize limit' '
 		count=0 &&
 		for pi in .git/objects/pack/pack-*.idx
 		do
-			test_path_is_file "$pi" && count=$(( $count + 1 ))
+			test_path_is_file "$pi" && count=$(( $count + 1 )) || return 1
 		done &&
 		test $count = 2 &&
 
@@ -128,7 +118,7 @@ test_expect_success 'packsize limit' '
 
 		for pi in .git/objects/pack/pack-*.idx
 		do
-			git show-index <"$pi"
+			git show-index <"$pi" || return 1
 		done |
 		sed -e "s/^[0-9]* \([0-9a-f]*\) .*/\1/" |
 		sort >actual &&
diff --git a/t/t1051-large-conversion.sh b/t/t1051-large-conversion.sh
index 8b7640b3ba..042b0e4429 100755
--- a/t/t1051-large-conversion.sh
+++ b/t/t1051-large-conversion.sh
@@ -83,4 +83,30 @@ test_expect_success 'ident converts on output' '
 	test_cmp small.clean large.clean
 '
 
+# This smudge filter prepends 5GB of zeros to the file it checks out. This
+# ensures that smudging doesn't mangle large files on 64-bit Windows.
+test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
+		'files over 4GB convert on output' '
+	test_commit test small "a small file" &&
+	small_size=$(test_file_size small) &&
+	test_config filter.makelarge.smudge \
+		"test-tool genzeros $((5*1024*1024*1024)) && cat" &&
+	echo "small filter=makelarge" >.gitattributes &&
+	rm small &&
+	git checkout -- small &&
+	size=$(test_file_size small) &&
+	test "$size" -eq $((5 * 1024 * 1024 * 1024 + $small_size))
+'
+
+# This clean filter writes down the size of input it receives. By checking against
+# the actual size, we ensure that cleaning doesn't mangle large files on 64-bit Windows.
+test_expect_success EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
+		'files over 4GB convert on input' '
+	test-tool genzeros $((5*1024*1024*1024)) >big &&
+	test_config filter.checklarge.clean "wc -c >big.size" &&
+	echo "big filter=checklarge" >.gitattributes &&
+	git add big &&
+	test $(test_file_size big) -eq $(cat big.size)
+'
+
 test_done
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 272ba1b566..42776984fe 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -41,7 +41,15 @@ test_expect_success 'setup' '
 	)
 '
 
-test_expect_success 'git sparse-checkout list (empty)' '
+test_expect_success 'git sparse-checkout list (not sparse)' '
+	test_must_fail git -C repo sparse-checkout list >list 2>err &&
+	test_must_be_empty list &&
+	test_i18ngrep "this worktree is not sparse" err
+'
+
+test_expect_success 'git sparse-checkout list (not sparse)' '
+	git -C repo sparse-checkout set &&
+	rm repo/.git/info/sparse-checkout &&
 	git -C repo sparse-checkout list >list 2>err &&
 	test_must_be_empty list &&
 	test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err
@@ -103,6 +111,18 @@ test_expect_success 'clone --sparse' '
 	check_files clone a
 '
 
+test_expect_success 'switching to cone mode with non-cone mode patterns' '
+	git init bad-patterns &&
+	(
+		cd bad-patterns &&
+		git sparse-checkout init &&
+		git sparse-checkout add dir &&
+		git config core.sparseCheckoutCone true &&
+		test_must_fail git sparse-checkout add dir 2>err &&
+		grep "existing sparse-checkout patterns do not use cone mode" err
+	)
+'
+
 test_expect_success 'interaction with clone --no-checkout (unborn index)' '
 	git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout &&
 	git -C clone_no_checkout sparse-checkout init --cone &&
@@ -165,12 +185,14 @@ test_expect_success 'set sparse-checkout using --stdin' '
 '
 
 test_expect_success 'add to sparse-checkout' '
-	cat repo/.git/info/sparse-checkout >expect &&
+	cat repo/.git/info/sparse-checkout >old &&
+	test_when_finished cp old repo/.git/info/sparse-checkout &&
 	cat >add <<-\EOF &&
 	pattern1
 	/folder1/
 	pattern2
 	EOF
+	cat old >expect &&
 	cat add >>expect &&
 	git -C repo sparse-checkout add --stdin <add &&
 	git -C repo sparse-checkout list >actual &&
@@ -212,12 +234,27 @@ test_expect_success 'sparse-index enabled and disabled' '
 
 		git -C repo sparse-checkout init --cone --sparse-index &&
 		test_cmp_config -C repo true index.sparse &&
-		test-tool -C repo read-cache --table >cache &&
-		grep " tree " cache &&
-
+		git -C repo ls-files --sparse >sparse &&
 		git -C repo sparse-checkout disable &&
-		test-tool -C repo read-cache --table >cache &&
-		! grep " tree " cache &&
+		git -C repo ls-files --sparse >full &&
+
+		cat >expect <<-\EOF &&
+		@@ -1,4 +1,7 @@
+		 a
+		-deep/
+		-folder1/
+		-folder2/
+		+deep/a
+		+deep/deeper1/a
+		+deep/deeper1/deepest/a
+		+deep/deeper2/a
+		+folder1/a
+		+folder2/a
+		EOF
+
+		diff -u sparse full | tail -n +3 >actual &&
+		test_cmp expect actual &&
+
 		git -C repo config --list >config &&
 		! grep index.sparse config
 	)
@@ -586,7 +623,7 @@ test_expect_success 'pattern-checks: contained glob characters' '
 		!/*/
 		something$c-else/
 		EOF
-		check_read_tree_errors repo "a" "disabling cone pattern matching"
+		check_read_tree_errors repo "a" "disabling cone pattern matching" || return 1
 	done
 '
 
@@ -708,4 +745,25 @@ test_expect_success 'cone mode clears ignored subdirectories' '
 	test_cmp expect out
 '
 
+test_expect_success 'malformed cone-mode patterns' '
+	git -C repo sparse-checkout init --cone &&
+	mkdir -p repo/foo/bar &&
+	touch repo/foo/bar/x repo/foo/y &&
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/foo/
+	!/foo/*/
+	/foo/\*/
+	EOF
+
+	# Listing the patterns will notice the duplicate pattern and
+	# emit a warning. It will list the patterns directly instead
+	# of using the cone-mode translation to a set of directories.
+	git -C repo sparse-checkout list >actual 2>err &&
+	test_cmp repo/.git/info/sparse-checkout actual &&
+	grep "warning: your sparse-checkout file may have issues: pattern .* is repeated" err &&
+	grep "warning: disabling cone pattern matching" err
+'
+
 test_done
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 16fbd2c6db..4ba1617752 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -19,6 +19,8 @@ test_expect_success 'setup' '
 		mkdir folder1 folder2 deep x &&
 		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
 		mkdir deep/deeper1/deepest &&
+		mkdir deep/deeper1/deepest2 &&
+		mkdir deep/deeper1/deepest3 &&
 		echo "after deeper1" >deep/e &&
 		echo "after deepest" >deep/deeper1/e &&
 		cp a folder1 &&
@@ -30,7 +32,9 @@ test_expect_success 'setup' '
 		cp a deep/deeper2 &&
 		cp a deep/later &&
 		cp a deep/deeper1/deepest &&
-		cp -r deep/deeper1/deepest deep/deeper2 &&
+		cp a deep/deeper1/deepest2 &&
+		cp a deep/deeper1/deepest3 &&
+		cp -r deep/deeper1/ deep/deeper2 &&
 		mkdir deep/deeper1/0 &&
 		mkdir deep/deeper1/0/0 &&
 		touch deep/deeper1/0/1 &&
@@ -126,6 +130,8 @@ test_expect_success 'setup' '
 
 		git checkout -b deepest base &&
 		echo "updated deepest" >deep/deeper1/deepest/a &&
+		echo "updated deepest2" >deep/deeper1/deepest2/a &&
+		echo "updated deepest3" >deep/deeper1/deepest3/a &&
 		git commit -a -m "update deepest" &&
 
 		git checkout -f base &&
@@ -200,45 +206,42 @@ test_sparse_unstaged () {
 test_expect_success 'sparse-index contents' '
 	init_repos &&
 
-	test-tool -C sparse-index read-cache --table >cache &&
+	git -C sparse-index ls-files --sparse --stage >cache &&
 	for dir in folder1 folder2 x
 	do
 		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
-		grep "040000 tree $TREE	$dir/" cache \
+		grep "040000 $TREE 0	$dir/" cache \
 			|| return 1
 	done &&
 
 	git -C sparse-index sparse-checkout set folder1 &&
 
-	test-tool -C sparse-index read-cache --table >cache &&
+	git -C sparse-index ls-files --sparse --stage >cache &&
 	for dir in deep folder2 x
 	do
 		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
-		grep "040000 tree $TREE	$dir/" cache \
+		grep "040000 $TREE 0	$dir/" cache \
 			|| return 1
 	done &&
 
 	git -C sparse-index sparse-checkout set deep/deeper1 &&
 
-	test-tool -C sparse-index read-cache --table >cache &&
+	git -C sparse-index ls-files --sparse --stage >cache &&
 	for dir in deep/deeper2 folder1 folder2 x
 	do
 		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
-		grep "040000 tree $TREE	$dir/" cache \
+		grep "040000 $TREE 0	$dir/" cache \
 			|| return 1
 	done &&
 
-	# Disabling the sparse-index removes tree entries with full ones
+	# Disabling the sparse-index replaces tree entries with full ones
 	git -C sparse-index sparse-checkout init --no-sparse-index &&
-
-	test-tool -C sparse-index read-cache --table >cache &&
-	! grep "040000 tree" cache &&
-	test_sparse_match test-tool read-cache --table
+	test_sparse_match git ls-files --stage --sparse
 '
 
 test_expect_success 'expanded in-memory index matches full index' '
 	init_repos &&
-	test_sparse_match test-tool read-cache --expand --table
+	test_sparse_match git ls-files --stage
 '
 
 test_expect_success 'status with options' '
@@ -301,6 +304,14 @@ test_expect_success 'add, commit, checkout' '
 	test_all_match git checkout -
 '
 
+test_expect_success 'deep changes during checkout' '
+	init_repos &&
+
+	test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
+	test_all_match git checkout deepest &&
+	test_all_match git checkout base
+'
+
 test_expect_success 'add outside sparse cone' '
 	init_repos &&
 
@@ -401,7 +412,7 @@ test_expect_success 'checkout and reset --hard' '
 	test_all_match git reset --hard update-folder2
 '
 
-test_expect_success 'diff --staged' '
+test_expect_success 'diff --cached' '
 	init_repos &&
 
 	write_script edit-contents <<-\EOF &&
@@ -410,10 +421,10 @@ test_expect_success 'diff --staged' '
 	run_on_all ../edit-contents &&
 
 	test_all_match git diff &&
-	test_all_match git diff --staged &&
+	test_all_match git diff --cached &&
 	test_all_match git add README.md &&
 	test_all_match git diff &&
-	test_all_match git diff --staged
+	test_all_match git diff --cached
 '
 
 # NEEDSWORK: sparse-checkout behaves differently from full-checkout when
@@ -430,8 +441,8 @@ test_expect_success 'diff with renames and conflicts' '
 		test_all_match git checkout rename-base &&
 		test_all_match git checkout $branch -- . &&
 		test_all_match git status --porcelain=v2 &&
-		test_all_match git diff --staged --no-renames &&
-		test_all_match git diff --staged --find-renames || return 1
+		test_all_match git diff --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
 	done
 '
 
@@ -450,8 +461,8 @@ test_expect_success 'diff with directory/file conflicts' '
 		test_all_match git checkout $branch &&
 		test_all_match git checkout rename-base -- . &&
 		test_all_match git status --porcelain=v2 &&
-		test_all_match git diff --staged --no-renames &&
-		test_all_match git diff --staged --find-renames || return 1
+		test_all_match git diff --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
 	done
 '
 
@@ -472,43 +483,150 @@ test_expect_success 'log with pathspec outside sparse definition' '
 test_expect_success 'blame with pathspec inside sparse definition' '
 	init_repos &&
 
-	test_all_match git blame a &&
-	test_all_match git blame deep/a &&
-	test_all_match git blame deep/deeper1/a &&
-	test_all_match git blame deep/deeper1/deepest/a
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_all_match git blame $file
+	done
 '
 
-# TODO: blame currently does not support blaming files outside of the
-# sparse definition. It complains that the file doesn't exist locally.
-test_expect_failure 'blame with pathspec outside sparse definition' '
+# Without a revision specified, blame will error if passed any file that
+# is not present in the working directory (even if the file is tracked).
+# Here we just verify that this is also true with sparse checkouts.
+test_expect_success 'blame with pathspec outside sparse definition' '
 	init_repos &&
+	test_sparse_match git sparse-checkout set &&
 
-	test_all_match git blame folder1/a &&
-	test_all_match git blame folder2/a &&
-	test_all_match git blame deep/deeper2/a &&
-	test_all_match git blame deep/deeper2/deepest/a
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_sparse_match test_must_fail git blame $file &&
+		cat >expect <<-EOF &&
+		fatal: Cannot lstat '"'"'$file'"'"': No such file or directory
+		EOF
+		# We compare sparse-checkout-err and sparse-index-err in
+		# `test_sparse_match`. Given we know they are the same, we
+		# only check the content of sparse-index-err here.
+		test_cmp expect sparse-index-err
+	done
 '
 
-# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
-# in this scenario, but it shouldn't.
-test_expect_failure 'checkout and reset (mixed)' '
+test_expect_success 'checkout and reset (mixed)' '
 	init_repos &&
 
 	test_all_match git checkout -b reset-test update-deep &&
 	test_all_match git reset deepest &&
-	test_all_match git reset update-folder1 &&
-	test_all_match git reset update-folder2
+
+	# Because skip-worktree is preserved, resetting to update-folder1
+	# will show worktree changes for folder1/a in full-checkout, but not
+	# in sparse-checkout or sparse-index.
+	git -C full-checkout reset update-folder1 >full-checkout-out &&
+	test_sparse_match git reset update-folder1 &&
+	grep "M	folder1/a" full-checkout-out &&
+	! grep "M	folder1/a" sparse-checkout-out &&
+	run_on_sparse test_path_is_missing folder1
 '
 
-# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
-# in this scenario, but it shouldn't.
-test_expect_success 'checkout and reset (mixed) [sparse]' '
+test_expect_success 'checkout and reset (merge)' '
 	init_repos &&
 
-	test_sparse_match git checkout -b reset-test update-deep &&
-	test_sparse_match git reset deepest &&
-	test_sparse_match git reset update-folder1 &&
-	test_sparse_match git reset update-folder2
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents a &&
+	test_all_match git reset --merge deepest &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard update-deep &&
+	run_on_all ../edit-contents deep/a &&
+	test_all_match test_must_fail git reset --merge deepest
+'
+
+test_expect_success 'checkout and reset (keep)' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents a &&
+	test_all_match git reset --keep deepest &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard update-deep &&
+	run_on_all ../edit-contents deep/a &&
+	test_all_match test_must_fail git reset --keep deepest
+'
+
+test_expect_success 'reset with pathspecs inside sparse definition' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents deep/a &&
+
+	test_all_match git reset base -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset base -- nonexistent-file &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset deepest -- deep &&
+	test_all_match git status --porcelain=v2
+'
+
+# Although the working tree differs between full and sparse checkouts after
+# reset, the state of the index is the same.
+test_expect_success 'reset with pathspecs outside sparse definition' '
+	init_repos &&
+	test_all_match git checkout -b reset-test base &&
+
+	test_sparse_match git reset update-folder1 -- folder1 &&
+	git -C full-checkout reset update-folder1 -- folder1 &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_all_match git rev-parse HEAD:folder1 &&
+
+	test_sparse_match git reset update-folder2 -- folder2/a &&
+	git -C full-checkout reset update-folder2 -- folder2/a &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_all_match git rev-parse HEAD:folder2/a
+'
+
+test_expect_success 'reset with wildcard pathspec' '
+	init_repos &&
+
+	test_all_match git reset update-deep -- deep\* &&
+	test_all_match git ls-files -s -- deep &&
+
+	test_all_match git reset deepest -- deep\*\*\* &&
+	test_all_match git ls-files -s -- deep &&
+
+	# The following `git reset`s result in updating the index on files with
+	# `skip-worktree` enabled. To avoid failing due to discrepencies in reported
+	# "modified" files, `test_sparse_match` reset is performed separately from
+	# "full-checkout" reset, then the index contents of all repos are verified.
+
+	test_sparse_match git reset update-folder1 -- \*/a &&
+	git -C full-checkout reset update-folder1 -- \*/a &&
+	test_all_match git ls-files -s -- deep/a folder1/a &&
+
+	test_sparse_match git reset update-folder2 -- folder\* &&
+	git -C full-checkout reset update-folder2 -- folder\* &&
+	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
+
+	test_sparse_match git reset base -- folder1/\* &&
+	git -C full-checkout reset base -- folder1/\* &&
+	test_all_match git ls-files -s -- folder1
 '
 
 test_expect_success 'merge, cherry-pick, and rebase' '
@@ -680,20 +798,61 @@ test_expect_success 'submodule handling' '
 
 	# having a submodule prevents "modules" from collapse
 	test_sparse_match git sparse-checkout set deep/deeper1 &&
-	test-tool -C sparse-index read-cache --table >cache &&
-	grep "100644 blob .*	modules/a" cache &&
-	grep "160000 commit $(git -C initial-repo rev-parse HEAD)	modules/sub" cache
+	git -C sparse-index ls-files --sparse --stage >cache &&
+	grep "100644 .*	modules/a" cache &&
+	grep "160000 $(git -C initial-repo rev-parse HEAD) 0	modules/sub" cache
 '
 
+# When working with a sparse index, some commands will need to expand the
+# index to operate properly. If those commands also write the index back
+# to disk, they need to convert the index to sparse before writing.
+# This test verifies that both of these events are logged in trace2 logs.
 test_expect_success 'sparse-index is expanded and converted back' '
 	init_repos &&
 
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index -c core.fsmonitor="" reset --hard &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C sparse-index reset -- folder1/a &&
 	test_region index convert_to_sparse trace2.txt &&
+	test_region index ensure_full_index trace2.txt &&
+
+	# ls-files expands on read, but does not write.
+	rm trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index ls-files &&
 	test_region index ensure_full_index trace2.txt
 '
 
+test_expect_success 'index.sparse disabled inline uses full index' '
+	init_repos &&
+
+	# When index.sparse is disabled inline with `git status`, the
+	# index is expanded at the beginning of the execution then never
+	# converted back to sparse. It is then written to disk as a full index.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index -c index.sparse=false status &&
+	! test_region index convert_to_sparse trace2.txt &&
+	test_region index ensure_full_index trace2.txt &&
+
+	# Since index.sparse is set to true at a repo level, the index
+	# is converted from full to sparse when read, then never expanded
+	# over the course of `git status`. It is written to disk as a sparse
+	# index.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index status &&
+	test_region index convert_to_sparse trace2.txt &&
+	! test_region index ensure_full_index trace2.txt &&
+
+	# Now that the index has been written to disk as sparse, it is not
+	# converted to sparse (or expanded to full) when read by `git status`.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index status &&
+	! test_region index convert_to_sparse trace2.txt &&
+	! test_region index ensure_full_index trace2.txt
+'
+
 ensure_not_expanded () {
 	rm -f trace2.txt &&
 	echo >>sparse-index/untracked.txt &&
@@ -702,10 +861,10 @@ ensure_not_expanded () {
 	then
 		shift &&
 		test_must_fail env \
-			GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+			GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 			git -C sparse-index "$@" || return 1
 	else
-		GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 			git -C sparse-index "$@" || return 1
 	fi &&
 	test_region ! index ensure_full_index trace2.txt
@@ -715,6 +874,7 @@ test_expect_success 'sparse-index is not expanded' '
 	init_repos &&
 
 	ensure_not_expanded status &&
+	ensure_not_expanded ls-files --sparse &&
 	ensure_not_expanded commit --allow-empty -m empty &&
 	echo >>sparse-index/a &&
 	ensure_not_expanded commit -a -m a &&
@@ -726,9 +886,9 @@ test_expect_success 'sparse-index is not expanded' '
 	ensure_not_expanded checkout - &&
 	ensure_not_expanded switch rename-out-to-out &&
 	ensure_not_expanded switch - &&
-	git -C sparse-index reset --hard &&
+	ensure_not_expanded reset --hard &&
 	ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
-	git -C sparse-index reset --hard &&
+	ensure_not_expanded reset --hard &&
 	ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
 
 	echo >>sparse-index/README.md &&
@@ -738,6 +898,34 @@ test_expect_success 'sparse-index is not expanded' '
 	echo >>sparse-index/untracked.txt &&
 	ensure_not_expanded add . &&
 
+	for ref in update-deep update-folder1 update-folder2 update-deep
+	do
+		echo >>sparse-index/README.md &&
+		ensure_not_expanded reset --hard $ref || return 1
+	done &&
+
+	ensure_not_expanded reset --mixed base &&
+	ensure_not_expanded reset --hard update-deep &&
+	ensure_not_expanded reset --keep base &&
+	ensure_not_expanded reset --merge update-deep &&
+	ensure_not_expanded reset --hard &&
+
+	ensure_not_expanded reset base -- deep/a &&
+	ensure_not_expanded reset base -- nonexistent-file &&
+	ensure_not_expanded reset deepest -- deep &&
+
+	# Although folder1 is outside the sparse definition, it exists as a
+	# directory entry in the index, so the pathspec will not force the
+	# index to be expanded.
+	ensure_not_expanded reset deepest -- folder1 &&
+	ensure_not_expanded reset deepest -- folder1/ &&
+
+	# Wildcard identifies only in-cone files, no index expansion
+	ensure_not_expanded reset deepest -- deep/\* &&
+
+	# Wildcard identifies only full sparse directories, no index expansion
+	ensure_not_expanded reset deepest -- folder\* &&
+
 	ensure_not_expanded checkout -f update-deep &&
 	test_config -C sparse-index pull.twohead ort &&
 	(
@@ -767,6 +955,158 @@ test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
 	)
 '
 
+test_expect_success 'sparse index is not expanded: diff' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Add file within cone
+	test_sparse_match git sparse-checkout set deep &&
+	run_on_all ../edit-contents deep/testfile &&
+	test_all_match git add deep/testfile &&
+	run_on_all ../edit-contents deep/testfile &&
+
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	ensure_not_expanded diff &&
+	ensure_not_expanded diff --cached &&
+
+	# Add file outside cone
+	test_all_match git reset --hard &&
+	run_on_all mkdir newdirectory &&
+	run_on_all ../edit-contents newdirectory/testfile &&
+	test_sparse_match git sparse-checkout set newdirectory &&
+	test_all_match git add newdirectory/testfile &&
+	run_on_all ../edit-contents newdirectory/testfile &&
+	test_sparse_match git sparse-checkout set &&
+
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	ensure_not_expanded diff &&
+	ensure_not_expanded diff --cached &&
+
+	# Merge conflict outside cone
+	# The sparse checkout will report a warning that is not in the
+	# full checkout, so we use `run_on_all` instead of
+	# `test_all_match`
+	run_on_all git reset --hard &&
+	test_all_match git checkout merge-left &&
+	test_all_match test_must_fail git merge merge-right &&
+
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	ensure_not_expanded diff &&
+	ensure_not_expanded diff --cached
+'
+
+test_expect_success 'sparse index is not expanded: blame' '
+	init_repos &&
+
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		ensure_not_expanded blame $file
+	done
+'
+
+test_expect_success 'sparse index is not expanded: fetch/pull' '
+	init_repos &&
+
+	git -C sparse-index remote add full "file://$(pwd)/full-checkout" &&
+	ensure_not_expanded fetch full &&
+	git -C full-checkout commit --allow-empty -m "for pull merge" &&
+	git -C sparse-index commit --allow-empty -m "for pull merge" &&
+	ensure_not_expanded pull full base
+'
+
+test_expect_success 'ls-files' '
+	init_repos &&
+
+	# Use a smaller sparse-checkout for reduced output
+	test_sparse_match git sparse-checkout set &&
+
+	# Behavior agrees by default. Sparse index is expanded.
+	test_all_match git ls-files &&
+
+	# With --sparse, the sparse index data changes behavior.
+	git -C sparse-index ls-files --sparse >actual &&
+
+	cat >expect <<-\EOF &&
+	a
+	deep/
+	e
+	folder1-
+	folder1.x
+	folder1/
+	folder10
+	folder2/
+	g
+	x/
+	z
+	EOF
+
+	test_cmp expect actual &&
+
+	# With --sparse and no sparse index, nothing changes.
+	git -C sparse-checkout ls-files >dense &&
+	git -C sparse-checkout ls-files --sparse >sparse &&
+	test_cmp dense sparse &&
+
+	# Set up a strange condition of having a file edit
+	# outside of the sparse-checkout cone. This is just
+	# to verify that sparse-checkout and sparse-index
+	# behave the same in this case.
+	write_script edit-content <<-\EOF &&
+	mkdir folder1 &&
+	echo content >>folder1/a
+	EOF
+	run_on_sparse ../edit-content &&
+
+	# ls-files does not currently notice modified files whose
+	# cache entries are marked SKIP_WORKTREE. This may change
+	# in the future, but here we test that sparse index does
+	# not accidentally create a change of behavior.
+	test_sparse_match git ls-files --modified &&
+	test_must_be_empty sparse-checkout-out &&
+	test_must_be_empty sparse-index-out &&
+
+	git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
+	test_must_be_empty sparse-index-out &&
+
+	# Add folder1 to the sparse-checkout cone and
+	# check that ls-files shows the expanded files.
+	test_sparse_match git sparse-checkout add folder1 &&
+	test_sparse_match git ls-files --modified &&
+
+	test_all_match git ls-files &&
+	git -C sparse-index ls-files --sparse >actual &&
+
+	cat >expect <<-\EOF &&
+	a
+	deep/
+	e
+	folder1-
+	folder1.x
+	folder1/0/0/0
+	folder1/0/1
+	folder1/a
+	folder10
+	folder2/
+	g
+	x/
+	z
+	EOF
+
+	test_cmp expect actual &&
+
+	# Double-check index expansion is avoided
+	ensure_not_expanded ls-files --sparse
+'
+
 # NEEDSWORK: a sparse-checkout behaves differently from a full checkout
 # in this scenario, but it shouldn't.
 test_expect_success 'reset mixed and checkout orphan' '
@@ -782,13 +1122,13 @@ test_expect_success 'reset mixed and checkout orphan' '
 	# the sparse checkouts skip "adding" the other side of
 	# the conflict.
 	test_sparse_match git reset --mixed HEAD~1 &&
-	test_sparse_match test-tool read-cache --table --expand &&
+	test_sparse_match git ls-files --stage &&
 	test_sparse_match git status --porcelain=v2 &&
 
 	# At this point, sparse-checkouts behave differently
 	# from the full-checkout.
 	test_sparse_match git checkout --orphan new-branch &&
-	test_sparse_match test-tool read-cache --table --expand &&
+	test_sparse_match git ls-files --stage &&
 	test_sparse_match git status --porcelain=v2
 '
 
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 9ff46f3b04..78359f1f4a 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -8,6 +8,7 @@ test_description='Test git config in different settings'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'clear default config' '
@@ -717,8 +718,8 @@ test_expect_success bool '
 	rm -f result &&
 	for i in 1 2 3 4
 	do
-	    git config --bool --get bool.true$i >>result
-	    git config --bool --get bool.false$i >>result
+	    git config --bool --get bool.true$i >>result &&
+	    git config --bool --get bool.false$i >>result || return 1
 	done &&
 	test_cmp expect result'
 
@@ -901,7 +902,7 @@ test_expect_success 'get --expiry-date' '
 	EOF
 	: "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
 	{
-		echo "$rel_out $(git config --expiry-date date.valid1)"
+		echo "$rel_out $(git config --expiry-date date.valid1)" &&
 		git config --expiry-date date.valid2 &&
 		git config --expiry-date date.valid3 &&
 		git config --expiry-date date.valid4 &&
diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 0000e664e7..0506f3d6bb 100755
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='Test wacky input to git config'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Leaving off the newline is intentional!
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index 930dce06f0..0a7099d6f5 100755
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='support for reading config from a blob'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'create config blob' '
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 88b119a0a3..b38e158d3b 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -2,6 +2,7 @@
 
 test_description='Test git config-set API in different settings'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # 'check_config get_* section.key value' verifies that the entry for
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index b4a9158307..537435b90a 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -2,6 +2,7 @@
 
 test_description='Test read_early_config()'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'read early config' '
diff --git a/t/t1310-config-default.sh b/t/t1310-config-default.sh
index 6049d91708..09b10c144b 100755
--- a/t/t1310-config-default.sh
+++ b/t/t1310-config-default.sh
@@ -2,6 +2,7 @@
 
 test_description='Test git config in different settings (with --default)'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'uses --default when entry missing' '
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 0d4f73acaa..cf58cf025c 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -4,9 +4,6 @@
 #
 
 test_description='Test git update-ref and basic ref logging'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 
 Z=$ZERO_OID
@@ -321,8 +318,9 @@ $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150260 +0000	Switch
 $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150860 +0000
 EOF
 test_expect_success "verifying $m's log (logged by touch)" '
-	test_when_finished "rm -rf .git/$m .git/logs expect" &&
-	test_cmp expect .git/logs/$m
+	test_when_finished "git update-ref -d $m && rm -rf .git/logs actual expect" &&
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp actual expect
 '
 
 test_expect_success "create $m (logged by config)" '
@@ -350,8 +348,9 @@ $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 +0000	Switch
 $B $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 +0000
 EOF
 test_expect_success "verifying $m's log (logged by config)" '
-	test_when_finished "rm -f .git/$m .git/logs/$m expect" &&
-	test_cmp expect .git/logs/$m
+	test_when_finished "git update-ref -d $m && rm -rf .git/logs actual expect" &&
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp actual expect
 '
 
 test_expect_success 'set up for querying the reflog' '
@@ -467,7 +466,8 @@ $h_OTHER $h_FIXED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151040 +0000	co
 $h_FIXED $h_MERGED $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117151100 +0000	commit (merge): Merged initial commit and a later commit.
 EOF
 test_expect_success 'git commit logged updates' '
-	test_cmp expect .git/logs/$m
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp expect actual
 '
 unset h_TEST h_OTHER h_FIXED h_MERGED
 
@@ -1368,7 +1368,7 @@ test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches
 (
 	for i in $(test_seq 33)
 	do
-		echo "create refs/heads/$i HEAD"
+		echo "create refs/heads/$i HEAD" || exit 1
 	done >large_input &&
 	run_with_limited_open_files git update-ref --stdin <large_input &&
 	git rev-parse --verify -q refs/heads/33
@@ -1379,7 +1379,7 @@ test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction deleting branches
 (
 	for i in $(test_seq 33)
 	do
-		echo "delete refs/heads/$i HEAD"
+		echo "delete refs/heads/$i HEAD" || exit 1
 	done >large_input &&
 	run_with_limited_open_files git update-ref --stdin <large_input &&
 	test_must_fail git rev-parse --verify -q refs/heads/33
diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index 17d3cc1405..9252a581ab 100755
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -4,6 +4,7 @@ test_description='show-ref'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -78,7 +79,7 @@ test_expect_success 'show-ref --verify -q' '
 test_expect_success 'show-ref -d' '
 	{
 		echo $(git rev-parse refs/tags/A) refs/tags/A &&
-		echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}"
+		echo $(git rev-parse refs/tags/A^0) "refs/tags/A^{}" &&
 		echo $(git rev-parse refs/tags/C) refs/tags/C
 	} >expect &&
 	git show-ref -d A C >actual &&
@@ -123,14 +124,14 @@ test_expect_success 'show-ref -d' '
 test_expect_success 'show-ref --heads, --tags, --head, pattern' '
 	for branch in B main side
 	do
-		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch
+		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch || return 1
 	done >expect.heads &&
 	git show-ref --heads >actual &&
 	test_cmp expect.heads actual &&
 
 	for tag in A B C
 	do
-		echo $(git rev-parse refs/tags/$tag) refs/tags/$tag
+		echo $(git rev-parse refs/tags/$tag) refs/tags/$tag || return 1
 	done >expect.tags &&
 	git show-ref --tags >actual &&
 	test_cmp expect.tags actual &&
@@ -148,7 +149,7 @@ test_expect_success 'show-ref --heads, --tags, --head, pattern' '
 
 	{
 		echo $(git rev-parse HEAD) HEAD &&
-		echo $(git rev-parse refs/heads/B) refs/heads/B
+		echo $(git rev-parse refs/heads/B) refs/heads/B &&
 		echo $(git rev-parse refs/tags/B) refs/tags/B
 	} >expect &&
 	git show-ref --head B >actual &&
@@ -156,8 +157,8 @@ test_expect_success 'show-ref --heads, --tags, --head, pattern' '
 
 	{
 		echo $(git rev-parse HEAD) HEAD &&
-		echo $(git rev-parse refs/heads/B) refs/heads/B
-		echo $(git rev-parse refs/tags/B) refs/tags/B
+		echo $(git rev-parse refs/heads/B) refs/heads/B &&
+		echo $(git rev-parse refs/tags/B) refs/tags/B &&
 		echo $(git rev-parse refs/tags/B^0) "refs/tags/B^{}"
 	} >expect &&
 	git show-ref --head -d B >actual &&
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index b729c1f480..13c2b43bba 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -261,69 +261,69 @@ test_expect_success REFFILES 'empty directory should not fool 1-arg delete' '
 	git update-ref --stdin
 '
 
-test_expect_success 'D/F conflict prevents add long + delete short' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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' '
+test_expect_success REFFILES '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
 '
 
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index 49718b7ea7..1a3ee8845d 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -17,8 +17,7 @@ test_expect_success 'setup' '
 test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
 	N=`find .git/refs -type f | wc -l` &&
 	test "$N" != 0 &&
-	ALL_OR_PRUNE_FLAG=3 &&
-	$RUN pack-refs ${ALL_OR_PRUNE_FLAG} &&
+	$RUN pack-refs PACK_REFS_PRUNE,PACK_REFS_ALL &&
 	N=`find .git/refs -type f` &&
 	test -z "$N"
 '
@@ -35,8 +34,7 @@ test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
 	git rev-parse FOO -- &&
 	git rev-parse refs/tags/new-tag -- &&
 	m=$(git rev-parse main) &&
-	REF_NO_DEREF=1 &&
-	$RUN delete-refs $REF_NO_DEREF nothing FOO refs/tags/new-tag &&
+	$RUN delete-refs REF_NO_DEREF nothing FOO refs/tags/new-tag &&
 	test_must_fail git rev-parse --symbolic-full-name FOO &&
 	test_must_fail git rev-parse FOO -- &&
 	test_must_fail git rev-parse refs/tags/new-tag --
@@ -89,13 +87,13 @@ test_expect_success 'for_each_reflog()' '
 test_expect_success 'for_each_reflog_ent()' '
 	$RUN for-each-reflog-ent HEAD >actual &&
 	head -n1 actual | grep one &&
-	tail -n2 actual | head -n1 | grep recreate-main
+	tail -n1 actual | grep recreate-main
 '
 
 test_expect_success 'for_each_reflog_ent_reverse()' '
 	$RUN for-each-reflog-ent-reverse HEAD >actual &&
 	head -n1 actual | grep recreate-main &&
-	tail -n2 actual | head -n1 | grep one
+	tail -n1 actual | grep one
 '
 
 test_expect_success 'reflog_exists(HEAD)' '
@@ -108,7 +106,7 @@ test_expect_success 'delete_reflog(HEAD)' '
 '
 
 test_expect_success 'create-reflog(HEAD)' '
-	$RUN create-reflog HEAD 1 &&
+	$RUN create-reflog HEAD &&
 	git reflog exists HEAD
 '
 
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
index 0a87058971..e6a7f7334b 100755
--- a/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@ -5,6 +5,7 @@ test_description='test submodule ref store api'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 RUN="test-tool ref-store submodule:sub"
@@ -74,13 +75,13 @@ test_expect_success 'for_each_reflog()' '
 test_expect_success 'for_each_reflog_ent()' '
 	$RUN for-each-reflog-ent HEAD >actual &&
 	head -n1 actual | grep first &&
-	tail -n2 actual | head -n1 | grep main.to.new
+	tail -n1 actual | grep main.to.new
 '
 
 test_expect_success 'for_each_reflog_ent_reverse()' '
 	$RUN for-each-reflog-ent-reverse HEAD >actual &&
 	head -n1 actual | grep main.to.new &&
-	tail -n2 actual | head -n1 | grep first
+	tail -n1 actual | grep first
 '
 
 test_expect_success 'reflog_exists(HEAD)' '
@@ -92,7 +93,7 @@ test_expect_success 'delete_reflog() not allowed' '
 '
 
 test_expect_success 'create-reflog() not allowed' '
-	test_must_fail $RUN create-reflog HEAD 1
+	test_must_fail $RUN create-reflog HEAD
 '
 
 test_done
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index d42f067ff8..d7ddf7612d 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -349,12 +349,12 @@ test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
 		printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
 		if test $i = 75; then
 			for j in $(test_seq 1 89); do
-				printf X
+				printf X || return 1
 			done
 		else
 			printf X
 		fi &&
-		printf "\n"
+		printf "\n" || return 1
 	done >.git/logs/refs/heads/reflogskip &&
 	git rev-parse reflogskip@{73} >actual &&
 	echo ${zf}03 >expect &&
diff --git a/t/t1417-reflog-updateref.sh b/t/t1417-reflog-updateref.sh
new file mode 100755
index 0000000000..14f13b57c6
--- /dev/null
+++ b/t/t1417-reflog-updateref.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+test_description='git reflog --updateref'
+
+TEST_PASSES_SANITIZE_LEAK=true
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	git init -b main repo &&
+	(
+		cd repo &&
+
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+
+		cp .git/logs/HEAD HEAD.old &&
+		git reset --hard HEAD~ &&
+		cp HEAD.old .git/logs/HEAD
+	)
+'
+
+test_reflog_updateref () {
+	exp=$1
+	shift
+	args="$@"
+
+	test_expect_success REFFILES "get '$exp' with '$args'"  '
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
+
+		(
+			cd copy &&
+
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
+
+			test_cmp expect actual
+		)
+	'
+}
+
+test_reflog_updateref B git reflog delete --updateref HEAD@{0}
+test_reflog_updateref B git reflog delete --updateref HEAD@{1}
+test_reflog_updateref C git reflog delete --updateref main@{0}
+test_reflog_updateref B git reflog delete --updateref main@{1}
+test_reflog_updateref B git reflog delete --updateref --rewrite HEAD@{0}
+test_reflog_updateref B git reflog delete --updateref --rewrite HEAD@{1}
+test_reflog_updateref C git reflog delete --updateref --rewrite main@{0}
+test_reflog_updateref B git reflog delete --updateref --rewrite main@{1}
+test_reflog_updateref B test_must_fail git reflog expire  HEAD@{0}
+test_reflog_updateref B test_must_fail git reflog expire  HEAD@{1}
+test_reflog_updateref B test_must_fail git reflog expire  main@{0}
+test_reflog_updateref B test_must_fail git reflog expire  main@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref HEAD@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref HEAD@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref main@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref main@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite HEAD@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite HEAD@{1}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite main@{0}
+test_reflog_updateref B test_must_fail git reflog expire --updateref --rewrite main@{1}
+
+test_done
diff --git a/t/t1420-lost-found.sh b/t/t1420-lost-found.sh
index dc9e402c55..dbe15a0be1 100755
--- a/t/t1420-lost-found.sh
+++ b/t/t1420-lost-found.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='Test fsck --lost-found'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index 4c77cf89a6..ff1c967d55 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -9,7 +9,8 @@ TEST_PASSES_SANITIZE_LEAK=true
 
 test_expect_success setup '
 	test_commit one &&
-	test_commit two
+	test_commit two &&
+	main_sha1=$(git rev-parse refs/heads/main)
 '
 
 test_expect_success 'fast-import: fail on invalid branch name ".badbranchname"' '
@@ -43,16 +44,16 @@ test_expect_success 'fast-import: fail on invalid branch name "bad[branch]name"'
 '
 
 test_expect_success 'git branch shows badly named ref as warning' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git branch >output 2>error &&
 	test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
 	! grep -e "broken\.\.\.ref" output
 '
 
 test_expect_success 'branch -d can delete badly named ref' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git branch -d broken...ref &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
@@ -60,8 +61,8 @@ test_expect_success 'branch -d can delete badly named ref' '
 '
 
 test_expect_success 'branch -D can delete badly named ref' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git branch -D broken...ref &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
@@ -90,7 +91,7 @@ test_expect_success 'branch -D cannot delete absolute path' '
 '
 
 test_expect_success 'git branch cannot create a badly named ref' '
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	test_must_fail git branch broken...ref &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
@@ -98,7 +99,7 @@ test_expect_success 'git branch cannot create a badly named ref' '
 '
 
 test_expect_success 'branch -m cannot rename to a bad ref name' '
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	test_might_fail git branch -D goodref &&
 	git branch goodref &&
 	test_must_fail git branch -m goodref broken...ref &&
@@ -109,8 +110,9 @@ test_expect_success 'branch -m cannot rename to a bad ref name' '
 '
 
 test_expect_failure 'branch -m can rename from a bad ref name' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git branch -m broken...ref renamed &&
 	test_cmp_rev main renamed &&
 	git branch >output 2>error &&
@@ -119,7 +121,7 @@ test_expect_failure 'branch -m can rename from a bad ref name' '
 '
 
 test_expect_success 'push cannot create a badly named ref' '
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	test_must_fail git push "file://$(pwd)" HEAD:refs/heads/broken...ref &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
@@ -139,7 +141,7 @@ test_expect_failure 'push --mirror can delete badly named ref' '
 		cd dest &&
 		test_commit two &&
 		git checkout --detach &&
-		cp .git/refs/heads/main .git/refs/heads/broken...ref
+		test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION
 	) &&
 	git -C src push --mirror "file://$top/dest" &&
 	git -C dest branch >output 2>error &&
@@ -148,11 +150,11 @@ test_expect_failure 'push --mirror can delete badly named ref' '
 '
 
 test_expect_success 'rev-parse skips symref pointing to broken name' '
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git branch shadow one &&
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
-	test_when_finished "rm -f .git/refs/tags/shadow" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test-tool ref-store main create-symref refs/tags/shadow refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/tags/shadow" &&
 	git rev-parse --verify one >expect &&
 	git rev-parse --verify shadow >actual 2>err &&
 	test_cmp expect actual &&
@@ -160,12 +162,12 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
 '
 
 test_expect_success 'for-each-ref emits warnings for broken names' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
-	test_when_finished "rm -f .git/refs/heads/badname" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
 	printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
-	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
 	git for-each-ref >output 2>error &&
 	! grep -e "broken\.\.\.ref" output &&
 	! grep -e "badname" output &&
@@ -176,8 +178,8 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
 '
 
 test_expect_success 'update-ref -d can delete broken name' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git update-ref -d refs/heads/broken...ref >output 2>error &&
 	test_must_be_empty output &&
 	test_must_be_empty error &&
@@ -187,8 +189,8 @@ test_expect_success 'update-ref -d can delete broken name' '
 '
 
 test_expect_success 'branch -d can delete broken name' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
 	git branch -d broken...ref >output 2>error &&
 	test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
 	test_must_be_empty error &&
@@ -198,10 +200,11 @@ test_expect_success 'branch -d can delete broken name' '
 '
 
 test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
-	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
-	test_when_finished "rm -f .git/refs/heads/badname" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
 	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
 	test_path_is_missing .git/refs/heads/badname &&
 	test_must_be_empty output &&
@@ -209,10 +212,10 @@ test_expect_success 'update-ref --no-deref -d can delete symref to broken name'
 '
 
 test_expect_success 'branch -d can delete symref to broken name' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
-	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
-	test_when_finished "rm -f .git/refs/heads/badname" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
 	git branch -d badname >output 2>error &&
 	test_path_is_missing .git/refs/heads/badname &&
 	test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@@ -220,8 +223,8 @@ test_expect_success 'branch -d can delete symref to broken name' '
 '
 
 test_expect_success 'update-ref --no-deref -d can delete dangling symref to broken name' '
-	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
-	test_when_finished "rm -f .git/refs/heads/badname" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
 	git update-ref --no-deref -d refs/heads/badname >output 2>error &&
 	test_path_is_missing .git/refs/heads/badname &&
 	test_must_be_empty output &&
@@ -229,8 +232,8 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref to brok
 '
 
 test_expect_success 'branch -d can delete dangling symref to broken name' '
-	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
-	test_when_finished "rm -f .git/refs/heads/badname" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
 	git branch -d badname >output 2>error &&
 	test_path_is_missing .git/refs/heads/badname &&
 	test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
@@ -238,10 +241,10 @@ test_expect_success 'branch -d can delete dangling symref to broken name' '
 '
 
 test_expect_success 'update-ref -d can delete broken name through symref' '
-	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
-	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
-	printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
-	test_when_finished "rm -f .git/refs/heads/badname" &&
+	test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
+	test-tool ref-store main create-symref refs/heads/badname refs/heads/broken...ref msg &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
 	git update-ref -d refs/heads/badname >output 2>error &&
 	test_path_is_missing .git/refs/heads/broken...ref &&
 	test_must_be_empty output &&
@@ -250,7 +253,7 @@ test_expect_success 'update-ref -d can delete broken name through symref' '
 
 test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
 	printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
-	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
 	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
 	test_path_is_missing .git/refs/heads/broken...symref &&
 	test_must_be_empty output &&
@@ -259,7 +262,7 @@ test_expect_success 'update-ref --no-deref -d can delete symref with broken name
 
 test_expect_success 'branch -d can delete symref with broken name' '
 	printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
-	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
 	git branch -d broken...symref >output 2>error &&
 	test_path_is_missing .git/refs/heads/broken...symref &&
 	test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
@@ -268,7 +271,7 @@ test_expect_success 'branch -d can delete symref with broken name' '
 
 test_expect_success 'update-ref --no-deref -d can delete dangling symref with broken name' '
 	printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
-	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
 	git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
 	test_path_is_missing .git/refs/heads/broken...symref &&
 	test_must_be_empty output &&
@@ -277,7 +280,7 @@ test_expect_success 'update-ref --no-deref -d can delete dangling symref with br
 
 test_expect_success 'branch -d can delete dangling symref with broken name' '
 	printf "ref: refs/heads/idonotexist\n" >.git/refs/heads/broken...symref &&
-	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
+	test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
 	git branch -d broken...symref >output 2>error &&
 	test_path_is_missing .git/refs/heads/broken...symref &&
 	test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 6337236fd8..de50c0ea01 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -94,13 +94,13 @@ test_expect_success 'object with hash and type mismatch' '
 	)
 '
 
-test_expect_success POSIXPERM 'zlib corrupt loose object output ' '
+test_expect_success 'zlib corrupt loose object output ' '
 	git init --bare corrupt-loose-output &&
 	(
 		cd corrupt-loose-output &&
 		oid=$(git hash-object -w --stdin --literally </dev/null) &&
 		oidf=objects/$(test_oid_to_path "$oid") &&
-		chmod 755 $oidf &&
+		chmod +w $oidf &&
 		echo extra garbage >>$oidf &&
 
 		cat >expect.error <<-EOF &&
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 40958615eb..94fe413ee3 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -9,6 +9,7 @@ exec </dev/null
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 add_line_into_file()
diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh
index 2803ca9489..4a5758f08a 100755
--- a/t/t1505-rev-parse-last.sh
+++ b/t/t1505-rev-parse-last.sh
@@ -5,6 +5,7 @@ test_description='test @{-N} syntax'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 65a154a8a2..18688cae17 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -7,6 +7,7 @@ exec </dev/null
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_did_you_mean ()
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 7891a6becf..b0119bf8bc 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -34,10 +34,7 @@ fi
 test_expect_success 'blob and tree' '
 	test_tick &&
 	(
-		for i in 0 1 2 3 4 5 6 7 8 9
-		do
-			echo $i
-		done &&
+		test_write_lines 0 1 2 3 4 5 6 7 8 9 &&
 		echo &&
 		echo b1rwzyc3
 	) >a0blgqsjc &&
@@ -204,10 +201,7 @@ test_expect_success 'more history' '
 	git checkout v1.0.0^0 &&
 	git mv a0blgqsjc f5518nwu &&
 
-	for i in h62xsjeu j08bekfvt kg7xflhm
-	do
-		echo $i
-	done >>f5518nwu &&
+	test_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
 	git add f5518nwu &&
 
 	test_tick &&
@@ -387,7 +381,7 @@ test_expect_success 'ambiguous commits are printed by type first, then hash orde
 	do
 		grep $type objects >$type.objects &&
 		sort $type.objects >$type.objects.sorted &&
-		test_cmp $type.objects.sorted $type.objects
+		test_cmp $type.objects.sorted $type.objects || return 1
 	done
 '
 
diff --git a/t/t1513-rev-parse-prefix.sh b/t/t1513-rev-parse-prefix.sh
index 5f437be8c9..ba43387bf1 100755
--- a/t/t1513-rev-parse-prefix.sh
+++ b/t/t1513-rev-parse-prefix.sh
@@ -5,6 +5,7 @@ test_description='Tests for rev-parse --prefix'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t1515-rev-parse-outside-repo.sh b/t/t1515-rev-parse-outside-repo.sh
index 3ec2971ee5..cdb26a30d7 100755
--- a/t/t1515-rev-parse-outside-repo.sh
+++ b/t/t1515-rev-parse-outside-repo.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='check that certain rev-parse options work outside repo'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'set up non-repo directory' '
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index 46329c488b..010989f90e 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -2,6 +2,7 @@
 
 test_description='index file specific tests'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 sane_unset GIT_TEST_SPLIT_INDEX
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index decd2527ed..b4ab166369 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -48,10 +48,10 @@ test_expect_success 'enable split index' '
 	# NEEDSWORK: Stop hard-coding checksums.
 	if test "$indexversion" = "4"
 	then
-		own=$(test_oid own_v4)
+		own=$(test_oid own_v4) &&
 		base=$(test_oid base_v4)
 	else
-		own=$(test_oid own_v3)
+		own=$(test_oid own_v3) &&
 		base=$(test_oid base_v3)
 	fi &&
 
diff --git a/t/t2000-conflict-when-checking-files-out.sh b/t/t2000-conflict-when-checking-files-out.sh
index f18616ad2b..79fc97f1d7 100755
--- a/t/t2000-conflict-when-checking-files-out.sh
+++ b/t/t2000-conflict-when-checking-files-out.sh
@@ -21,6 +21,7 @@ test_description='git conflicts when checking files out test.'
 # path1 is occupied by a non-directory.  With "-f" flag, it should remove
 # the conflicting paths and succeed.
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 show_files() {
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index 9bb503a975..b16d69ca4a 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -57,7 +57,7 @@ test_expect_success 'checkout all stage 0 to temporary files' '
 		test $(grep $f actual | cut "-d	" -f2) = $f &&
 		p=$(grep $f actual | cut "-d	" -f1) &&
 		test -f $p &&
-		test $(cat $p) = tree1$f
+		test $(cat $p) = tree1$f || return 1
 	done
 '
 
@@ -85,7 +85,7 @@ test_expect_success 'checkout all stage 2 to temporary files' '
 		test $(grep $f actual | cut "-d	" -f2) = $f &&
 		p=$(grep $f actual | cut "-d	" -f1) &&
 		test -f $p &&
-		test $(cat $p) = tree2$f
+		test $(cat $p) = tree2$f || return 1
 	done
 '
 
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index 6f0b90ce12..bd9e9e7530 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -7,6 +7,7 @@ test_description='git checkout to switch between branches with symlink<->dir'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2008-checkout-subdir.sh b/t/t2008-checkout-subdir.sh
index eadb9434ae..8a518a44ea 100755
--- a/t/t2008-checkout-subdir.sh
+++ b/t/t2008-checkout-subdir.sh
@@ -4,6 +4,7 @@
 
 test_description='git checkout from subdirectories'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2009-checkout-statinfo.sh b/t/t2009-checkout-statinfo.sh
index b0540636ae..71195dd28f 100755
--- a/t/t2009-checkout-statinfo.sh
+++ b/t/t2009-checkout-statinfo.sh
@@ -5,6 +5,7 @@ test_description='checkout should leave clean stat info'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 6e8757387d..9d4b37526a 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -5,6 +5,7 @@ test_description='checkout and pathspecs/refspecs ambiguities'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index e52022e152..d9997e7b6b 100755
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -5,6 +5,7 @@ test_description='checkout switching away from an invalid branch'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index 0e7d47ab31..42601d5a31 100755
--- a/t/t2012-checkout-last.sh
+++ b/t/t2012-checkout-last.sh
@@ -49,14 +49,14 @@ test_expect_success '"checkout -" detaches again' '
 test_expect_success 'more switches' '
 	for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
 	do
-		git checkout -b branch$i
+		git checkout -b branch$i || return 1
 	done
 '
 
 more_switches () {
 	for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
 	do
-		git checkout branch$i
+		git checkout branch$i || return 1
 	done
 }
 
diff --git a/t/t2014-checkout-switch.sh b/t/t2014-checkout-switch.sh
index ccfb147113..c138bdde4f 100755
--- a/t/t2014-checkout-switch.sh
+++ b/t/t2014-checkout-switch.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='Peter MacMillan'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh
index 88d6992a5e..947d1587ac 100755
--- a/t/t2017-checkout-orphan.sh
+++ b/t/t2017-checkout-orphan.sh
@@ -10,6 +10,7 @@ Main Tests for --orphan functionality.'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 TEST_FILE=foo
@@ -62,8 +63,17 @@ test_expect_success '--orphan ignores branch.autosetupmerge' '
 	git checkout main &&
 	git config branch.autosetupmerge always &&
 	git checkout --orphan gamma &&
-	test -z "$(git config branch.gamma.merge)" &&
+	test_cmp_config "" --default "" branch.gamma.merge &&
 	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git checkout main &&
+	git config branch.autosetupmerge inherit &&
+	git checkout --orphan eta &&
+	test_cmp_config "" --default "" branch.eta.merge &&
+	test_cmp_config "" --default "" branch.eta.remote &&
+	echo refs/heads/eta >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual &&
 	test_must_fail git rev-parse --verify HEAD^
 '
 
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 93be1c0eae..52e51b0726 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -85,6 +85,19 @@ test_expect_success 'setup' '
 	git branch -m branch1
 '
 
+test_expect_success 'checkout a branch without refs/heads/* prefix' '
+	git clone --no-tags . repo-odd-prefix &&
+	(
+		cd repo-odd-prefix &&
+
+		origin=$(git symbolic-ref refs/remotes/origin/HEAD) &&
+		git symbolic-ref refs/heads/a-branch "$origin" &&
+
+		git checkout -f a-branch &&
+		git checkout -f a-branch
+	)
+'
+
 test_expect_success 'checkout -b to a new branch, set to HEAD' '
 	test_when_finished "
 		git checkout branch1 &&
@@ -148,7 +161,7 @@ test_expect_success 'checkout -b to an existing branch fails' '
 test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
 	git checkout branch1 &&
 	git checkout branch2 &&
-	echo  >expect "fatal: A branch named '\''branch1'\'' already exists." &&
+	echo  >expect "fatal: a branch named '\''branch1'\'' already exists" &&
 	test_must_fail git checkout -b @{-1} 2>actual &&
 	test_cmp expect actual
 '
diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
index b99d5192a9..2c8c926b4d 100755
--- a/t/t2019-checkout-ambiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='checkout handling of ambiguous (branch/tag) refs'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup ambiguous refs' '
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
index 660132ff8d..713c3fa603 100755
--- a/t/t2021-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='checkout must not overwrite an untracked objects'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2022-checkout-paths.sh b/t/t2022-checkout-paths.sh
index c49ba7f9bd..f1b709d58b 100755
--- a/t/t2022-checkout-paths.sh
+++ b/t/t2022-checkout-paths.sh
@@ -4,6 +4,7 @@ test_description='checkout $tree -- $paths'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
index fa9e098706..8f13341cf8 100755
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -25,7 +25,7 @@ test_expect_success 'checkout --no-overlay removing last file from directory' '
 
 test_expect_success 'checkout -p --overlay is disallowed' '
 	test_must_fail git checkout -p --overlay HEAD 2>actual &&
-	test_i18ngrep "fatal: -p and --overlay are mutually exclusive" actual
+	test_i18ngrep "fatal: options .-p. and .--overlay. cannot be used together" actual
 '
 
 test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
diff --git a/t/t2026-checkout-pathspec-file.sh b/t/t2026-checkout-pathspec-file.sh
index 43d31d7948..9c651aefbc 100755
--- a/t/t2026-checkout-pathspec-file.sh
+++ b/t/t2026-checkout-pathspec-file.sh
@@ -2,6 +2,7 @@
 
 test_description='checkout --pathspec-from-file'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_tick
@@ -148,16 +149,16 @@ test_expect_success 'error conditions' '
 	echo fileA.t >list &&
 
 	test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --detach" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
 
 	test_must_fail git checkout --pathspec-from-file=list --patch 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
 
 	test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git checkout --pathspec-file-nul 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
 '
 
 test_done
diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
index 4453741b96..dca35aa3e3 100755
--- a/t/t2027-checkout-track.sh
+++ b/t/t2027-checkout-track.sh
@@ -24,4 +24,27 @@ test_expect_success 'checkout --track -b rejects an extra path argument' '
 	test_i18ngrep "cannot be used with updating paths" err
 '
 
+test_expect_success 'checkout --track -b overrides autoSetupMerge=inherit' '
+	# Set up tracking config on main
+	test_config branch.main.remote origin &&
+	test_config branch.main.merge refs/heads/some-branch &&
+	test_config branch.autoSetupMerge inherit &&
+	# With --track=inherit, we copy the tracking config from main
+	git checkout --track=inherit -b b1 main &&
+	test_cmp_config origin branch.b1.remote &&
+	test_cmp_config refs/heads/some-branch branch.b1.merge &&
+	# With branch.autoSetupMerge=inherit, we do the same
+	git checkout -b b2 main &&
+	test_cmp_config origin branch.b2.remote &&
+	test_cmp_config refs/heads/some-branch branch.b2.merge &&
+	# But --track overrides this
+	git checkout --track -b b3 main &&
+	test_cmp_config . branch.b3.remote &&
+	test_cmp_config refs/heads/main branch.b3.merge &&
+	# And --track=direct does as well
+	git checkout --track=direct -b b4 main &&
+	test_cmp_config . branch.b4.remote &&
+	test_cmp_config refs/heads/main branch.b4.merge
+'
+
 test_done
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
index 9bc6a3aa5c..ebb961be29 100755
--- a/t/t2060-switch.sh
+++ b/t/t2060-switch.sh
@@ -107,4 +107,32 @@ test_expect_success 'not switching when something is in progress' '
 	test_must_fail git switch -d @^
 '
 
+test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
+	# default config does not copy tracking info
+	git switch -c foo-no-inherit foo &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with --track=inherit, we copy tracking info from foo
+	git switch --track=inherit -c foo2 foo &&
+	test_cmp_config origin branch.foo2.remote &&
+	test_cmp_config refs/heads/foo branch.foo2.merge &&
+	# with autoSetupMerge=inherit, we do the same
+	test_config branch.autoSetupMerge inherit &&
+	git switch -c foo3 foo &&
+	test_cmp_config origin branch.foo3.remote &&
+	test_cmp_config refs/heads/foo branch.foo3.merge &&
+	# with --track, we override autoSetupMerge
+	git switch --track -c foo4 foo &&
+	test_cmp_config . branch.foo4.remote &&
+	test_cmp_config refs/heads/foo branch.foo4.merge &&
+	# and --track=direct does as well
+	git switch --track=direct -c foo5 foo &&
+	test_cmp_config . branch.foo5.remote &&
+	test_cmp_config refs/heads/foo branch.foo5.merge &&
+	# no tracking info to inherit from main
+	git switch -c main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
+'
+
 test_done
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh
index b48345bf95..c22669b39f 100755
--- a/t/t2072-restore-pathspec-file.sh
+++ b/t/t2072-restore-pathspec-file.sh
@@ -152,13 +152,13 @@ test_expect_success 'error conditions' '
 	>empty_list &&
 
 	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
 
 	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
 	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
 	test_i18ngrep -e "you must specify path(s) to restore" err
diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh
index 2df3fdde8b..7915e7b821 100755
--- a/t/t2100-update-cache-badpath.sh
+++ b/t/t2100-update-cache-badpath.sh
@@ -22,6 +22,7 @@ and tries to git update-index --add the following:
 All of the attempts should fail.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 mkdir path2 path3
diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh
index 6c32d42c8c..e3c7acdbf9 100755
--- a/t/t2101-update-index-reupdate.sh
+++ b/t/t2101-update-index-reupdate.sh
@@ -6,6 +6,7 @@
 test_description='git update-index --again test.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'update-index --add' '
diff --git a/t/t2102-update-index-symlinks.sh b/t/t2102-update-index-symlinks.sh
index 22f2c730ae..c49cdfb6e5 100755
--- a/t/t2102-update-index-symlinks.sh
+++ b/t/t2102-update-index-symlinks.sh
@@ -8,6 +8,7 @@ test_description='git update-index on filesystem w/o symlinks test.
 This tests that git update-index keeps the symbolic link property
 even if a plain file is in the working tree if core.symlinks is false.'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success \
@@ -25,7 +26,7 @@ test_expect_success \
 'the index entry must still be a symbolic link' '
 case "$(git ls-files --stage --cached symlink)" in
 120000" "*symlink) echo pass;;
-*) echo fail; git ls-files --stage --cached symlink; (exit 1);;
+*) echo fail; git ls-files --stage --cached symlink; false;;
 esac'
 
 test_done
diff --git a/t/t2103-update-index-ignore-missing.sh b/t/t2103-update-index-ignore-missing.sh
index 0114f05228..e9451cd567 100755
--- a/t/t2103-update-index-ignore-missing.sh
+++ b/t/t2103-update-index-ignore-missing.sh
@@ -2,6 +2,7 @@
 
 test_description='update-index with options'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success basics '
@@ -23,7 +24,7 @@ test_expect_success basics '
 	test_cmp expect actual &&
 
 	git update-index --add one two three &&
-	for i in one three two; do echo $i; done >expect &&
+	test_write_lines one three two >expect &&
 	git ls-files >actual &&
 	test_cmp expect actual &&
 
diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh
index 30666fc70d..b8686aabd3 100755
--- a/t/t2104-update-index-skip-worktree.sh
+++ b/t/t2104-update-index-skip-worktree.sh
@@ -5,6 +5,7 @@
 
 test_description='skip-worktree bit test'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 sane_unset GIT_TEST_SPLIT_INDEX
diff --git a/t/t2105-update-index-gitfile.sh b/t/t2105-update-index-gitfile.sh
index a7f3d47aec..963ebe77eb 100755
--- a/t/t2105-update-index-gitfile.sh
+++ b/t/t2105-update-index-gitfile.sh
@@ -6,6 +6,7 @@
 test_description='git update-index for gitlink to .git file.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'submodule with absolute .git file' '
diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
index 2d450daf5c..d943ddf47e 100755
--- a/t/t2106-update-index-assume-unchanged.sh
+++ b/t/t2106-update-index-assume-unchanged.sh
@@ -3,6 +3,7 @@
 test_description='git update-index --assume-unchanged test.
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 94c4cb0672..acd3650d3c 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -14,6 +14,7 @@ only the updates to dir/sub.
 Also tested are "git add -u" without limiting, and "git add -u"
 without contents changes, and other conditions'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -150,13 +151,13 @@ test_expect_success 'add -u resolves unmerged paths' '
 	{
 		for path in path1 path2
 		do
-			echo "100644 $one 1	$path"
-			echo "100644 $two 2	$path"
-			echo "100644 $three 3	$path"
-		done
-		echo "100644 $one 1	path3"
-		echo "100644 $one 1	path4"
-		echo "100644 $one 3	path5"
+			echo "100644 $one 1	$path" &&
+			echo "100644 $two 2	$path" &&
+			echo "100644 $three 3	$path" || return 1
+		done &&
+		echo "100644 $one 1	path3" &&
+		echo "100644 $one 1	path4" &&
+		echo "100644 $one 3	path5" &&
 		echo "100644 $one 3	path6"
 	} |
 	git update-index --index-info &&
@@ -173,8 +174,8 @@ test_expect_success 'add -u resolves unmerged paths' '
 	git add -u &&
 	git ls-files -s path1 path2 path3 path4 path5 path6 >actual &&
 	{
-		echo "100644 $three 0	path1"
-		echo "100644 $two 0	path3"
+		echo "100644 $three 0	path1" &&
+		echo "100644 $two 0	path3" &&
 		echo "100644 $two 0	path5"
 	} >expect &&
 	test_cmp expect actual
diff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh
index a4eec0a346..dba62d69c6 100755
--- a/t/t2201-add-update-typechange.sh
+++ b/t/t2201-add-update-typechange.sh
@@ -2,6 +2,7 @@
 
 test_description='more git add -u'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -97,17 +98,17 @@ test_expect_success modify '
 		"
 	} >expect &&
 	{
-		cat expect
-		echo ":100644 160000 $_empty $ZERO_OID T	yonk"
+		cat expect &&
+		echo ":100644 160000 $_empty $ZERO_OID T	yonk" &&
 		echo ":100644 000000 $_empty $ZERO_OID D	zifmia"
 	} >expect-files &&
 	{
-		cat expect
+		cat expect &&
 		echo ":000000 160000 $ZERO_OID $ZERO_OID A	yonk"
 	} >expect-index &&
 	{
-		echo "100644 $_empty 0	nitfol"
-		echo "160000 $yomin 0	yomin"
+		echo "100644 $_empty 0	nitfol" &&
+		echo "160000 $yomin 0	yomin" &&
 		echo "160000 $yonk 0	yonk"
 	} >expect-final
 '
diff --git a/t/t2202-add-addremove.sh b/t/t2202-add-addremove.sh
index 9ee659098c..24c60bfd79 100755
--- a/t/t2202-add-addremove.sh
+++ b/t/t2202-add-addremove.sh
@@ -2,6 +2,7 @@
 
 test_description='git add --all'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index cf0175ad6e..db7ca55998 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -116,7 +116,7 @@ test_expect_success 'cache-tree does not ignore dir that has i-t-a entries' '
 		mkdir 2 &&
 		for f in 1 2/1 2/2 3
 		do
-			echo "$f" >"$f"
+			echo "$f" >"$f" || return 1
 		done &&
 		git add 1 2/2 3 &&
 		git add -N 2/1 &&
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 2e07365bbb..89424abccd 100755
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -2,6 +2,7 @@
 
 test_description='giving ignored paths to git add'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index a615d3b483..3d28c7f06b 100755
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -19,7 +19,7 @@ test_expect_success 'worktree prune on normal repo' '
 test_expect_success 'prune files inside $GIT_DIR/worktrees' '
 	mkdir .git/worktrees &&
 	: >.git/worktrees/abc &&
-	git worktree prune --verbose >actual &&
+	git worktree prune --verbose 2>actual &&
 	cat >expect <<EOF &&
 Removing worktrees/abc: not a valid directory
 EOF
@@ -34,7 +34,7 @@ test_expect_success 'prune directories without gitdir' '
 	cat >expect <<EOF &&
 Removing worktrees/def: gitdir file does not exist
 EOF
-	git worktree prune --verbose >actual &&
+	git worktree prune --verbose 2>actual &&
 	test_cmp expect actual &&
 	! test -d .git/worktrees/def &&
 	! test -d .git/worktrees
@@ -45,7 +45,7 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' '
 	: >.git/worktrees/def/def &&
 	: >.git/worktrees/def/gitdir &&
 	chmod u-r .git/worktrees/def/gitdir &&
-	git worktree prune --verbose >actual &&
+	git worktree prune --verbose 2>actual &&
 	test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual &&
 	! test -d .git/worktrees/def &&
 	! test -d .git/worktrees
@@ -55,7 +55,7 @@ test_expect_success 'prune directories with invalid gitdir' '
 	mkdir -p .git/worktrees/def/abc &&
 	: >.git/worktrees/def/def &&
 	: >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose >actual &&
+	git worktree prune --verbose 2>actual &&
 	test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual &&
 	! test -d .git/worktrees/def &&
 	! test -d .git/worktrees
@@ -65,7 +65,7 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' '
 	mkdir -p .git/worktrees/def/abc &&
 	: >.git/worktrees/def/def &&
 	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose >actual &&
+	git worktree prune --verbose 2>actual &&
 	test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
 	! test -d .git/worktrees/def &&
 	! test -d .git/worktrees
@@ -101,7 +101,7 @@ test_expect_success 'prune duplicate (linked/linked)' '
 	git worktree add --detach w2 &&
 	sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
 	mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
-	git worktree prune --verbose >actual &&
+	git worktree prune --verbose 2>actual &&
 	test_i18ngrep "duplicate entry" actual &&
 	test -d .git/worktrees/w1 &&
 	! test -d .git/worktrees/w2
@@ -114,7 +114,7 @@ test_expect_success 'prune duplicate (main/linked)' '
 	git -C repo worktree add --detach ../wt &&
 	rm -fr wt &&
 	mv repo wt &&
-	git -C wt worktree prune --verbose >actual &&
+	git -C wt worktree prune --verbose 2>actual &&
 	test_i18ngrep "duplicate entry" actual &&
 	! test -d .git/worktrees/wt
 '
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 4012bd67b0..c8a5a0aac6 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -134,7 +134,7 @@ test_expect_success '"list" all worktrees with prunable consistent with "prune"'
 	git worktree list >out &&
 	grep "/prunable  *[0-9a-f].* prunable$" out &&
 	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
-	git worktree prune --verbose >out &&
+	git worktree prune --verbose 2>out &&
 	test_i18ngrep "^Removing worktrees/prunable" out &&
 	test_i18ngrep ! "^Removing worktrees/unprunable" out
 '
diff --git a/t/t2404-worktree-config.sh b/t/t2404-worktree-config.sh
index 9536d10919..842937bfb9 100755
--- a/t/t2404-worktree-config.sh
+++ b/t/t2404-worktree-config.sh
@@ -2,6 +2,7 @@
 
 test_description="config file in multi worktree"
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t2406-worktree-repair.sh b/t/t2406-worktree-repair.sh
index f73741886b..5c44453e1c 100755
--- a/t/t2406-worktree-repair.sh
+++ b/t/t2406-worktree-repair.sh
@@ -45,9 +45,8 @@ test_corrupt_gitfile () {
 	git worktree add --detach corrupt &&
 	git -C corrupt rev-parse --absolute-git-dir >expect &&
 	eval "$butcher" &&
-	git -C "$repairdir" worktree repair >out 2>err &&
-	test_i18ngrep "$problem" out &&
-	test_must_be_empty err &&
+	git -C "$repairdir" worktree repair 2>err &&
+	test_i18ngrep "$problem" err &&
 	git -C corrupt rev-parse --absolute-git-dir >actual &&
 	test_cmp expect actual
 }
@@ -130,10 +129,9 @@ test_expect_success 'repair broken gitdir' '
 	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
 	rm .git/worktrees/orig/gitdir &&
 	mv orig moved &&
-	git worktree repair moved >out 2>err &&
+	git worktree repair moved 2>err &&
 	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_i18ngrep "gitdir unreadable" out &&
-	test_must_be_empty err
+	test_i18ngrep "gitdir unreadable" err
 '
 
 test_expect_success 'repair incorrect gitdir' '
@@ -141,10 +139,9 @@ test_expect_success 'repair incorrect gitdir' '
 	git worktree add --detach orig &&
 	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
 	mv orig moved &&
-	git worktree repair moved >out 2>err &&
+	git worktree repair moved 2>err &&
 	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_i18ngrep "gitdir incorrect" out &&
-	test_must_be_empty err
+	test_i18ngrep "gitdir incorrect" err
 '
 
 test_expect_success 'repair gitdir (implicit) from linked worktree' '
@@ -152,10 +149,9 @@ test_expect_success 'repair gitdir (implicit) from linked worktree' '
 	git worktree add --detach orig &&
 	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
 	mv orig moved &&
-	git -C moved worktree repair >out 2>err &&
+	git -C moved worktree repair 2>err &&
 	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_i18ngrep "gitdir incorrect" out &&
-	test_must_be_empty err
+	test_i18ngrep "gitdir incorrect" err
 '
 
 test_expect_success 'unable to repair gitdir (implicit) from main worktree' '
@@ -163,9 +159,8 @@ test_expect_success 'unable to repair gitdir (implicit) from main worktree' '
 	git worktree add --detach orig &&
 	cat .git/worktrees/orig/gitdir >expect &&
 	mv orig moved &&
-	git worktree repair >out 2>err &&
+	git worktree repair 2>err &&
 	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_must_be_empty out &&
 	test_must_be_empty err
 '
 
@@ -178,12 +173,11 @@ test_expect_success 'repair multiple gitdir files' '
 	sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
 	mv orig1 moved1 &&
 	mv orig2 moved2 &&
-	git worktree repair moved1 moved2 >out 2>err &&
+	git worktree repair moved1 moved2 2>err &&
 	test_cmp expect1 .git/worktrees/orig1/gitdir &&
 	test_cmp expect2 .git/worktrees/orig2/gitdir &&
-	test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" out &&
-	test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" out &&
-	test_must_be_empty err
+	test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" err &&
+	test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" err
 '
 
 test_expect_success 'repair moved main and linked worktrees' '
diff --git a/t/t2501-cwd-empty.sh b/t/t2501-cwd-empty.sh
new file mode 100755
index 0000000000..f6d8d7d03d
--- /dev/null
+++ b/t/t2501-cwd-empty.sh
@@ -0,0 +1,277 @@
+#!/bin/sh
+
+test_description='Test handling of the current working directory becoming empty'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	test_commit init &&
+
+	git branch fd_conflict &&
+
+	mkdir -p foo/bar &&
+	test_commit foo/bar/baz &&
+
+	git revert HEAD &&
+	git tag reverted &&
+
+	git checkout fd_conflict &&
+	mkdir dirORfile &&
+	test_commit dirORfile/foo &&
+
+	git rm -r dirORfile &&
+	echo not-a-directory >dirORfile &&
+	git add dirORfile &&
+	git commit -m dirORfile &&
+
+	git switch -c df_conflict HEAD~1 &&
+	test_commit random_file &&
+
+	git switch -c undo_fd_conflict fd_conflict &&
+	git revert HEAD
+'
+
+test_incidental_dir_removal () {
+	test_when_finished "git reset --hard" &&
+
+	git checkout foo/bar/baz^{commit} &&
+	test_path_is_dir foo/bar &&
+
+	(
+		cd foo &&
+		"$@" &&
+
+		# Make sure foo still exists, and commands needing it work
+		test-tool getcwd &&
+		git status --porcelain
+	) &&
+	test_path_is_missing foo/bar/baz &&
+	test_path_is_missing foo/bar &&
+
+	test_path_is_dir foo
+}
+
+test_required_dir_removal () {
+	git checkout df_conflict^{commit} &&
+	test_when_finished "git clean -fdx" &&
+
+	(
+		cd dirORfile &&
+
+		# Ensure command refuses to run
+		test_must_fail "$@" 2>../error &&
+		grep "Refusing to remove.*current working directory" ../error &&
+
+		# ...and that the index and working tree are left clean
+		git diff --exit-code HEAD &&
+
+		# Ensure that getcwd and git status do not error out (which
+		# they might if the current working directory had been removed)
+		test-tool getcwd &&
+		git status --porcelain
+	) &&
+
+	test_path_is_dir dirORfile
+}
+
+test_expect_success 'checkout does not clean cwd incidentally' '
+	test_incidental_dir_removal git checkout init
+'
+
+test_expect_success 'checkout fails if cwd needs to be removed' '
+	test_required_dir_removal git checkout fd_conflict
+'
+
+test_expect_success 'reset --hard does not clean cwd incidentally' '
+	test_incidental_dir_removal git reset --hard init
+'
+
+test_expect_success 'reset --hard fails if cwd needs to be removed' '
+	test_required_dir_removal git reset --hard fd_conflict
+'
+
+test_expect_success 'merge does not clean cwd incidentally' '
+	test_incidental_dir_removal git merge reverted
+'
+
+# This file uses some simple merges where
+#   Base: 'dirORfile/' exists
+#   Side1: random other file changed
+#   Side2: 'dirORfile/' removed, 'dirORfile' added
+# this should resolve cleanly, but merge-recursive throws merge conflicts
+# because it's dumb.  Add a special test for checking merge-recursive (and
+# merge-ort), then after this just hard require ort for all remaining tests.
+#
+test_expect_success 'merge fails if cwd needs to be removed; recursive friendly' '
+	git checkout foo/bar/baz &&
+	test_when_finished "git clean -fdx" &&
+
+	mkdir dirORfile &&
+	(
+		cd dirORfile &&
+
+		test_must_fail git merge fd_conflict 2>../error
+	) &&
+
+	test_path_is_dir dirORfile &&
+	grep "Refusing to remove the current working directory" error
+'
+
+GIT_TEST_MERGE_ALGORITHM=ort
+
+test_expect_success 'merge fails if cwd needs to be removed' '
+	test_required_dir_removal git merge fd_conflict
+'
+
+test_expect_success 'cherry-pick does not clean cwd incidentally' '
+	test_incidental_dir_removal git cherry-pick reverted
+'
+
+test_expect_success 'cherry-pick fails if cwd needs to be removed' '
+	test_required_dir_removal git cherry-pick fd_conflict
+'
+
+test_expect_success 'rebase does not clean cwd incidentally' '
+	test_incidental_dir_removal git rebase reverted
+'
+
+test_expect_success 'rebase fails if cwd needs to be removed' '
+	test_required_dir_removal git rebase fd_conflict
+'
+
+test_expect_success 'revert does not clean cwd incidentally' '
+	test_incidental_dir_removal git revert HEAD
+'
+
+test_expect_success 'revert fails if cwd needs to be removed' '
+	test_required_dir_removal git revert undo_fd_conflict
+'
+
+test_expect_success 'rm does not clean cwd incidentally' '
+	test_incidental_dir_removal git rm bar/baz.t
+'
+
+test_expect_success 'apply does not remove cwd incidentally' '
+	git diff HEAD HEAD~1 >patch &&
+	test_incidental_dir_removal git apply ../patch
+'
+
+test_incidental_untracked_dir_removal () {
+	test_when_finished "git reset --hard" &&
+
+	git checkout foo/bar/baz^{commit} &&
+	mkdir -p untracked &&
+	mkdir empty
+	>untracked/random &&
+
+	(
+		cd untracked &&
+		"$@" &&
+
+		# Make sure untracked still exists, and commands needing it work
+		test-tool getcwd &&
+		git status --porcelain
+	) &&
+	test_path_is_missing empty &&
+	test_path_is_missing untracked/random &&
+
+	test_path_is_dir untracked
+}
+
+test_expect_success 'clean does not remove cwd incidentally' '
+	test_incidental_untracked_dir_removal \
+		git -C .. clean -fd -e warnings . >warnings &&
+	grep "Refusing to remove current working directory" warnings
+'
+
+test_expect_success 'stash does not remove cwd incidentally' '
+	test_incidental_untracked_dir_removal \
+		git stash --include-untracked
+'
+
+test_expect_success '`rm -rf dir` only removes a subset of dir' '
+	test_when_finished "rm -rf a/" &&
+
+	mkdir -p a/b/c &&
+	>a/b/c/untracked &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
+
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
+
+	test_path_is_dir a/b &&
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_file a/b/c/untracked
+'
+
+test_expect_success '`rm -rf dir` even with only tracked files will remove something else' '
+	test_when_finished "rm -rf a/" &&
+
+	mkdir -p a/b/c &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
+
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
+
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_missing a/b/c &&
+	test_path_is_dir a/b
+'
+
+test_expect_success 'git version continues working from a deleted dir' '
+	mkdir tmp &&
+	(
+		cd tmp &&
+		rm -rf ../tmp &&
+		git version
+	)
+'
+
+test_submodule_removal () {
+	path_status=$1 &&
+	shift &&
+
+	test_status=
+	test "$path_status" = dir && test_status=test_must_fail
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_when_finished "rm -rf .git/modules/my_submodule" &&
+
+	git checkout foo/bar/baz &&
+
+	git init my_submodule &&
+	touch my_submodule/file &&
+	git -C my_submodule add file &&
+	git -C my_submodule commit -m "initial commit" &&
+	git submodule add ./my_submodule &&
+	git commit -m "Add the submodule" &&
+
+	(
+		cd my_submodule &&
+		$test_status "$@"
+	) &&
+
+	test_path_is_${path_status} my_submodule
+}
+
+test_expect_success 'rm -r with -C leaves submodule if cwd inside' '
+	test_submodule_removal dir git -C .. rm -r my_submodule/
+'
+
+test_expect_success 'rm -r leaves submodule if cwd inside' '
+	test_submodule_removal dir \
+		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
+'
+
+test_expect_success 'rm -rf removes submodule even if cwd inside' '
+	test_submodule_removal missing \
+		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
+'
+
+test_done
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 6ba8b589cd..fbfa210a50 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -39,10 +39,7 @@ test_expect_success 'ls-files with mixed levels' '
 test_expect_success 'ls-files -c' '
 	(
 		cd top/sub &&
-		for f in ../y*
-		do
-			echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
-		done >expect.err &&
+		printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../y* >expect.err &&
 		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
 		ls ../x* >expect.out &&
 		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
@@ -54,10 +51,7 @@ test_expect_success 'ls-files -c' '
 test_expect_success 'ls-files -o' '
 	(
 		cd top/sub &&
-		for f in ../x*
-		do
-			echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
-		done >expect.err &&
+		printf "error: pathspec $SQ%s$SQ did not match any file(s) known to git\n" ../x* >expect.err &&
 		echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
 		ls ../y* >expect.out &&
 		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh
index 6abdcbbc94..bd65dfcffc 100755
--- a/t/t3040-subprojects-basic.sh
+++ b/t/t3040-subprojects-basic.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='Basic subproject functionality'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup: create superproject' '
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 72d5b014d8..f9539968e4 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -193,7 +193,7 @@ match() {
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
-			dirs=${file%/*}
+			dirs=${file%/*} &&
 			if test "$file" != "$dirs"
 			then
 				mkdir -p -- "$dirs" &&
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index e575ffb4ff..1bc3795847 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -168,6 +168,13 @@ test_expect_success 'git branch -M foo bar should fail when bar is checked out'
 	test_must_fail git branch -M bar foo
 '
 
+test_expect_success 'git branch -M foo bar should fail when bar is checked out in worktree' '
+	git branch -f bar &&
+	test_when_finished "git worktree remove wt && git branch -D wt" &&
+	git worktree add wt &&
+	test_must_fail git branch -M bar wt
+'
+
 test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
 	git checkout -b baz &&
 	git branch bam &&
@@ -731,6 +738,28 @@ test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for
 	test_must_fail git branch -m u v
 '
 
+test_expect_success SYMLINKS 'git branch -m with symlinked .git/refs' '
+	test_when_finished "rm -rf subdir" &&
+	git init --bare subdir &&
+
+	rm -rfv subdir/refs subdir/objects subdir/packed-refs &&
+	ln -s ../.git/refs subdir/refs &&
+	ln -s ../.git/objects subdir/objects &&
+	ln -s ../.git/packed-refs subdir/packed-refs &&
+
+	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
+	git rev-parse --absolute-git-dir >our.dir &&
+	! test_cmp subdir.dir our.dir &&
+
+	git -C subdir log &&
+	git -C subdir branch rename-src &&
+	git rev-parse rename-src >expect &&
+	git -C subdir branch -m rename-src rename-dest &&
+	git rev-parse rename-dest >actual &&
+	test_cmp expect actual &&
+	git branch -D rename-dest
+'
+
 test_expect_success 'test tracking setup via --track' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
@@ -866,7 +895,7 @@ test_expect_success '--set-upstream-to fails on a missing src branch' '
 '
 
 test_expect_success '--set-upstream-to fails on a non-ref' '
-	echo "fatal: Cannot setup tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch." >expect &&
+	echo "fatal: cannot set up tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch" >expect &&
 	test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
 	test_cmp expect err
 '
@@ -950,15 +979,15 @@ test_expect_success 'disabled option --set-upstream fails' '
 	test_must_fail git branch --set-upstream origin/main
 '
 
-test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
+test_expect_success '--set-upstream-to notices an error to set branch as own upstream' "
 	git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
 	cat >expect <<-\EOF &&
-	warning: Not setting branch my13 as its own upstream.
+	warning: not setting branch 'my13' as its own upstream
 	EOF
 	test_expect_code 1 git config branch.my13.remote &&
 	test_expect_code 1 git config branch.my13.merge &&
 	test_cmp expect actual
-'
+"
 
 # Keep this test last, as it changes the current branch
 cat >expect <<EOF
@@ -1418,8 +1447,51 @@ test_expect_success 'invalid sort parameter in configuration' '
 	(
 		cd sort &&
 		git config branch.sort "v:notvalid" &&
-		test_must_fail git branch
+
+		# this works in the "listing" mode, so bad sort key
+		# is a dying offence.
+		test_must_fail git branch &&
+
+		# these do not need to use sorting, and should all
+		# succeed
+		git branch newone main &&
+		git branch -c newone newerone &&
+		git branch -m newone newestone &&
+		git branch -d newerone newestone
 	)
 '
 
+test_expect_success 'tracking info copied with --track=inherit' '
+	git branch --track=inherit foo2 my1 &&
+	test_cmp_config local branch.foo2.remote &&
+	test_cmp_config refs/heads/main branch.foo2.merge
+'
+
+test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
+	test_unconfig branch.autoSetupMerge &&
+	# default config does not copy tracking info
+	git branch foo-no-inherit my1 &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with autoSetupMerge=inherit, we copy tracking info from my1
+	test_config branch.autoSetupMerge inherit &&
+	git branch foo3 my1 &&
+	test_cmp_config local branch.foo3.remote &&
+	test_cmp_config refs/heads/main branch.foo3.merge &&
+	# no tracking info to inherit from main
+	git branch main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
+'
+
+test_expect_success '--track overrides branch.autoSetupMerge' '
+	test_config branch.autoSetupMerge inherit &&
+	git branch --track=direct foo4 my1 &&
+	test_cmp_config . branch.foo4.remote &&
+	test_cmp_config refs/heads/my1 branch.foo4.merge &&
+	git branch --no-track foo5 my1 &&
+	test_cmp_config "" --default "" branch.foo5.remote &&
+	test_cmp_config "" --default "" branch.foo5.merge
+'
+
 test_done
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 349a810cee..800fc33165 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -2,9 +2,6 @@
 
 test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh
index ad9902a06b..7a1be73ce8 100755
--- a/t/t3202-show-branch.sh
+++ b/t/t3202-show-branch.sh
@@ -4,12 +4,15 @@ test_description='test show-branch'
 
 . ./test-lib.sh
 
+# arbitrary reference time: 2009-08-30 19:20:00
+GIT_TEST_DATE_NOW=1251660000; export GIT_TEST_DATE_NOW
+
 test_expect_success 'setup' '
 	test_commit initial &&
 	for i in $(test_seq 1 10)
 	do
 		git checkout -b branch$i initial &&
-		test_commit --no-tag branch$i
+		test_commit --no-tag branch$i || return 1
 	done &&
 	git for-each-ref \
 		--sort=version:refname \
@@ -49,7 +52,7 @@ test_expect_success 'show-branch with more than 8 branches' '
 test_expect_success 'show-branch with showbranch.default' '
 	for branch in $(cat branches.sorted)
 	do
-		test_config showbranch.default $branch --add
+		test_config showbranch.default $branch --add || return 1
 	done &&
 	git show-branch >actual &&
 	test_cmp expect actual
@@ -124,7 +127,7 @@ test_expect_success 'show branch --merge-base with one argument' '
 	do
 		git rev-parse $branch >expect &&
 		git show-branch --merge-base $branch >actual &&
-		test_cmp expect actual
+		test_cmp expect actual || return 1
 	done
 '
 
@@ -133,7 +136,7 @@ test_expect_success 'show branch --merge-base with two arguments' '
 	do
 		git rev-parse initial >expect &&
 		git show-branch --merge-base initial $branch >actual &&
-		test_cmp expect actual
+		test_cmp expect actual || return 1
 	done
 '
 
@@ -146,4 +149,16 @@ test_expect_success 'show branch --merge-base with N arguments' '
 	test_cmp expect actual
 '
 
+test_expect_success 'show branch --reflog=2' '
+	sed "s/^>	//" >expect <<-\EOF &&
+	>	! [refs/heads/branch10@{0}] (4 years, 5 months ago) commit: branch10
+	>	 ! [refs/heads/branch10@{1}] (4 years, 5 months ago) commit: branch10
+	>	--
+	>	+  [refs/heads/branch10@{0}] branch10
+	>	++ [refs/heads/branch10@{1}] initial
+	EOF
+	git show-branch --reflog=2 >actual &&
+	test_cmp actual expect
+'
+
 test_done
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 6e94c6db7b..d34d77f893 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 test_description='git branch display tests'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh
index 6a521c1a3e..0b61da92b3 100755
--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 test_description='basic branch output coloring'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index ef8b63952e..bc9d8ee1e6 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -8,6 +8,7 @@ test_description='Test commit notes index (expensive!)'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 create_repo () {
diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh
index d47ce00f69..7e0a8960af 100755
--- a/t/t3303-notes-subtrees.sh
+++ b/t/t3303-notes-subtrees.sh
@@ -5,6 +5,7 @@ test_description='Test commit notes organized in subtrees'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 number_of_commits=100
@@ -30,7 +31,7 @@ verify_notes () {
 	while [ $i -gt 0 ]; do
 		echo "    commit #$i" &&
 		echo "    note for commit #$i" &&
-		i=$(($i-1));
+		i=$(($i-1)) || return 1
 	done > expect &&
 	test_cmp expect output
 }
@@ -42,7 +43,7 @@ test_expect_success "setup: create $number_of_commits commits" '
 		while [ $nr -lt $number_of_commits ]; do
 			nr=$(($nr+1)) &&
 			test_tick &&
-			cat <<INPUT_END
+			cat <<INPUT_END || return 1
 commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
@@ -178,7 +179,7 @@ verify_concatenated_notes () {
 		echo "    first note for commit #$i" &&
 		echo "    " &&
 		echo "    second note for commit #$i" &&
-		i=$(($i-1));
+		i=$(($i-1)) || return 1
 	done > expect &&
 	test_cmp expect output
 }
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index 94c1b02251..1f5964865a 100755
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -2,6 +2,7 @@
 
 test_description='Test that adding/removing many notes triggers automatic fanout restructuring'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 path_has_fanout() {
@@ -57,7 +58,7 @@ test_expect_success 'many notes created correctly with git-notes' '
 	do
 		echo "    commit #$i" &&
 		echo "    note #$i" &&
-		i=$(($i - 1));
+		i=$(($i - 1)) || return 1
 	done > expect &&
 	test_cmp expect output
 '
@@ -106,7 +107,7 @@ test_expect_success 'most notes deleted correctly with git-notes' '
 	do
 		echo "    commit #$i" &&
 		echo "    note #$i" &&
-		i=$(($i - 1));
+		i=$(($i - 1)) || return 1
 	done > expect &&
 	test_cmp expect output
 '
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 6b2d507f3e..bff0aea550 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -8,6 +8,7 @@ test_description='Test merging of notes trees in multiple worktrees'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup commit' '
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 23dbd3c82e..71b1735e1d 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -416,4 +416,25 @@ test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink'
 	mv actual_logs .git/logs
 '
 
+test_expect_success 'rebase when inside worktree subdirectory' '
+	git init main-wt &&
+	(
+		cd main-wt &&
+		git commit --allow-empty -m "initial" &&
+		mkdir -p foo/bar &&
+		test_commit foo/bar/baz &&
+		mkdir -p a/b &&
+		test_commit a/b/c &&
+		# create another branch for our other worktree
+		git branch other &&
+		git worktree add ../other-wt other &&
+		cd ../other-wt &&
+		# create and cd into a subdirectory
+		mkdir -p random/dir &&
+		cd random/dir &&
+		# now do the rebase
+		git rebase --onto HEAD^^ HEAD^  # drops the HEAD^ commit
+	)
+'
+
 test_done
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index cfde68f193..7e46f4ca85 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -68,7 +68,7 @@ test_expect_success 'merge and rebase should match' '
 	if test -s difference
 	then
 		cat difference
-		(exit 1)
+		false
 	else
 		echo happy
 	fi
@@ -102,7 +102,7 @@ test_expect_success 'merge and rebase should match' '
 	if test -s difference
 	then
 		cat difference
-		(exit 1)
+		false
 	else
 		echo happy
 	fi
@@ -117,7 +117,7 @@ test_expect_success 'picking rebase' '
 		echo happy
 	else
 		git show-branch
-		(exit 1)
+		false
 	fi &&
 	f=$(git diff-tree --name-only HEAD^ HEAD) &&
 	g=$(git diff-tree --name-only HEAD^^ HEAD^) &&
@@ -127,7 +127,7 @@ test_expect_success 'picking rebase' '
 	*)
 		echo "$f"
 		echo "$g"
-		(exit 1)
+		false
 	esac
 '
 
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 12eb226957..a38f2da769 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -25,8 +25,6 @@ Initial setup:
  where A, B, D and G all touch file1, and one, two, three, four all
  touch file "conflict".
 '
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
@@ -826,7 +824,7 @@ test_expect_success 'always cherry-pick with --no-ff' '
 	do
 		test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) &&
 		git diff HEAD~$p original-no-ff-branch~$p > out &&
-		test_must_be_empty out
+		test_must_be_empty out || return 1
 	done &&
 	test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
 	git diff HEAD~3 original-no-ff-branch~3 > out &&
@@ -1341,7 +1339,7 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
 		test_seq 5 | sed "s/$double/&&/" >seq &&
 		git add seq &&
 		test_tick &&
-		git commit -m seq-$double
+		git commit -m seq-$double || return 1
 	done &&
 	git tag seq-onto &&
 	git reset --hard HEAD~2 &&
diff --git a/t/t3409-rebase-environ.sh b/t/t3409-rebase-environ.sh
new file mode 100755
index 0000000000..83ffb39d9f
--- /dev/null
+++ b/t/t3409-rebase-environ.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+test_description='git rebase interactive environment'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit one &&
+	test_commit two &&
+	test_commit three
+'
+
+test_expect_success 'rebase --exec does not muck with GIT_DIR' '
+	git rebase --exec "printf %s \$GIT_DIR >environ" HEAD~1 &&
+	test_must_be_empty environ
+'
+
+test_expect_success 'rebase --exec does not muck with GIT_WORK_TREE' '
+	git rebase --exec "printf %s \$GIT_WORK_TREE >environ" HEAD~1 &&
+	test_must_be_empty environ
+'
+
+test_done
diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index 946e92f8da..96f2cf22fa 100755
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -115,9 +115,7 @@ test_expect_success 'at beginning of file' '
 	git config core.whitespace "blank-at-eol" &&
 	cp beginning file &&
 	git commit -m beginning file &&
-	for i in 1 2 3 4 5; do
-		echo $i
-	done >> file &&
+	test_write_lines 1 2 3 4 5 >>file &&
 	git commit -m more file &&
 	git rebase --whitespace=fix HEAD^^ &&
 	test_cmp expect-beginning file
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index eb0a3d9d48..6dabb05a2a 100755
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test if rebase detects and aborts on incompatible options'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh
index 7024d49ae7..abd66f3602 100755
--- a/t/t3429-rebase-edit-todo.sh
+++ b/t/t3429-rebase-edit-todo.sh
@@ -13,10 +13,15 @@ test_expect_success 'setup' '
 
 test_expect_success 'rebase exec modifies rebase-todo' '
 	todo=.git/rebase-merge/git-rebase-todo &&
-	git rebase HEAD -x "echo exec touch F >>$todo" &&
+	git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
 	test -e F
 '
 
+test_expect_success 'rebase exec with an empty list does not exec anything' '
+	git rebase HEAD -x "true" 2>output &&
+	! grep "Executing: true" output
+'
+
 test_expect_success 'loose object cache vs re-reading todo list' '
 	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
 	export GIT_REBASE_TODO &&
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 4c98d99e7e..1d0b15380e 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@ -83,7 +83,7 @@ test_expect_success 'git rebase --fork-point with ambigous refname' '
 
 test_expect_success '--fork-point and --root both given' '
 	test_must_fail git rebase --fork-point --root 2>err &&
-	test_i18ngrep "cannot combine" err
+	test_i18ngrep "cannot be used together" err
 '
 
 test_expect_success 'rebase.forkPoint set to false' '
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 4b5b607673..8617efaaf1 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -19,7 +19,7 @@ test_expect_success setup '
 
 	for l in a b c d e f g h i j k l m n o
 	do
-		echo $l$l$l$l$l$l$l$l$l
+		echo $l$l$l$l$l$l$l$l$l || return 1
 	done >oops &&
 
 	test_tick &&
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index e8375d1c97..2d53ce754c 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -29,7 +29,7 @@ test_expect_success setup '
 		git add file1 &&
 		test_tick &&
 		git commit -m "$val" &&
-		git tag $val
+		git tag $val || return 1
 	done
 '
 
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index bb9ef35dac..e74a318ac3 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -265,7 +265,7 @@ test_expect_success 'choking "git rm" should not let it die with cruft (induce S
 
 test_expect_success !MINGW 'choking "git rm" should not let it die with cruft (induce and check SIGPIPE)' '
 	choke_git_rm_setup &&
-	OUT=$( ((trap "" PIPE; git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
+	OUT=$( ((trap "" PIPE && git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
 	test_match_signal 13 "$OUT" &&
 	test_path_is_missing .git/index.lock
 '
@@ -274,10 +274,7 @@ test_expect_success 'Resolving by removal is not a warning-worthy event' '
 	git reset -q --hard &&
 	test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
 	blob=$(echo blob | git hash-object -w --stdin) &&
-	for stage in 1 2 3
-	do
-		echo "100644 $blob $stage	blob"
-	done | git update-index --index-info &&
+	printf "100644 $blob %d\tblob\n" 1 2 3 | git update-index --index-info &&
 	git rm blob >msg 2>&1 &&
 	test_i18ngrep ! "needs merge" msg &&
 	test_must_fail git ls-files -s --error-unmatch blob
diff --git a/t/t3601-rm-pathspec-file.sh b/t/t3601-rm-pathspec-file.sh
index b2a8db69af..a2a0c820fe 100755
--- a/t/t3601-rm-pathspec-file.sh
+++ b/t/t3601-rm-pathspec-file.sh
@@ -67,10 +67,10 @@ test_expect_success 'error conditions' '
 	echo fileA.t >list &&
 
 	test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git rm --pathspec-file-nul 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
 	>empty_list &&
 	test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 283a66955d..b1f90ba325 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -141,9 +141,9 @@ test_expect_success 'check correct prefix detection' '
 test_expect_success 'git add with filemode=0, symlinks=0, and unmerged entries' '
 	for s in 1 2 3
 	do
-		echo $s > stage$s
-		echo "100755 $(git hash-object -w stage$s) $s	file"
-		echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s	symlink"
+		echo $s > stage$s &&
+		echo "100755 $(git hash-object -w stage$s) $s	file" &&
+		echo "120000 $(printf $s | git hash-object -w -t blob --stdin) $s	symlink" || return 1
 	done | git update-index --index-info &&
 	git config core.filemode 0 &&
 	git config core.symlinks 0 &&
@@ -177,7 +177,7 @@ test_expect_success 'git add --refresh' '
 	git read-tree HEAD &&
 	case "$(git diff-index HEAD -- foo)" in
 	:100644" "*"M	foo") echo pass;;
-	*) echo fail; (exit 1);;
+	*) echo fail; false;;
 	esac &&
 	git add --refresh -- foo &&
 	test -z "$(git diff-index HEAD -- foo)"
diff --git a/t/t3702-add-edit.sh b/t/t3702-add-edit.sh
index 6c676645d8..a1801a8cbd 100755
--- a/t/t3702-add-edit.sh
+++ b/t/t3702-add-edit.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='add -e basic tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 
diff --git a/t/t3703-add-magic-pathspec.sh b/t/t3703-add-magic-pathspec.sh
index 3ef525a559..d84071038e 100755
--- a/t/t3703-add-magic-pathspec.sh
+++ b/t/t3703-add-magic-pathspec.sh
@@ -2,6 +2,7 @@
 
 test_description='magic pathspec tests using git-add'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t3704-add-pathspec-file.sh b/t/t3704-add-pathspec-file.sh
index 9e35c1fbca..4e6b5177c9 100755
--- a/t/t3704-add-pathspec-file.sh
+++ b/t/t3704-add-pathspec-file.sh
@@ -2,6 +2,7 @@
 
 test_description='add --pathspec-from-file'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_tick
@@ -137,19 +138,19 @@ test_expect_success 'error conditions' '
 	>empty_list &&
 
 	test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
 	test_must_fail git add --pathspec-from-file=list --patch 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
 	test_must_fail git add --pathspec-from-file=list --edit 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --edit" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
 
 	test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git add --pathspec-file-nul 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
 	# This case succeeds, but still prints to stderr
 	git add --pathspec-from-file=empty_list 2>err &&
diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index f3143c9290..81f3384eee 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -181,13 +181,13 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
 	# Avoid munging CRLFs to avoid an error message
 	git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
 	test_must_be_empty stderr &&
-	test-tool read-cache --table >actual &&
-	grep "^100644 blob.*sparse_entry\$" actual &&
+	git ls-files --stage >actual &&
+	grep "^100644 .*sparse_entry\$" actual &&
 
 	git add --sparse --chmod=+x sparse_entry 2>stderr &&
 	test_must_be_empty stderr &&
-	test-tool read-cache --table >actual &&
-	grep "^100755 blob.*sparse_entry\$" actual &&
+	git ls-files --stage >actual &&
+	grep "^100755 .*sparse_entry\$" actual &&
 
 	git reset &&
 
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 0544d58a6e..e3cf0ffbe5 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -72,7 +72,8 @@ check_verify_failure () {
 
 		# Manually create the broken, we cannot do it with
 		# update-ref
-		echo "$bad_tag" >"bad-tag/$tag_ref" &&
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
 		# Unlike fsck-ing unreachable content above, this
 		# will always fail.
@@ -83,7 +84,8 @@ check_verify_failure () {
 		# Make sure the earlier test created it for us
 		git rev-parse "$bad_tag" &&
 
-		echo "$bad_tag" >"bad-tag/$tag_ref" &&
+		test-tool -C bad-tag ref-store main delete-refs 0 msg "$tag_ref" &&
+		test-tool -C bad-tag ref-store main update-ref msg "$tag_ref" $bad_tag $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
 		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
 		git -C bad-tag for-each-ref "$tag_ref" >actual &&
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index f0a82be9de..686747e55a 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -10,6 +10,25 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
+test_expect_success 'usage on cmd and subcommand invalid option' '
+	test_expect_code 129 git stash --invalid-option 2>usage &&
+	grep "or: git stash" usage &&
+
+	test_expect_code 129 git stash push --invalid-option 2>usage &&
+	! grep "or: git stash" usage
+'
+
+test_expect_success 'usage on main command -h emits a summary of subcommands' '
+	test_expect_code 129 git stash -h >usage &&
+	grep -F "usage: git stash list" usage &&
+	grep -F "or: git stash show" usage
+'
+
+test_expect_failure 'usage for subcommands should emit subcommand usage' '
+	test_expect_code 129 git stash push -h >usage &&
+	grep -F "usage: git stash [push" usage
+'
+
 diff_cmp () {
 	for i in "$1" "$2"
 	do
@@ -288,6 +307,17 @@ test_expect_success 'stash --no-keep-index' '
 	test bar,bar2 = $(cat file),$(cat file2)
 '
 
+test_expect_success 'stash --staged' '
+	echo bar3 >file &&
+	echo bar4 >file2 &&
+	git add file2 &&
+	git stash --staged &&
+	test bar3,bar2 = $(cat file),$(cat file2) &&
+	git reset --hard &&
+	git stash pop &&
+	test bar,bar4 = $(cat file),$(cat file2)
+'
+
 test_expect_success 'dont assume push with non-option args' '
 	test_must_fail git stash -q drop 2>err &&
 	test_i18ngrep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err
@@ -1365,4 +1395,28 @@ test_expect_success 'git stash can pop directory -> file saved changes' '
 	)
 '
 
+test_expect_success 'restore untracked files even when we hit conflicts' '
+	git init restore_untracked_after_conflict &&
+	(
+		cd restore_untracked_after_conflict &&
+
+		echo hi >a &&
+		echo there >b &&
+		git add . &&
+		git commit -m first &&
+		echo hello >a &&
+		echo something >c &&
+
+		git stash push --include-untracked &&
+
+		echo conflict >a &&
+		git add a &&
+		git commit -m second &&
+
+		test_must_fail git stash pop &&
+
+		test_path_is_file c
+	)
+'
+
 test_done
diff --git a/t/t3908-stash-in-worktree.sh b/t/t3908-stash-in-worktree.sh
index 2b2b366ef9..347a89b030 100755
--- a/t/t3908-stash-in-worktree.sh
+++ b/t/t3908-stash-in-worktree.sh
@@ -5,6 +5,7 @@
 
 test_description='Test git stash in a worktree'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t3909-stash-pathspec-file.sh b/t/t3909-stash-pathspec-file.sh
index 55e050cfd4..dead9f18d9 100755
--- a/t/t3909-stash-pathspec-file.sh
+++ b/t/t3909-stash-pathspec-file.sh
@@ -88,13 +88,13 @@ test_expect_success 'error conditions' '
 	echo fileA.t >list &&
 
 	test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
 
 	test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git stash push --pathspec-file-nul 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
 '
 
 test_done
diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
index a8ad5462d9..0276edbe3d 100755
--- a/t/t3920-crlf-messages.sh
+++ b/t/t3920-crlf-messages.sh
@@ -70,7 +70,7 @@ test_crlf_subject_body_and_contents() {
 			for ref in ${LIB_CRLF_BRANCHES}
 			do
 				cat .crlf-${file}-\"\${ref}\".txt >>expect &&
-				printf \"\n\" >>expect
+				printf \"\n\" >>expect || return 1
 			done &&
 			git $command_and_args --format=\"%${atom}\" >actual &&
 			test_cmp expect actual
@@ -90,7 +90,7 @@ test_expect_success 'branch: --verbose works with messages using CRLF' '
 	do
 		printf "  " >>expect &&
 		cat .crlf-subject-${branch}.txt >>expect &&
-		printf "\n" >>expect
+		printf "\n" >>expect || return 1
 	done &&
 	git branch -v >tmp &&
 	# Remove first two columns, and the line for the currently checked out branch
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index cce334981e..bfcaae390f 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -6,6 +6,8 @@
 test_description='Test built-in diff output engine.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 68f2ebca58..3dc9047044 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -174,7 +174,7 @@ test_expect_success 'setup for many rename source candidates' '
 	do
 		for j in 0 1 2 3 4 5 6 7 8 9;
 		do
-			echo "$i$j" >"path$i$j"
+			echo "$i$j" >"path$i$j" || return 1
 		done
 	done &&
 	git add "path??" &&
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index f4485a87c6..181e9683a7 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -6,6 +6,8 @@
 test_description='More rename detection
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh
index 3d495e37bb..8def4d4aee 100755
--- a/t/t4004-diff-rename-symlink.sh
+++ b/t/t4004-diff-rename-symlink.sh
@@ -9,6 +9,8 @@ The rename detection logic should be able to detect pure rename or
 copy of symbolic links, but should not produce rename/copy followed
 by an edit for them.
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 6f1b323f97..5c756dc243 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -5,6 +5,8 @@
 
 test_description='Same rename detection as t4003 but testing diff-raw.'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 6cdee2a216..dbd4c0da21 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -6,6 +6,8 @@
 test_description='Test mode change diffs.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 sed_script='s/\(:100644 100755\) \('"$OID_REGEX"'\) \2 /\1 X X /'
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index c634653b5b..b86165cbac 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -6,6 +6,8 @@
 test_description='Rename interaction with pathspec.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index 59b7f44f05..3480781dab 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -6,6 +6,8 @@
 test_description='Same rename detection as t4003 but testing diff-raw -z.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 1bbced79ec..9d9650eba7 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -9,6 +9,8 @@ Prepare:
         file0
         path1/file1
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 5a25c259fe..d7a5f7ae78 100755
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -6,6 +6,8 @@
 test_description='Test diff of symlinks.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 33ff588ebc..c509143c81 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -6,6 +6,7 @@
 test_description='Binary diff and apply
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >expect.binary-numstat <<\EOF
@@ -122,7 +123,7 @@ test_expect_success 'diff --stat with binary files and big change count' '
 	i=0 &&
 	while test $i -lt 10000; do
 		echo $i &&
-		i=$(($i + 1))
+		i=$(($i + 1)) || return 1
 	done >textfile &&
 	git add textfile &&
 	git diff --cached --stat binfile textfile >output &&
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 28683d059d..750aee17ea 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -19,8 +19,8 @@ test_expect_success setup '
 
 	mkdir dir &&
 	mkdir dir2 &&
-	for i in 1 2 3; do echo $i; done >file0 &&
-	for i in A B; do echo $i; done >dir/sub &&
+	test_write_lines 1 2 3 >file0 &&
+	test_write_lines A B >dir/sub &&
 	cat file0 >file2 &&
 	git add file0 file2 dir/sub &&
 	git commit -m Initial &&
@@ -32,8 +32,8 @@ test_expect_success setup '
 	GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
-	for i in 4 5 6; do echo $i; done >>file0 &&
-	for i in C D; do echo $i; done >>dir/sub &&
+	test_write_lines 4 5 6 >>file0 &&
+	test_write_lines C D >>dir/sub &&
 	rm -f file2 &&
 	git update-index --remove file0 file2 dir/sub &&
 	git commit -m "Second${LF}${LF}This is the second commit." &&
@@ -42,9 +42,9 @@ test_expect_success setup '
 	GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
-	for i in A B C; do echo $i; done >file1 &&
+	test_write_lines A B C >file1 &&
 	git add file1 &&
-	for i in E F; do echo $i; done >>dir/sub &&
+	test_write_lines E F >>dir/sub &&
 	git update-index dir/sub &&
 	git commit -m Third &&
 
@@ -53,8 +53,8 @@ test_expect_success setup '
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
 	git checkout side &&
-	for i in A B C; do echo $i; done >>file0 &&
-	for i in 1 2; do echo $i; done >>dir/sub &&
+	test_write_lines A B C >>file0 &&
+	test_write_lines 1 2 >>dir/sub &&
 	cat dir/sub >file3 &&
 	git add file3 &&
 	git update-index file0 dir/sub &&
@@ -71,8 +71,8 @@ test_expect_success setup '
 	GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
-	for i in A B C; do echo $i; done >>file0 &&
-	for i in 1 2; do echo $i; done >>dir/sub &&
+	test_write_lines A B C >>file0 &&
+	test_write_lines 1 2 >>dir/sub &&
 	git update-index file0 dir/sub &&
 
 	mkdir dir3 &&
@@ -86,7 +86,7 @@ test_expect_success setup '
 	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 	git checkout -b rearrange initial &&
-	for i in B A; do echo $i; done >dir/sub &&
+	test_write_lines B A >dir/sub &&
 	git add dir/sub &&
 	git commit -m "Rearranged lines in dir/sub" &&
 	git checkout master &&
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 712d4b5ddf..7dc5a5c736 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -12,25 +12,25 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success setup '
-	for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
 	cat file >elif &&
 	git add file elif &&
 	test_tick &&
 	git commit -m Initial &&
 	git checkout -b side &&
 
-	for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
+	test_write_lines 1 2 5 6 A B C 7 8 9 10 >file &&
 	test_chmod +x elif &&
 	test_tick &&
 	git commit -m "Side changes #1" &&
 
-	for i in D E F; do echo "$i"; done >>file &&
+	test_write_lines D E F >>file &&
 	git update-index file &&
 	test_tick &&
 	git commit -m "Side changes #2" &&
 	git tag C2 &&
 
-	for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file &&
 	git update-index file &&
 	test_tick &&
 	git commit -m "Side changes #3 with \\n backslash-n in it." &&
@@ -43,18 +43,18 @@ test_expect_success setup '
 
 	git checkout side &&
 	git checkout -b patchid &&
-	for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file2 &&
-	for i in 1 2 3 A 4 B C 7 8 9 10 D E F 5 6; do echo "$i"; done >file3 &&
-	for i in 8 9 10; do echo "$i"; done >file &&
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file2 &&
+	test_write_lines 1 2 3 A 4 B C 7 8 9 10 D E F 5 6 >file3 &&
+	test_write_lines 8 9 10 >file &&
 	git add file file2 file3 &&
 	test_tick &&
 	git commit -m "patchid 1" &&
-	for i in 4 A B 7 8 9 10; do echo "$i"; done >file2 &&
-	for i in 8 9 10 5 6; do echo "$i"; done >file3 &&
+	test_write_lines 4 A B 7 8 9 10 >file2 &&
+	test_write_lines 8 9 10 5 6 >file3 &&
 	git add file2 file3 &&
 	test_tick &&
 	git commit -m "patchid 2" &&
-	for i in 10 5 6; do echo "$i"; done >file &&
+	test_write_lines 10 5 6 >file &&
 	git add file &&
 	test_tick &&
 	git commit -m "patchid 3" &&
@@ -325,7 +325,7 @@ test_expect_success 'filename length limit' '
 		max=$(
 			for patch in 000[1-9]-*.patch
 			do
-				echo "$patch" | wc -c
+				echo "$patch" | wc -c || exit 1
 			done |
 			sort -nr |
 			head -n 1
@@ -343,7 +343,7 @@ test_expect_success 'filename length limit from config' '
 		max=$(
 			for patch in 000[1-9]-*.patch
 			do
-				echo "$patch" | wc -c
+				echo "$patch" | wc -c || exit 1
 			done |
 			sort -nr |
 			head -n 1
@@ -361,7 +361,7 @@ test_expect_success 'filename limit applies only to basename' '
 		max=$(
 			for patch in patches/000[1-9]-*.patch
 			do
-				echo "${patch#patches/}" | wc -c
+				echo "${patch#patches/}" | wc -c || exit 1
 			done |
 			sort -nr |
 			head -n 1
@@ -653,7 +653,7 @@ test_expect_success 'excessive subject' '
 	git checkout side &&
 	before=$(git hash-object file) &&
 	before=$(git rev-parse --short $before) &&
-	for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >>file &&
 	after=$(git hash-object file) &&
 	after=$(git rev-parse --short $after) &&
 	git update-index file &&
@@ -1086,7 +1086,7 @@ test_expect_success TTY 'format-patch --stdout paginates' '
 test_expect_success 'format-patch handles multi-line subjects' '
 	rm -rf patches/ &&
 	echo content >>file &&
-	for i in one two three; do echo $i; done >msg &&
+	test_write_lines one two three >msg &&
 	git add file &&
 	git commit -F msg &&
 	git format-patch -o patches -1 &&
@@ -1098,7 +1098,7 @@ test_expect_success 'format-patch handles multi-line subjects' '
 test_expect_success 'format-patch handles multi-line encoded subjects' '
 	rm -rf patches/ &&
 	echo content >>file &&
-	for i in en två tre; do echo $i; done >msg &&
+	test_write_lines en två tre >msg &&
 	git add file &&
 	git commit -F msg &&
 	git format-patch -o patches -1 &&
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 2c13b62d3c..9babf13bc9 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -843,7 +843,7 @@ test_expect_success 'whitespace changes with modification reported (diffstat)' '
 
 test_expect_success 'whitespace-only changes reported across renames (diffstat)' '
 	git reset --hard &&
-	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
+	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
 	git add x &&
 	git commit -m "base" &&
 	sed -e "5s/^/ /" x >z &&
@@ -859,7 +859,7 @@ test_expect_success 'whitespace-only changes reported across renames (diffstat)'
 
 test_expect_success 'whitespace-only changes reported across renames' '
 	git reset --hard HEAD~1 &&
-	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
+	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
 	git add x &&
 	hash_x=$(git hash-object x) &&
 	before=$(git rev-parse --short "$hash_x") &&
@@ -1442,6 +1442,143 @@ test_expect_success 'detect permutations inside moved code -- dimmed-zebra' '
 	test_cmp expected actual
 '
 
+test_expect_success 'zebra alternate color is only used when necessary' '
+	cat >old.txt <<-\EOF &&
+	line 1A should be marked as oldMoved newMovedAlternate
+	line 1B should be marked as oldMoved newMovedAlternate
+	unchanged
+	line 2A should be marked as oldMoved newMovedAlternate
+	line 2B should be marked as oldMoved newMovedAlternate
+	line 3A should be marked as oldMovedAlternate newMoved
+	line 3B should be marked as oldMovedAlternate newMoved
+	unchanged
+	line 4A should be marked as oldMoved newMovedAlternate
+	line 4B should be marked as oldMoved newMovedAlternate
+	line 5A should be marked as oldMovedAlternate newMoved
+	line 5B should be marked as oldMovedAlternate newMoved
+	line 6A should be marked as oldMoved newMoved
+	line 6B should be marked as oldMoved newMoved
+	EOF
+	cat >new.txt <<-\EOF &&
+	  line 1A should be marked as oldMoved newMovedAlternate
+	  line 1B should be marked as oldMoved newMovedAlternate
+	unchanged
+	  line 3A should be marked as oldMovedAlternate newMoved
+	  line 3B should be marked as oldMovedAlternate newMoved
+	  line 2A should be marked as oldMoved newMovedAlternate
+	  line 2B should be marked as oldMoved newMovedAlternate
+	unchanged
+	  line 6A should be marked as oldMoved newMoved
+	  line 6B should be marked as oldMoved newMoved
+	    line 4A should be marked as oldMoved newMovedAlternate
+	    line 4B should be marked as oldMoved newMovedAlternate
+	  line 5A should be marked as oldMovedAlternate newMoved
+	  line 5B should be marked as oldMovedAlternate newMoved
+	EOF
+	test_expect_code 1 git diff --no-index --color --color-moved=zebra \
+		 --color-moved-ws=allow-indentation-change \
+		 old.txt new.txt >output &&
+	grep -v index output | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/old.txt b/new.txt<RESET>
+	<BOLD>--- a/old.txt<RESET>
+	<BOLD>+++ b/new.txt<RESET>
+	<CYAN>@@ -1,14 +1,14 @@<RESET>
+	<BOLD;MAGENTA>-line 1A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;MAGENTA>-line 1B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1B should be marked as oldMoved newMovedAlternate<RESET>
+	 unchanged<RESET>
+	<BOLD;MAGENTA>-line 2A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;MAGENTA>-line 2B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;BLUE>-line 3A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;BLUE>-line 3B should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3B should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2B should be marked as oldMoved newMovedAlternate<RESET>
+	 unchanged<RESET>
+	<BOLD;MAGENTA>-line 4A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;MAGENTA>-line 4B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;BLUE>-line 5A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;BLUE>-line 5B should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;MAGENTA>-line 6A should be marked as oldMoved newMoved<RESET>
+	<BOLD;MAGENTA>-line 6B should be marked as oldMoved newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6A should be marked as oldMoved newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6B should be marked as oldMoved newMoved<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5B should be marked as oldMovedAlternate newMoved<RESET>
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'short lines of opposite sign do not get marked as moved' '
+	cat >old.txt <<-\EOF &&
+	this line should be marked as moved
+	unchanged
+	unchanged
+	unchanged
+	unchanged
+	too short
+	this line should be marked as oldMoved newMoved
+	this line should be marked as oldMovedAlternate newMoved
+	unchanged 1
+	unchanged 2
+	unchanged 3
+	unchanged 4
+	this line should be marked as oldMoved newMoved/newMovedAlternate
+	EOF
+	cat >new.txt <<-\EOF &&
+	too short
+	unchanged
+	unchanged
+	this line should be marked as moved
+	too short
+	unchanged
+	unchanged
+	this line should be marked as oldMoved newMoved/newMovedAlternate
+	unchanged 1
+	unchanged 2
+	this line should be marked as oldMovedAlternate newMoved
+	this line should be marked as oldMoved newMoved/newMovedAlternate
+	unchanged 3
+	this line should be marked as oldMoved newMoved
+	unchanged 4
+	EOF
+	test_expect_code 1 git diff --no-index --color --color-moved=zebra \
+		old.txt new.txt >output && cat output &&
+	grep -v index output | test_decode_color >actual &&
+	cat >expect <<-\EOF &&
+	<BOLD>diff --git a/old.txt b/new.txt<RESET>
+	<BOLD>--- a/old.txt<RESET>
+	<BOLD>+++ b/new.txt<RESET>
+	<CYAN>@@ -1,13 +1,15 @@<RESET>
+	<BOLD;MAGENTA>-this line should be marked as moved<RESET>
+	<GREEN>+<RESET><GREEN>too short<RESET>
+	 unchanged<RESET>
+	 unchanged<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as moved<RESET>
+	<GREEN>+<RESET><GREEN>too short<RESET>
+	 unchanged<RESET>
+	 unchanged<RESET>
+	<RED>-too short<RESET>
+	<BOLD;MAGENTA>-this line should be marked as oldMoved newMoved<RESET>
+	<BOLD;BLUE>-this line should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+	 unchanged 1<RESET>
+	 unchanged 2<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+	 unchanged 3<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved<RESET>
+	 unchanged 4<RESET>
+	<BOLD;MAGENTA>-this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+	EOF
+	test_cmp expect actual
+'
+
 test_expect_success 'cmd option assumes configured colored-moved' '
 	test_config color.diff.oldMoved "magenta" &&
 	test_config color.diff.newMoved "cyan" &&
@@ -1833,6 +1970,52 @@ test_expect_success '--color-moved treats adjacent blocks as separate for MIN_AL
 	test_cmp expected actual
 '
 
+test_expect_success '--color-moved rewinds for MIN_ALNUM_COUNT' '
+	git reset --hard &&
+	test_write_lines >file \
+		A B C one two three four five six seven D E F G H I J &&
+	git add file &&
+	test_write_lines >file \
+		one two A B C D E F G H I J two three four five six seven &&
+	git diff --color-moved=zebra -- file &&
+
+	git diff --color-moved=zebra --color -- file >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/file b/file<RESET>
+	<BOLD>--- a/file<RESET>
+	<BOLD>+++ b/file<RESET>
+	<CYAN>@@ -1,13 +1,8 @@<RESET>
+	<GREEN>+<RESET><GREEN>one<RESET>
+	<GREEN>+<RESET><GREEN>two<RESET>
+	 A<RESET>
+	 B<RESET>
+	 C<RESET>
+	<RED>-one<RESET>
+	<BOLD;MAGENTA>-two<RESET>
+	<BOLD;MAGENTA>-three<RESET>
+	<BOLD;MAGENTA>-four<RESET>
+	<BOLD;MAGENTA>-five<RESET>
+	<BOLD;MAGENTA>-six<RESET>
+	<BOLD;MAGENTA>-seven<RESET>
+	 D<RESET>
+	 E<RESET>
+	 F<RESET>
+	<CYAN>@@ -15,3 +10,9 @@<RESET> <RESET>G<RESET>
+	 H<RESET>
+	 I<RESET>
+	 J<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>two<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>three<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>four<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>five<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>six<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>seven<RESET>
+	EOF
+
+	test_cmp expected actual
+'
+
 test_expect_success 'move detection with submodules' '
 	test_create_repo bananas &&
 	echo ripe >bananas/recipe &&
@@ -2023,10 +2206,10 @@ EMPTY=''
 test_expect_success 'compare mixed whitespace delta across moved blocks' '
 
 	git reset --hard &&
-	tr Q_ "\t " <<-EOF >text.txt &&
-	${EMPTY}
-	____too short without
-	${EMPTY}
+	tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
+	^__
+	|____too short without
+	^
 	___being grouped across blank line
 	${EMPTY}
 	context
@@ -2045,7 +2228,7 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' '
 	git add text.txt &&
 	git commit -m "add text.txt" &&
 
-	tr Q_ "\t " <<-EOF >text.txt &&
+	tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
 	context
 	lines
 	to
@@ -2056,7 +2239,7 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' '
 	${EMPTY}
 	QQtoo short without
 	${EMPTY}
-	Q_______being grouped across blank line
+	^Q_______being grouped across blank line
 	${EMPTY}
 	Q_QThese two lines have had their
 	indentation reduced by four spaces
@@ -2068,16 +2251,16 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' '
 		-c core.whitespace=space-before-tab \
 		diff --color --color-moved --ws-error-highlight=all \
 		--color-moved-ws=allow-indentation-change >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
+	grep -v "index" actual.raw | tr "\f\v" "^|" | test_decode_color >actual &&
 
 	cat <<-\EOF >expected &&
 	<BOLD>diff --git a/text.txt b/text.txt<RESET>
 	<BOLD>--- a/text.txt<RESET>
 	<BOLD>+++ b/text.txt<RESET>
 	<CYAN>@@ -1,16 +1,16 @@<RESET>
-	<BOLD;MAGENTA>-<RESET>
-	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>    too short without<RESET>
-	<BOLD;MAGENTA>-<RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET><BRED>  <RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>|    too short without<RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET>
 	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>   being grouped across blank line<RESET>
 	<BOLD;MAGENTA>-<RESET>
 	 <RESET>context<RESET>
@@ -2097,7 +2280,7 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' '
 	<BOLD;YELLOW>+<RESET>
 	<BOLD;YELLOW>+<RESET>		<BOLD;YELLOW>too short without<RESET>
 	<BOLD;YELLOW>+<RESET>
-	<BOLD;YELLOW>+<RESET>	<BOLD;YELLOW>       being grouped across blank line<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>^	       being grouped across blank line<RESET>
 	<BOLD;YELLOW>+<RESET>
 	<BOLD;CYAN>+<RESET>	<BRED> <RESET>	<BOLD;CYAN>These two lines have had their<RESET>
 	<BOLD;CYAN>+<RESET><BOLD;CYAN>indentation reduced by four spaces<RESET>
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 740696c8f7..42a2b9a13b 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -75,7 +75,7 @@ test_expect_success 'last regexp must not be negated' '
 test_expect_success 'setup hunk header tests' '
 	for i in $diffpatterns
 	do
-		echo "$i-* diff=$i"
+		echo "$i-* diff=$i" || return 1
 	done > .gitattributes &&
 
 	# add all test files to the index
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index c68729ac09..d2b3109c2d 100755
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -287,9 +287,9 @@ test_expect_success 'do not color trailing cr in context' '
 '
 
 test_expect_success 'color new trailing blank lines' '
-	{ echo a; echo b; echo; echo; } >x &&
+	test_write_lines a b "" "" >x &&
 	git add x &&
-	{ echo a; echo; echo; echo; echo c; echo; echo; echo; echo; } >x &&
+	test_write_lines a "" "" "" c "" "" "" "" >x &&
 	git diff --color x >output &&
 	cnt=$($grep_a "${blue_grep}" output | wc -l) &&
 	test $cnt = 2
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index e009826fcb..54bb8ef27e 100755
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -2,6 +2,7 @@
 
 test_description='external diff interface test'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 47d6f35dcc..7cb9909293 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -55,7 +55,7 @@ test_expect_success 'cross renames to be detected for regular files' '
 
 	git diff-tree five six -r --name-status -B -M | sort >actual &&
 	{
-		echo "R100	foo	bar"
+		echo "R100	foo	bar" &&
 		echo "R100	bar	foo"
 	} | sort >expect &&
 	test_cmp expect actual
@@ -66,7 +66,7 @@ test_expect_success 'cross renames to be detected for typechange' '
 
 	git diff-tree one two -r --name-status -B -M | sort >actual &&
 	{
-		echo "R100	foo	bar"
+		echo "R100	foo	bar" &&
 		echo "R100	bar	foo"
 	} | sort >expect &&
 	test_cmp expect actual
@@ -78,7 +78,7 @@ test_expect_success 'moves and renames' '
 	git diff-tree three four -r --name-status -B -M | sort >actual &&
 	{
 		# see -B -M (#6) in t4008
-		echo "C100	foo	bar"
+		echo "C100	foo	bar" &&
 		echo "T100	foo"
 	} | sort >expect &&
 	test_cmp expect actual
diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh
index 6b44ce1493..e2f0eca4af 100755
--- a/t/t4024-diff-optimize-common.sh
+++ b/t/t4024-diff-optimize-common.sh
@@ -2,6 +2,7 @@
 
 test_description='common tail optimization'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 z=zzzzzzzz ;# 8
@@ -148,7 +149,7 @@ test_expect_success 'diff -U0' '
 
 	for n in $sample
 	do
-		git diff -U0 file-?$n
+		git diff -U0 file-?$n || return 1
 	done | zc >actual &&
 	test_cmp expect actual
 
diff --git a/t/t4025-hunk-header.sh b/t/t4025-hunk-header.sh
index 6356961de4..5397cb7d42 100755
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -14,15 +14,9 @@ test_expect_success setup '
 
 	(
 		echo "A $NS" &&
-		for c in B C D E F G H I J K
-		do
-			echo "  $c"
-		done &&
+		printf "  %s\n" B C D E F G H I J K &&
 		echo "L  $NS" &&
-		for c in M N O P Q R S T U V
-		do
-			echo "  $c"
-		done
+		printf "  %s\n" M N O P Q R S T U V
 	) >file &&
 	git add file &&
 
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index cc73161b46..cc3f60d468 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -60,6 +60,10 @@ test_expect_success 'fg bg attr...' '
 	color "blue bold dim ul blink reverse" "[1;2;4;5;7;34m"
 '
 
+test_expect_success 'reset fg bg attr...' '
+	color "reset blue bold dim ul blink reverse" "[;1;2;4;5;7;34m"
+'
+
 # note that nobold and nodim are the same code (22)
 test_expect_success 'attr negation' '
 	color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
@@ -96,6 +100,18 @@ test_expect_success '24-bit colors' '
 	color "#ff00ff black" "[38;2;255;0;255;40m"
 '
 
+test_expect_success '"default" foreground' '
+	color "default" "[39m"
+'
+
+test_expect_success '"normal default" to clear background' '
+	color "normal default" "[49m"
+'
+
+test_expect_success '"default" can be combined with attributes' '
+	color "default default no-reverse bold" "[1;27;39;49m"
+'
+
 test_expect_success '"normal" yields no color at all"' '
 	color "normal black" "[40m"
 '
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 94ef77e1df..6cef0da982 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -2,6 +2,7 @@
 
 test_description='difference in submodules'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 32b6e9a4e7..5f8ffef74b 100755
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -4,6 +4,7 @@
 #
 test_description='diff honors config option, diff.suppressBlankEmpty'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat <<\EOF >expected ||
diff --git a/t/t4032-diff-inter-hunk-context.sh b/t/t4032-diff-inter-hunk-context.sh
index bada0cbd32..7db92d0d9f 100755
--- a/t/t4032-diff-inter-hunk-context.sh
+++ b/t/t4032-diff-inter-hunk-context.sh
@@ -2,6 +2,7 @@
 
 test_description='diff hunk fusing'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 f() {
diff --git a/t/t4033-diff-patience.sh b/t/t4033-diff-patience.sh
index 113304dc59..f7be7f5ef0 100755
--- a/t/t4033-diff-patience.sh
+++ b/t/t4033-diff-patience.sh
@@ -2,6 +2,7 @@
 
 test_description='patience diff algorithm'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff-alternative.sh
 
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 561c582d16..d5abcf4b4c 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -2,6 +2,7 @@
 
 test_description='word diff colors'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff.sh
 
diff --git a/t/t4035-diff-quiet.sh b/t/t4035-diff-quiet.sh
index 0352bf81a9..76f8034c60 100755
--- a/t/t4035-diff-quiet.sh
+++ b/t/t4035-diff-quiet.sh
@@ -2,6 +2,7 @@
 
 test_description='Return value of diffs'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t4037-diff-r-t-dirs.sh b/t/t4037-diff-r-t-dirs.sh
index f5ce3b29a2..b5f96fe23b 100755
--- a/t/t4037-diff-r-t-dirs.sh
+++ b/t/t4037-diff-r-t-dirs.sh
@@ -2,6 +2,7 @@
 
 test_description='diff -r -t shows directory additions and deletions'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index aeac203c42..9a292bac70 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -100,7 +100,7 @@ test_expect_success 'setup for --cc --raw' '
 	for i in $(test_seq 1 40)
 	do
 		blob=$(echo file$i | git hash-object --stdin -w) &&
-		trees="$trees$(echo "100644 blob $blob	file" | git mktree)$LF"
+		trees="$trees$(echo "100644 blob $blob	file" | git mktree)$LF" || return 1
 	done
 '
 
diff --git a/t/t4040-whitespace-status.sh b/t/t4040-whitespace-status.sh
index 3c728a3ebf..e70e020ae9 100755
--- a/t/t4040-whitespace-status.sh
+++ b/t/t4040-whitespace-status.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='diff --exit-code with whitespace'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index ff7cfd884a..0ae0cd3a52 100755
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='diff with unmerged index entries'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -18,7 +20,7 @@ test_expect_success setup '
 			for t in o x
 			do
 				path="$b$o$t" &&
-				case "$path" in ooo) continue ;; esac
+				case "$path" in ooo) continue ;; esac &&
 				paths="$paths$path " &&
 				p="	$path" &&
 				case "$b" in x) echo "$m1$p" ;; esac &&
@@ -37,7 +39,7 @@ test_expect_success 'diff-files -0' '
 	for path in $paths
 	do
 		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path"
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" || return 1
 	done >diff-files-0.expect &&
 	git diff-files -0 >diff-files-0.actual &&
 	test_cmp diff-files-0.expect diff-files-0.actual
@@ -50,7 +52,7 @@ test_expect_success 'diff-files -1' '
 		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
 		case "$path" in
 		x??) echo ":100644 100644 $blob1 $ZERO_OID M	$path"
-		esac
+		esac || return 1
 	done >diff-files-1.expect &&
 	git diff-files -1 >diff-files-1.actual &&
 	test_cmp diff-files-1.expect diff-files-1.actual
@@ -63,7 +65,7 @@ test_expect_success 'diff-files -2' '
 		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
 		case "$path" in
 		?x?) echo ":100644 100644 $blob2 $ZERO_OID M	$path"
-		esac
+		esac || return 1
 	done >diff-files-2.expect &&
 	git diff-files -2 >diff-files-2.actual &&
 	test_cmp diff-files-2.expect diff-files-2.actual &&
@@ -78,7 +80,7 @@ test_expect_success 'diff-files -3' '
 		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
 		case "$path" in
 		??x) echo ":100644 100644 $blob3 $ZERO_OID M	$path"
-		esac
+		esac || return 1
 	done >diff-files-3.expect &&
 	git diff-files -3 >diff-files-3.actual &&
 	test_cmp diff-files-3.expect diff-files-3.actual
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index 53061b104e..0a4fc735d4 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -2,6 +2,8 @@
 # Copyright (c) 2011, Google Inc.
 
 test_description='diff --stat-count'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -51,7 +53,7 @@ test_expect_success 'exclude unmerged entries from total file count' '
 	git rm -f d &&
 	for stage in 1 2 3
 	do
-		sed -e "s/ 0	a/ $stage	d/" x
+		sed -e "s/ 0	a/ $stage	d/" x || return 1
 	done |
 	git update-index --index-info &&
 	echo d >d &&
diff --git a/t/t4050-diff-histogram.sh b/t/t4050-diff-histogram.sh
index fd3e86a74f..c61b30f96d 100755
--- a/t/t4050-diff-histogram.sh
+++ b/t/t4050-diff-histogram.sh
@@ -2,6 +2,7 @@
 
 test_description='histogram diff algorithm'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff-alternative.sh
 
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 9eba436211..b5c281edaa 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -101,7 +101,7 @@ test_expect_success 'preparation for big change tests' '
 	i=0 &&
 	while test $i -lt 1000
 	do
-		echo $i && i=$(($i + 1))
+		echo $i && i=$(($i + 1)) || return 1
 	done >abcd &&
 	git commit -m message abcd
 '
diff --git a/t/t4054-diff-bogus-tree.sh b/t/t4054-diff-bogus-tree.sh
index 8c95f152b2..294fb55313 100755
--- a/t/t4054-diff-bogus-tree.sh
+++ b/t/t4054-diff-bogus-tree.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test diff with a bogus tree containing the null sha1'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'create bogus tree' '
diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 7e5b74f72e..04b8a1542a 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -18,13 +18,13 @@ test_expect_success 'trivial merge - combine-diff empty' '
 	for i in $(test_seq 1 9)
 	do
 		echo $i >$i.txt &&
-		git add $i.txt
+		git add $i.txt || return 1
 	done &&
 	git commit -m "init" &&
 	git checkout -b side &&
 	for i in $(test_seq 2 9)
 	do
-		echo $i/2 >>$i.txt
+		echo $i/2 >>$i.txt || return 1
 	done &&
 	git commit -a -m "side 2-9" &&
 	git checkout main &&
@@ -40,14 +40,14 @@ test_expect_success 'only one truly conflicting path' '
 	git checkout side &&
 	for i in $(test_seq 2 9)
 	do
-		echo $i/3 >>$i.txt
+		echo $i/3 >>$i.txt || return 1
 	done &&
 	echo "4side" >>4.txt &&
 	git commit -a -m "side 2-9 +4" &&
 	git checkout main &&
 	for i in $(test_seq 1 9)
 	do
-		echo $i/3 >>$i.txt
+		echo $i/3 >>$i.txt || return 1
 	done &&
 	echo "4main" >>4.txt &&
 	git commit -a -m "main 1-9 +4" &&
@@ -69,13 +69,13 @@ test_expect_success 'merge introduces new file' '
 	git checkout side &&
 	for i in $(test_seq 5 9)
 	do
-		echo $i/4 >>$i.txt
+		echo $i/4 >>$i.txt || return 1
 	done &&
 	git commit -a -m "side 5-9" &&
 	git checkout main &&
 	for i in $(test_seq 1 3)
 	do
-		echo $i/4 >>$i.txt
+		echo $i/4 >>$i.txt || return 1
 	done &&
 	git commit -a -m "main 1-3 +4hello" &&
 	git merge side &&
@@ -90,13 +90,13 @@ test_expect_success 'merge removed a file' '
 	git checkout side &&
 	for i in $(test_seq 5 9)
 	do
-		echo $i/5 >>$i.txt
+		echo $i/5 >>$i.txt || return 1
 	done &&
 	git commit -a -m "side 5-9" &&
 	git checkout main &&
 	for i in $(test_seq 1 3)
 	do
-		echo $i/4 >>$i.txt
+		echo $i/4 >>$i.txt || return 1
 	done &&
 	git commit -a -m "main 1-3" &&
 	git merge side &&
diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
index 1130c8019b..9aaa068ed9 100755
--- a/t/t4062-diff-pickaxe.sh
+++ b/t/t4062-diff-pickaxe.sh
@@ -5,6 +5,7 @@
 
 test_description='Pickaxe options'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4063-diff-blobs.sh b/t/t4063-diff-blobs.sh
index bc69e26c52..7e6c9d6384 100755
--- a/t/t4063-diff-blobs.sh
+++ b/t/t4063-diff-blobs.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='test direct comparison of blobs via git-diff'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 run_diff () {
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 9b433de836..d503547732 100755
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -6,6 +6,8 @@
 test_description='git apply --stat --summary test, with --recount
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 UNC='s/^\(@@ -[1-9][0-9]*\),[0-9]* \(+[1-9][0-9]*\),[0-9]* @@/\1,999 \2,999 @@/'
diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh
index e3443d004d..b1169193ef 100755
--- a/t/t4101-apply-nonl.sh
+++ b/t/t4101-apply-nonl.sh
@@ -6,6 +6,8 @@
 test_description='git apply should handle files with incomplete lines.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # setup
diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh
index fae305979a..d1e06fc1ac 100755
--- a/t/t4102-apply-rename.sh
+++ b/t/t4102-apply-rename.sh
@@ -6,6 +6,8 @@
 test_description='git apply handling copy/rename patch.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # setup
diff --git a/t/t4105-apply-fuzz.sh b/t/t4105-apply-fuzz.sh
index 3266e39400..ed814a839e 100755
--- a/t/t4105-apply-fuzz.sh
+++ b/t/t4105-apply-fuzz.sh
@@ -2,6 +2,8 @@
 
 test_description='apply with fuzz and offset'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 dotest () {
@@ -15,15 +17,9 @@ dotest () {
 
 test_expect_success setup '
 
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12
-	do
-		echo $i
-	done >file &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 >file &&
 	git update-index --add file &&
-	for i in 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12
-	do
-		echo $i
-	done >file &&
+	test_write_lines 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 >file &&
 	cat file >expect &&
 	git diff >O0.diff &&
 
diff --git a/t/t4106-apply-stdin.sh b/t/t4106-apply-stdin.sh
index 72467a1e8e..5c150f3b0b 100755
--- a/t/t4106-apply-stdin.sh
+++ b/t/t4106-apply-stdin.sh
@@ -2,6 +2,8 @@
 
 test_description='git apply --numstat - <patch'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -18,7 +20,10 @@ test_expect_success 'git apply --numstat - < patch' '
 '
 
 test_expect_success 'git apply --numstat - < patch patch' '
-	for i in 1 2; do echo "1	1	text"; done >expect &&
+	cat >expect <<-\EOF &&
+	1	1	text
+	1	1	text
+	EOF
 	git apply --numstat - < patch patch >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index cc3aa3314a..c558282bc0 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/t4108-apply-threeway.sh
@@ -275,4 +275,22 @@ test_expect_success 'apply full-index patch with 3way' '
 	git apply --3way --index bin.diff
 '
 
+test_expect_success 'apply delete then new patch with 3way' '
+	git reset --hard main &&
+	test_write_lines 2 > delnew &&
+	git add delnew &&
+	git diff --cached >> new.patch &&
+	git reset --hard &&
+	test_write_lines 1 > delnew &&
+	git add delnew &&
+	git commit -m "delnew" &&
+	rm delnew &&
+	git diff >> delete-then-new.patch &&
+	cat new.patch >> delete-then-new.patch &&
+
+	git checkout -- . &&
+	# Apply must succeed.
+	git apply --3way delete-then-new.patch
+'
+
 test_done
diff --git a/t/t4109-apply-multifrag.sh b/t/t4109-apply-multifrag.sh
index ac58083fe2..4dc6d8e7d3 100755
--- a/t/t4109-apply-multifrag.sh
+++ b/t/t4109-apply-multifrag.sh
@@ -6,6 +6,8 @@
 
 test_description='git apply test patches with multiple fragments.'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cp "$TEST_DIRECTORY/t4109/patch1.patch" .
diff --git a/t/t4110-apply-scan.sh b/t/t4110-apply-scan.sh
index 09f58112e0..266302a182 100755
--- a/t/t4110-apply-scan.sh
+++ b/t/t4110-apply-scan.sh
@@ -7,6 +7,8 @@
 test_description='git apply test for patches which require scanning forwards and backwards.
 
 '
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'git apply scan' '
diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh
index f9ad183758..d53aa4222e 100755
--- a/t/t4112-apply-renames.sh
+++ b/t/t4112-apply-renames.sh
@@ -7,6 +7,8 @@ test_description='git apply should not get confused with rename/copy.
 
 '
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # setup
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index 872fcda6cb..d0f3edef54 100755
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -7,6 +7,7 @@ test_description='git apply symlinks and partial files
 
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index b99e65c086..a9f4ddda6c 100755
--- a/t/t4116-apply-reverse.sh
+++ b/t/t4116-apply-reverse.sh
@@ -7,18 +7,20 @@ test_description='git apply in reverse
 
 '
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
 
-	for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
+	test_write_lines a b c d e f g h i j k l m n >file1 &&
 	perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
 
 	git add file1 file2 &&
 	git commit -m initial &&
 	git tag initial &&
 
-	for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
+	test_write_lines a b c g h i J K L m o n p q >file1 &&
 	perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
 
 	git commit -a -m second &&
diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh
index 0ee93fe845..c86d05a96f 100755
--- a/t/t4117-apply-reject.sh
+++ b/t/t4117-apply-reject.sh
@@ -10,25 +10,16 @@ test_description='git apply with rejects
 . ./test-lib.sh
 
 test_expect_success setup '
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
-	do
-		echo $i
-	done >file1 &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 >file1 &&
 	cat file1 >saved.file1 &&
 	git update-index --add file1 &&
 	git commit -m initial &&
 
-	for i in 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21
-	do
-		echo $i
-	done >file1 &&
+	test_write_lines 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21 >file1 &&
 	git diff >patch.1 &&
 	cat file1 >clean &&
 
-	for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21
-	do
-		echo $i
-	done >expected &&
+	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21 >expected &&
 
 	mv file1 file2 &&
 	git update-index --add --remove file1 file2 &&
@@ -38,10 +29,7 @@ test_expect_success setup '
 	mv saved.file1 file1 &&
 	git update-index --add --remove file1 file2 &&
 
-	for i in 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21
-	do
-		echo $i
-	done >file1 &&
+	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21 >file1 &&
 
 	cat file1 >saved.file1
 '
diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh
index 65f2e4c3ef..69c9c48e72 100755
--- a/t/t4118-apply-empty-context.sh
+++ b/t/t4118-apply-empty-context.sh
@@ -7,14 +7,12 @@ test_description='git apply with new style GNU diff with empty context
 
 '
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
-	{
-		echo; echo;
-		echo A; echo B; echo C;
-		echo;
-	} >file1 &&
+	test_write_lines "" "" A B C "" >file1 &&
 	cat file1 >file1.orig &&
 	{
 		cat file1 &&
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
index a9a0583811..208c961d37 100755
--- a/t/t4119-apply-config.sh
+++ b/t/t4119-apply-config.sh
@@ -7,6 +7,8 @@ test_description='git apply --whitespace=strip and configuration file.
 
 '
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index b45454aaf4..a80cec9d11 100755
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -4,6 +4,7 @@ test_description='git apply for contextually independent diffs'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 echo '1
diff --git a/t/t4123-apply-shrink.sh b/t/t4123-apply-shrink.sh
index 984157f03b..dfa053ff28 100755
--- a/t/t4123-apply-shrink.sh
+++ b/t/t4123-apply-shrink.sh
@@ -2,6 +2,8 @@
 
 test_description='apply a patch that is larger than the preimage'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 cat >F  <<\EOF
@@ -45,8 +47,8 @@ test_expect_success 'apply should fail gracefully' '
 		echo Oops, should not have succeeded
 		false
 	else
-		status=$?
-		echo "Status was $status"
+		status=$? &&
+		echo "Status was $status" &&
 		if test -f .git/index.lock
 		then
 			echo Oops, should not have crashed
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 0ca29821ec..485c7d2d12 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -230,10 +230,10 @@ test_expect_success 'blank at EOF with --whitespace=fix (1)' '
 	test_might_fail git config --unset core.whitespace &&
 	rm -f .gitattributes &&
 
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	git add one &&
-	{ echo a; echo b; echo c; } >expect &&
-	{ cat expect; echo; } >one &&
+	test_write_lines a b c >expect &&
+	{ cat expect && echo; } >one &&
 	git diff -- one >patch &&
 
 	git checkout one &&
@@ -242,10 +242,10 @@ test_expect_success 'blank at EOF with --whitespace=fix (1)' '
 '
 
 test_expect_success 'blank at EOF with --whitespace=fix (2)' '
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	git add one &&
-	{ echo a; echo c; } >expect &&
-	{ cat expect; echo; echo; } >one &&
+	test_write_lines a b >expect &&
+	{ cat expect && test_write_lines "" ""; } >one &&
 	git diff -- one >patch &&
 
 	git checkout one &&
@@ -254,10 +254,10 @@ test_expect_success 'blank at EOF with --whitespace=fix (2)' '
 '
 
 test_expect_success 'blank at EOF with --whitespace=fix (3)' '
-	{ echo a; echo b; echo; } >one &&
+	test_write_lines a b "" >one &&
 	git add one &&
-	{ echo a; echo c; echo; } >expect &&
-	{ cat expect; echo; echo; } >one &&
+	test_write_lines a c "" >expect &&
+	{ cat expect && test_write_lines "" ""; } >one &&
 	git diff -- one >patch &&
 
 	git checkout one &&
@@ -266,9 +266,9 @@ test_expect_success 'blank at EOF with --whitespace=fix (3)' '
 '
 
 test_expect_success 'blank at end of hunk, not at EOF with --whitespace=fix' '
-	{ echo a; echo b; echo; echo; echo; echo; echo; echo d; } >one &&
+	test_write_lines a b "" "" "" "" "" d >one &&
 	git add one &&
-	{ echo a; echo c; echo; echo; echo; echo; echo; echo; echo d; } >expect &&
+	test_write_lines a b "" "" "" "" "" "" d >expect &&
 	cp expect one &&
 	git diff -- one >patch &&
 
@@ -278,7 +278,7 @@ test_expect_success 'blank at end of hunk, not at EOF with --whitespace=fix' '
 '
 
 test_expect_success 'blank at EOF with --whitespace=warn' '
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	git add one &&
 	echo >>one &&
 	cat one >expect &&
@@ -291,7 +291,7 @@ test_expect_success 'blank at EOF with --whitespace=warn' '
 '
 
 test_expect_success 'blank at EOF with --whitespace=error' '
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	git add one &&
 	cat one >expect &&
 	echo >>one &&
@@ -304,7 +304,7 @@ test_expect_success 'blank at EOF with --whitespace=error' '
 '
 
 test_expect_success 'blank but not empty at EOF' '
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	git add one &&
 	echo "   " >>one &&
 	cat one >expect &&
@@ -317,13 +317,13 @@ test_expect_success 'blank but not empty at EOF' '
 '
 
 test_expect_success 'applying beyond EOF requires one non-blank context line' '
-	{ echo; echo; echo; echo; } >one &&
+	test_write_lines "" "" "" "" >one &&
 	git add one &&
-	{ echo b; } >>one &&
+	echo b >>one &&
 	git diff -- one >patch &&
 
 	git checkout one &&
-	{ echo a; echo; } >one &&
+	test_write_lines a "" >one &&
 	cp one expect &&
 	test_must_fail git apply --whitespace=fix patch &&
 	test_cmp expect one &&
@@ -333,7 +333,7 @@ test_expect_success 'applying beyond EOF requires one non-blank context line' '
 
 test_expect_success 'tons of blanks at EOF should not apply' '
 	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
-		echo; echo; echo; echo;
+		test_write_lines "" "" "" "" || return 1
 	done >one &&
 	git add one &&
 	echo a >>one &&
@@ -362,9 +362,9 @@ test_expect_success 'missing blank line at end with --whitespace=fix' '
 '
 
 test_expect_success 'two missing blank lines at end with --whitespace=fix' '
-	{ echo a; echo; echo b; echo c; } >one &&
+	test_write_lines a "" b c >one &&
 	cp one no-blank-lines &&
-	{ echo; echo; } >>one &&
+	test_write_lines "" "" >>one &&
 	git add one &&
 	echo d >>one &&
 	cp one expect &&
@@ -381,9 +381,9 @@ test_expect_success 'two missing blank lines at end with --whitespace=fix' '
 '
 
 test_expect_success 'missing blank line at end, insert before end, --whitespace=fix' '
-	{ echo a; echo; } >one &&
+	test_write_lines a "" >one &&
 	git add one &&
-	{ echo b; echo a; echo; } >one &&
+	test_write_lines b a "" >one &&
 	cp one expect &&
 	git diff -- one >patch &&
 	echo a >one &&
@@ -393,10 +393,10 @@ test_expect_success 'missing blank line at end, insert before end, --whitespace=
 '
 
 test_expect_success 'shrink file with tons of missing blanks at end of file' '
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	cp one no-blank-lines &&
 	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
-		echo; echo; echo; echo;
+		test_write_lines "" "" "" "" || return 1
 	done >>one &&
 	git add one &&
 	echo a >one &&
@@ -412,9 +412,9 @@ test_expect_success 'shrink file with tons of missing blanks at end of file' '
 '
 
 test_expect_success 'missing blanks at EOF must only match blank lines' '
-	{ echo a; echo b; } >one &&
+	test_write_lines a b >one &&
 	git add one &&
-	{ echo c; echo d; } >>one &&
+	test_write_lines c d >>one &&
 	git diff -- one >patch &&
 
 	echo a >one &&
@@ -434,9 +434,9 @@ test_expect_success 'missing blank line should match context line with spaces' '
 	git add one &&
 	echo d >>one &&
 	git diff -- one >patch &&
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	cp one expect &&
-	{ echo; echo d; } >>expect &&
+	test_write_lines "" d >>expect &&
 	git add one &&
 
 	git apply --whitespace=fix patch &&
@@ -455,7 +455,7 @@ test_expect_success 'same, but with the --ignore-space-option' '
 	echo d >>one &&
 	cp one expect &&
 	git diff -- one >patch &&
-	{ echo a; echo b; echo c; } >one &&
+	test_write_lines a b c >one &&
 	git add one &&
 
 	git checkout-index -f one &&
diff --git a/t/t4125-apply-ws-fuzz.sh b/t/t4125-apply-ws-fuzz.sh
index 9671de7999..090987c89b 100755
--- a/t/t4125-apply-ws-fuzz.sh
+++ b/t/t4125-apply-ws-fuzz.sh
@@ -10,10 +10,7 @@ test_expect_success setup '
 	git add file &&
 
 	# file-0 is full of whitespace breakages
-	for l in a bb c d eeee f ggg h
-	do
-		echo "$l "
-	done >file-0 &&
+	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
 
 	# patch-0 creates a whitespace broken file
 	cat file-0 >file &&
diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index ceb6a79fe0..33860d3829 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -2,6 +2,8 @@
 
 test_description='apply empty'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -9,10 +11,9 @@ test_expect_success setup '
 	git add empty &&
 	test_tick &&
 	git commit -m initial &&
-	for i in a b c d e
-	do
-		echo $i
-	done >empty &&
+	git commit --allow-empty -m "empty commit" &&
+	git format-patch --always HEAD~ >empty.patch &&
+	test_write_lines a b c d e >empty &&
 	cat empty >expect &&
 	git diff |
 	sed -e "/^diff --git/d" \
@@ -25,30 +26,42 @@ test_expect_success setup '
 '
 
 test_expect_success 'apply empty' '
-	git reset --hard &&
 	rm -f missing &&
+	test_when_finished "git reset --hard" &&
 	git apply patch0 &&
 	test_cmp expect empty
 '
 
+test_expect_success 'apply empty patch fails' '
+	test_when_finished "git reset --hard" &&
+	test_must_fail git apply empty.patch &&
+	test_must_fail git apply - </dev/null
+'
+
+test_expect_success 'apply with --allow-empty succeeds' '
+	test_when_finished "git reset --hard" &&
+	git apply --allow-empty empty.patch &&
+	git apply --allow-empty - </dev/null
+'
+
 test_expect_success 'apply --index empty' '
-	git reset --hard &&
 	rm -f missing &&
+	test_when_finished "git reset --hard" &&
 	git apply --index patch0 &&
 	test_cmp expect empty &&
 	git diff --exit-code
 '
 
 test_expect_success 'apply create' '
-	git reset --hard &&
 	rm -f missing &&
+	test_when_finished "git reset --hard" &&
 	git apply patch1 &&
 	test_cmp expect missing
 '
 
 test_expect_success 'apply --index create' '
-	git reset --hard &&
 	rm -f missing &&
+	test_when_finished "git reset --hard" &&
 	git apply --index patch1 &&
 	test_cmp expect missing &&
 	git diff --exit-code
diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 305b7e649e..aa5cfae2b6 100755
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -2,6 +2,8 @@
 
 test_description='apply same filename'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 modify () {
@@ -10,10 +12,7 @@ modify () {
 }
 
 test_expect_success setup '
-	for i in a b c d e f g h i j k l m
-	do
-		echo $i
-	done >same_fn &&
+	test_write_lines a b c d e f g h i j k l m >same_fn &&
 	cp same_fn other_fn &&
 	git add same_fn other_fn &&
 	git commit -m initial
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
index 6cc741a634..cb3181e8b7 100755
--- a/t/t4128-apply-root.sh
+++ b/t/t4128-apply-root.sh
@@ -2,6 +2,8 @@
 
 test_description='apply same filename'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index 576632f868..a1c7686519 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -2,6 +2,8 @@
 
 test_description='applying patch with mode bits'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
index f8a313bcb9..f3ea632742 100755
--- a/t/t4130-apply-criss-cross-rename.sh
+++ b/t/t4130-apply-criss-cross-rename.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='git apply handling criss-cross rename patch.'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 create_file() {
diff --git a/t/t4132-apply-removal.sh b/t/t4132-apply-removal.sh
index fec1d6fa51..c1e3049c04 100755
--- a/t/t4132-apply-removal.sh
+++ b/t/t4132-apply-removal.sh
@@ -4,6 +4,8 @@
 
 test_description='git-apply notices removal patches generated by GNU diff'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index c5ed3b17c4..35f1060bc8 100755
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -5,6 +5,8 @@
 
 test_description='git apply filename consistency check'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4134-apply-submodule.sh b/t/t4134-apply-submodule.sh
index d1c16ba33c..aceb4c42b0 100755
--- a/t/t4134-apply-submodule.sh
+++ b/t/t4134-apply-submodule.sh
@@ -5,6 +5,8 @@
 
 test_description='git apply submodule tests'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t4136-apply-check.sh b/t/t4136-apply-check.sh
index 4c3f264a63..dfec1c5f0f 100755
--- a/t/t4136-apply-check.sh
+++ b/t/t4136-apply-check.sh
@@ -2,6 +2,8 @@
 
 test_description='git apply should exit non-zero with unrecognized input.'
 
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t4138-apply-ws-expansion.sh b/t/t4138-apply-ws-expansion.sh
index b19faeb67a..8bbf8260fa 100755
--- a/t/t4138-apply-ws-expansion.sh
+++ b/t/t4138-apply-ws-expansion.sh
@@ -29,8 +29,8 @@ test_expect_success setup '
 	x=1 &&
 	while test $x -lt $n
 	do
-		printf "%63s%d\n" "" $x >>after
-		x=$(( $x + 1 ))
+		printf "%63s%d\n" "" $x >>after &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	printf "\t%s\n" d e f >>after &&
 	test_expect_code 1 git diff --no-index before after >patch2.patch.raw &&
@@ -40,8 +40,8 @@ test_expect_success setup '
 	x=1 &&
 	while test $x -lt $n
 	do
-		printf "%63s%d\n" "" $x >>expect-2
-		x=$(( $x + 1 ))
+		printf "%63s%d\n" "" $x >>expect-2 &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	printf "%64s\n" d e f >>expect-2 &&
 
@@ -52,8 +52,8 @@ test_expect_success setup '
 	x=0 &&
 	while test $x -lt $n
 	do
-		printf "%63s%02d\n" "" $x >>after
-		x=$(( $x + 1 ))
+		printf "%63s%02d\n" "" $x >>after &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	printf "\t%s\n" d e f >>after &&
 	test_expect_code 1 git diff --no-index before after >patch3.patch.raw &&
@@ -63,8 +63,8 @@ test_expect_success setup '
 	x=0 &&
 	while test $x -lt $n
 	do
-		printf "%63s%02d\n" "" $x >>expect-3
-		x=$(( $x + 1 ))
+		printf "%63s%02d\n" "" $x >>expect-3 &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	printf "%64s\n" d e f >>expect-3 &&
 
@@ -73,16 +73,16 @@ test_expect_success setup '
 	x=0 &&
 	while test $x -lt 50
 	do
-		printf "\t%02d\n" $x >>before
-		x=$(( $x + 1 ))
+		printf "\t%02d\n" $x >>before &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	cat before >after &&
 	printf "%64s\n" a b c >>after &&
 	while test $x -lt 100
 	do
-		printf "\t%02d\n" $x >>before
-		printf "\t%02d\n" $x >>after
-		x=$(( $x + 1 ))
+		printf "\t%02d\n" $x >>before &&
+		printf "\t%02d\n" $x >>after &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	test_expect_code 1 git diff --no-index before after >patch4.patch.raw &&
 	sed -e "s/before/test-4/" -e "s/after/test-4/" patch4.patch.raw >patch4.patch &&
@@ -90,16 +90,16 @@ test_expect_success setup '
 	x=0 &&
 	while test $x -lt 50
 	do
-		printf "%63s%02d\n" "" $x >>test-4
-		x=$(( $x + 1 ))
+		printf "%63s%02d\n" "" $x >>test-4 &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 	cat test-4 >expect-4 &&
 	printf "%64s\n" a b c >>expect-4 &&
 	while test $x -lt 100
 	do
-		printf "%63s%02d\n" "" $x >>test-4
-		printf "%63s%02d\n" "" $x >>expect-4
-		x=$(( $x + 1 ))
+		printf "%63s%02d\n" "" $x >>test-4 &&
+		printf "%63s%02d\n" "" $x >>expect-4 &&
+		x=$(( $x + 1 )) || return 1
 	done &&
 
 	git config core.whitespace tab-in-indent,tabwidth=63 &&
diff --git a/t/t4139-apply-escape.sh b/t/t4139-apply-escape.sh
index 45b5660a47..e5c7439df1 100755
--- a/t/t4139-apply-escape.sh
+++ b/t/t4139-apply-escape.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='paths written by git-apply cannot escape the working tree'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # tests will try to write to ../foo, and we do not
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 2aaaa0d7de..6caff0ca39 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -116,7 +116,7 @@ test_expect_success setup '
 		git format-patch --stdout first | sed -e "1d"
 	} | append_cr >patch1-crlf.eml &&
 	{
-		printf "%255s\\n" ""
+		printf "%255s\\n" "" &&
 		echo "X-Fake-Field: Line One" &&
 		echo "X-Fake-Field: Line Two" &&
 		echo "X-Fake-Field: Line Three" &&
@@ -196,6 +196,12 @@ test_expect_success setup '
 
 	git format-patch -M --stdout lorem^ >rename-add.patch &&
 
+	git checkout -b empty-commit &&
+	git commit -m "empty commit" --allow-empty &&
+
+	: >empty.patch &&
+	git format-patch --always --stdout empty-commit^ >empty-commit.patch &&
+
 	# reset time
 	sane_unset test_tick &&
 	test_tick
@@ -1152,4 +1158,105 @@ test_expect_success 'apply binary blob in partial clone' '
 	git -C client am ../patch
 '
 
+test_expect_success 'an empty input file is error regardless of --empty option' '
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am --empty=drop empty.patch 2>actual &&
+	echo "Patch format detection failed." >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'invalid when passing the --empty option alone' '
+	test_when_finished "git am --abort || :" &&
+	git checkout empty-commit^ &&
+	test_must_fail git am --empty empty-commit.patch 2>err &&
+	echo "error: Invalid value for --empty: empty-commit.patch" >expected &&
+	test_cmp expected err
+'
+
+test_expect_success 'a message without a patch is an error (default)' '
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty" err
+'
+
+test_expect_success 'a message without a patch is an error where an explicit "--empty=stop" is given' '
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am --empty=stop empty-commit.patch >err &&
+	grep "Patch is empty." err
+'
+
+test_expect_success 'a message without a patch will be skipped when "--empty=drop" is given' '
+	git am --empty=drop empty-commit.patch >output &&
+	git rev-parse empty-commit^ >expected &&
+	git rev-parse HEAD >actual &&
+	test_cmp expected actual &&
+	grep "Skipping: empty commit" output
+'
+
+test_expect_success 'record as an empty commit when meeting e-mail message that lacks a patch' '
+	git am --empty=keep empty-commit.patch >output &&
+	test_path_is_missing .git/rebase-apply &&
+	git show empty-commit --format="%B" >expected &&
+	git show HEAD --format="%B" >actual &&
+	grep -f actual expected &&
+	grep "Creating an empty commit: empty commit" output
+'
+
+test_expect_success 'skip an empty patch in the middle of an am session' '
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty." err &&
+	grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git am --skip &&
+	test_path_is_missing .git/rebase-apply &&
+	git rev-parse empty-commit^ >expected &&
+	git rev-parse HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'record an empty patch as an empty commit in the middle of an am session' '
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty." err &&
+	grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git am --allow-empty >output &&
+	grep "No changes - recorded it as an empty commit." output &&
+	test_path_is_missing .git/rebase-apply &&
+	git show empty-commit --format="%B" >expected &&
+	git show HEAD --format="%B" >actual &&
+	grep -f actual expected
+'
+
+test_expect_success 'create an non-empty commit when the index IS changed though "--allow-empty" is given' '
+	git checkout empty-commit^ &&
+	test_must_fail git am empty-commit.patch >err &&
+	: >empty-file &&
+	git add empty-file &&
+	git am --allow-empty &&
+	git show empty-commit --format="%B" >expected &&
+	git show HEAD --format="%B" >actual &&
+	grep -f actual expected &&
+	git diff HEAD^..HEAD --name-only
+'
+
+test_expect_success 'cannot create empty commits when there is a clean index due to merge conflicts' '
+	test_when_finished "git am --abort || :" &&
+	git rev-parse HEAD >expected &&
+	test_must_fail git am seq.patch &&
+	test_must_fail git am --allow-empty >err &&
+	! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git rev-parse HEAD >actual &&
+	test_cmp actual expected
+'
+
+test_expect_success 'cannot create empty commits when there is unmerged index due to merge conflicts' '
+	test_when_finished "git am --abort || :" &&
+	git rev-parse HEAD >expected &&
+	test_must_fail git am -3 seq.patch &&
+	test_must_fail git am --allow-empty >err &&
+	! grep "To record the empty patch as an empty commit, run \"git am --allow-empty\"." err &&
+	git rev-parse HEAD >actual &&
+	test_cmp actual expected
+'
+
 test_done
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 2374151662..5ed7e22827 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -5,10 +5,7 @@ test_description='am --abort'
 . ./test-lib.sh
 
 test_expect_success setup '
-	for i in a b c d e f g
-	do
-		echo $i
-	done >file-1 &&
+	test_write_lines a b c d e f g >file-1 &&
 	cp file-1 file-2 &&
 	test_tick &&
 	git add file-1 file-2 &&
@@ -43,10 +40,7 @@ do
 
 		test_must_fail git am$with3 000[1245]-*.patch &&
 		git log --pretty=tformat:%s >actual &&
-		for i in 3 2 initial
-		do
-			echo $i
-		done >expect &&
+		test_write_lines 3 2 initial >expect &&
 		test_cmp expect actual
 	'
 
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 7884e3d46b..5049559861 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -120,48 +120,48 @@ test_expect_success 'diff-filter=A' '
 
 test_expect_success 'diff-filter=M' '
 
-	actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
-	expect=$(echo second) &&
-	verbose test "$actual" = "$expect"
+	git log --pretty="format:%s" --diff-filter=M HEAD >actual &&
+	printf "second" >expect &&
+	test_cmp expect actual
 
 '
 
 test_expect_success 'diff-filter=D' '
 
-	actual=$(git log --no-renames --pretty="format:%s" --diff-filter=D HEAD) &&
-	expect=$(echo sixth ; echo third) &&
-	verbose test "$actual" = "$expect"
+	git log --no-renames --pretty="format:%s" --diff-filter=D HEAD >actual &&
+	printf "sixth\nthird" >expect &&
+	test_cmp expect actual
 
 '
 
 test_expect_success 'diff-filter=R' '
 
-	actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
-	expect=$(echo third) &&
-	verbose test "$actual" = "$expect"
+	git log -M --pretty="format:%s" --diff-filter=R HEAD >actual &&
+	printf "third" >expect &&
+	test_cmp expect actual
 
 '
 
 test_expect_success 'diff-filter=C' '
 
-	actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
-	expect=$(echo fourth) &&
-	verbose test "$actual" = "$expect"
+	git log -C -C --pretty="format:%s" --diff-filter=C HEAD >actual &&
+	printf "fourth" >expect &&
+	test_cmp expect actual
 
 '
 
 test_expect_success 'git log --follow' '
 
-	actual=$(git log --follow --pretty="format:%s" ichi) &&
-	expect=$(echo third ; echo second ; echo initial) &&
-	verbose test "$actual" = "$expect"
+	git log --follow --pretty="format:%s" ichi >actual &&
+	printf "third\nsecond\ninitial" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git config log.follow works like --follow' '
 	test_config log.follow true &&
-	actual=$(git log --pretty="format:%s" ichi) &&
-	expect=$(echo third ; echo second ; echo initial) &&
-	verbose test "$actual" = "$expect"
+	git log --pretty="format:%s" ichi >actual &&
+	printf "third\nsecond\ninitial" >expect &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git config log.follow does not die with multiple paths' '
@@ -176,9 +176,9 @@ test_expect_success 'git config log.follow does not die with no paths' '
 
 test_expect_success 'git config log.follow is overridden by --no-follow' '
 	test_config log.follow true &&
-	actual=$(git log --no-follow --pretty="format:%s" ichi) &&
-	expect="third" &&
-	verbose test "$actual" = "$expect"
+	git log --no-follow --pretty="format:%s" ichi >actual &&
+	printf "third" >expect &&
+	test_cmp expect actual
 '
 
 # Note that these commits are intentionally listed out of order.
@@ -250,7 +250,7 @@ test_expect_success 'log --invert-grep --grep' '
 	test_cmp expect actual &&
 
 	# POSIX extended
-	git -c grep.patternType=basic log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
+	git -c grep.patternType=extended log --pretty="tformat:%s" --invert-grep --grep=t[h] --grep=S[e]c >actual &&
 	test_cmp expect actual &&
 
 	# PCRE
@@ -952,6 +952,43 @@ test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
 	test_cmp expect.decorate actual
 '
 
+test_expect_success 'decorate-refs with implied decorate from format' '
+	cat >expect <<-\EOF &&
+	side-2 (tag: side-2)
+	side-1
+	EOF
+	git log --no-walk --format="%s%d" \
+		--decorate-refs="*side-2" side-1 side-2 \
+		>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'implied decorate does not override option' '
+	cat >expect <<-\EOF &&
+	side-2 (tag: refs/tags/side-2, refs/heads/side)
+	side-1 (tag: refs/tags/side-1)
+	EOF
+	git log --no-walk --format="%s%d" \
+		--decorate=full side-1 side-2 \
+		>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'decorate-refs and simplify-by-decoration without output' '
+	cat >expect <<-\EOF &&
+	side-2
+	initial
+	EOF
+	# Do not just use a --format without %d here; we want to
+	# make sure that we did not accidentally turn on displaying
+	# the decorations, too. And that requires one of the regular
+	# formats.
+	git log --decorate-refs="*side-2" --oneline \
+		--simplify-by-decoration >actual.raw &&
+	sed "s/^[0-9a-f]* //" <actual.raw >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'log.decorate config parsing' '
 	git log --oneline --decorate=full >expect.full &&
 	git log --oneline --decorate=short >expect.short &&
@@ -1677,6 +1714,24 @@ test_expect_success GPGSSH 'setup sshkey signed branch' '
 	git commit -S -m signed_commit
 '
 
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' '
+	test_config gpg.format ssh &&
+	touch file &&
+	git add file &&
+
+	echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+	git tag expired-signed &&
+
+	echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+	git tag notyetvalid-signed &&
+
+	echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+	git tag timeboxedvalid-signed &&
+
+	echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+	git tag timeboxedinvalid-signed
+'
+
 test_expect_success GPGSM 'log x509 fingerprint' '
 	echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect &&
 	git log -n1 --format="%GF | %GP" signed-x509 >actual &&
@@ -1714,6 +1769,31 @@ test_expect_success GPGSSH 'log --graph --show-signature ssh' '
 	grep "${GOOD_SIGNATURE_TRUSTED}" actual
 '
 
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure on expired signature key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git log --graph --show-signature -n1 expired-signed >actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure on not yet valid signature key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git log --graph --show-signature -n1 notyetvalid-signed >actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log show success with commit date and key validity matching' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git log --graph --show-signature -n1 timeboxedvalid-signed >actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'log shows failure with commit date outside of key validity' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git log --graph --show-signature -n1 timeboxedinvalid-signed >actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
 test_expect_success GPG 'log --graph --show-signature for merged tag' '
 	test_when_finished "git reset --hard && git checkout main" &&
 	git checkout -b plain main &&
@@ -2010,4 +2090,23 @@ test_expect_success 'log --end-of-options' '
        test_cmp expect actual
 '
 
+test_expect_success 'set up commits with different authors' '
+	git checkout --orphan authors &&
+	test_commit --author "Jim <jim@example.com>" jim_1 &&
+	test_commit --author "Val <val@example.com>" val_1 &&
+	test_commit --author "Val <val@example.com>" val_2 &&
+	test_commit --author "Jim <jim@example.com>" jim_2 &&
+	test_commit --author "Val <val@example.com>" val_3 &&
+	test_commit --author "Jim <jim@example.com>" jim_3
+'
+
+test_expect_success 'log --invert-grep --grep --author' '
+	cat >expect <<-\EOF &&
+	val_3
+	val_1
+	EOF
+	git log --format=%s --author=Val --grep 2 --invert-grep >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index f120857c20..80f4a65b28 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -27,7 +27,8 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'patch-id output is well-formed' '
-	git log -p -1 | git patch-id >output &&
+	git log -p -1 >log.output &&
+	git patch-id <log.output >output &&
 	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
 '
 
@@ -35,8 +36,8 @@ test_expect_success 'patch-id output is well-formed' '
 calc_patch_id () {
 	patch_name="$1"
 	shift
-	git patch-id "$@" |
-	sed "s/ .*//" >patch-id_"$patch_name" &&
+	git patch-id "$@" >patch-id.output &&
+	sed "s/ .*//" patch-id.output >patch-id_"$patch_name" &&
 	test_line_count -gt 0 patch-id_"$patch_name"
 }
 
@@ -45,7 +46,8 @@ get_top_diff () {
 }
 
 get_patch_id () {
-	get_top_diff "$1" | calc_patch_id "$@"
+	get_top_diff "$1" >top-diff.output &&
+	calc_patch_id <top-diff.output "$@"
 }
 
 test_expect_success 'patch-id detects equality' '
@@ -63,16 +65,18 @@ test_expect_success 'patch-id detects inequality' '
 test_expect_success 'patch-id supports git-format-patch output' '
 	get_patch_id main &&
 	git checkout same &&
-	git format-patch -1 --stdout | calc_patch_id same &&
+	git format-patch -1 --stdout >format-patch.output &&
+	calc_patch_id same <format-patch.output &&
 	test_cmp patch-id_main patch-id_same &&
-	set $(git format-patch -1 --stdout | git patch-id) &&
+	set $(git patch-id <format-patch.output) &&
 	test "$2" = $(git rev-parse HEAD)
 '
 
 test_expect_success 'whitespace is irrelevant in footer' '
 	get_patch_id main &&
 	git checkout same &&
-	git format-patch -1 --stdout | sed "s/ \$//" | calc_patch_id same &&
+	git format-patch -1 --stdout >format-patch.output &&
+	sed "s/ \$//" format-patch.output | calc_patch_id same &&
 	test_cmp patch-id_main patch-id_same
 '
 
@@ -91,10 +95,11 @@ test_patch_id_file_order () {
 	shift
 	name="order-${1}-$relevant"
 	shift
-	get_top_diff "main" | calc_patch_id "$name" "$@" &&
+	get_top_diff "main" >top-diff.output &&
+	calc_patch_id <top-diff.output "$name" "$@" &&
 	git checkout same &&
-	git format-patch -1 --stdout -O foo-then-bar |
-		calc_patch_id "ordered-$name" "$@" &&
+	git format-patch -1 --stdout -O foo-then-bar >format-patch.output &&
+	calc_patch_id <format-patch.output "ordered-$name" "$@" &&
 	cmp_patch_id $relevant "$name" "ordered-$name"
 
 }
@@ -142,7 +147,8 @@ test_expect_success '--stable overrides patchid.stable = false' '
 test_expect_success 'patch-id supports git-format-patch MIME output' '
 	get_patch_id main &&
 	git checkout same &&
-	git format-patch -1 --attach --stdout | calc_patch_id same &&
+	git format-patch -1 --attach --stdout >format-patch.output &&
+	calc_patch_id <format-patch.output same &&
 	test_cmp patch-id_main patch-id_same
 '
 
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 5865daa8f8..e448ef2928 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -976,7 +976,7 @@ test_expect_success '%(describe) vs git describe' '
 		else
 			: >expect-contains-bad
 		fi &&
-		echo "$hash $desc"
+		echo "$hash $desc" || return 1
 	done >expect &&
 	test_path_exists expect-contains-good &&
 	test_path_exists expect-contains-bad &&
@@ -1002,4 +1002,20 @@ test_expect_success '%(describe:exclude=...) vs git describe --exclude ...' '
 	test_cmp expect actual
 '
 
+test_expect_success '%(describe:tags) vs git describe --tags' '
+	test_when_finished "git tag -d tagname" &&
+	git tag tagname &&
+	git describe --tags >expect &&
+	git log -1 --format="%(describe:tags)" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(describe:abbrev=...) vs git describe --abbrev=...' '
+	test_when_finished "git tag -d tagname" &&
+	git tag -a -m tagged tagname &&
+	git describe --abbrev=15 >expect &&
+	git log -1 --format="%(describe:abbrev=15)" >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 75795d0b49..7f6bb27f14 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -63,21 +63,21 @@ test_expect_success 'usage' '
 	test_i18ngrep "switch.*requires a value" err &&
 
 	test_expect_code 128 git log -Gregex -Sstring 2>err &&
-	grep "mutually exclusive" err &&
+	grep "cannot be used together" err &&
 
 	test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
-	grep "mutually exclusive" err &&
+	grep "cannot be used together" err &&
 
 	test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
-	grep "mutually exclusive" err &&
+	grep "cannot be used together" err &&
 
 	test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
-	grep "mutually exclusive" err
+	grep "cannot be used together" err
 '
 
 test_expect_success 'usage: --pickaxe-regex' '
 	test_expect_code 128 git log -Gregex --pickaxe-regex 2>err &&
-	grep "mutually exclusive" err
+	grep "cannot be used together" err
 '
 
 test_expect_success 'usage: --no-pickaxe-regex' '
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 560127cc07..ac9e4d0928 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -137,7 +137,7 @@ test_expect_success 'range_set_union' '
 	test_seq 1000 > c.c &&
 	git add c.c &&
 	git commit -m "modify many lines" &&
-	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c; done)
+	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c || return 1; done)
 '
 
 test_expect_success '-s shows only line-log commits' '
diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 03b952c90d..0244888a5a 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -20,10 +20,10 @@ test_expect_success 'fsck notices broken commit' '
 
 test_expect_success 'git log with broken author email' '
 	{
-		echo commit $(cat broken_email.hash)
-		echo "Author: A U Thor <author@example.com>"
-		echo "Date:   Thu Apr 7 15:13:13 2005 -0700"
-		echo
+		echo commit $(cat broken_email.hash) &&
+		echo "Author: A U Thor <author@example.com>" &&
+		echo "Date:   Thu Apr 7 15:13:13 2005 -0700" &&
+		echo &&
 		echo "    foo"
 	} >expect.out &&
 
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh
index 50f206db55..cc3cebf672 100755
--- a/t/t4216-log-bloom.sh
+++ b/t/t4216-log-bloom.sh
@@ -175,13 +175,11 @@ test_expect_success 'persist filter settings' '
 	test_when_finished rm -rf .git/objects/info/commit-graph* &&
 	rm -rf .git/objects/info/commit-graph* &&
 	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		GIT_TRACE2_EVENT_NESTING=5 \
 		GIT_TEST_BLOOM_SETTINGS_NUM_HASHES=9 \
 		GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY=15 \
 		git commit-graph write --reachable --changed-paths &&
 	grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2.txt &&
 	GIT_TRACE2_EVENT="$(pwd)/trace2-auto.txt" \
-		GIT_TRACE2_EVENT_NESTING=5 \
 		git commit-graph write --reachable --changed-paths &&
 	grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt
 '
@@ -376,7 +374,7 @@ test_expect_success 'Bloom generation backfills empty commits' '
 		cd empty &&
 		for i in $(test_seq 1 6)
 		do
-			git commit --allow-empty -m "$i"
+			git commit --allow-empty -m "$i" || return 1
 		done &&
 
 		# Generate Bloom filters for empty commits 1-6, two at a time.
@@ -389,7 +387,7 @@ test_expect_success 'Bloom generation backfills empty commits' '
 			test_filter_computed 2 trace.event &&
 			test_filter_not_computed 4 trace.event &&
 			test_filter_trunc_empty 2 trace.event &&
-			test_filter_trunc_large 0 trace.event
+			test_filter_trunc_large 0 trace.event || return 1
 		done &&
 
 		# Finally, make sure that once all commits have filters, that
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 2c88d1c159..7f8d2ab0a7 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -77,7 +77,7 @@ check_tar() {
 					path=$(get_pax_header $header path) &&
 					if test -n "$path"
 					then
-						mv "$data" "$path"
+						mv "$data" "$path" || exit 1
 					fi
 				fi
 			done
@@ -133,7 +133,7 @@ test_expect_success 'populate workdir' '
 		for depth in 1 2 3 4 5
 		do
 			mkdir $p &&
-			cd $p
+			cd $p || exit 1
 		done &&
 		echo text >file_with_long_path
 	) &&
diff --git a/t/t5002-archive-attr-pattern.sh b/t/t5002-archive-attr-pattern.sh
index bda6d7d7e9..a66b5ba27e 100755
--- a/t/t5002-archive-attr-pattern.sh
+++ b/t/t5002-archive-attr-pattern.sh
@@ -2,6 +2,7 @@
 
 test_description='git archive attribute pattern tests'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_exists() {
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 1e6d18b140..d726964307 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -106,7 +106,7 @@ test_expect_success \
      printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
      printf "A not substituted O" >a/substfile2 &&
      (p=long_path_to_a_file && cd a &&
-      for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
+      for depth in 1 2 3 4 5; do mkdir $p && cd $p || exit 1; done &&
       echo text >file_with_long_path)
 '
 
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 2d32d0ed12..ae508e2162 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -131,7 +131,7 @@ test_expect_success ZIPINFO 'zip archive with many entries' '
 	do
 		for b in 0 1 2 3 4 5 6 7 8 9 a b c d e f
 		do
-			: >00/$a$b
+			: >00/$a$b || return 1
 		done
 	done &&
 	git add 00 &&
@@ -143,7 +143,7 @@ test_expect_success ZIPINFO 'zip archive with many entries' '
 	do
 		for d in 0 1 2 3 4 5 6 7 8 9 a b c d e f
 		do
-			echo "040000 tree $subtree	$c$d"
+			echo "040000 tree $subtree	$c$d" || return 1
 		done
 	done >tree &&
 	tree=$(git mktree <tree) &&
@@ -171,7 +171,7 @@ test_expect_success EXPENSIVE,UNZIP,UNZIP_ZIP64_SUPPORT \
 	# create tree containing 65500 entries of that blob
 	for i in $(test_seq 1 65500)
 	do
-		echo "100644 blob $blob	$i"
+		echo "100644 blob $blob	$i" || return 1
 	done >tree &&
 	tree=$(git mktree <tree) &&
 
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 141b29f031..cebad1048c 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -122,7 +122,7 @@ test_expect_success 'mailinfo unescapes with --mboxrd' '
 	do
 		git mailinfo mboxrd/msg mboxrd/patch \
 		  <mboxrd/$i >mboxrd/out &&
-		test_cmp "$DATA/${i}mboxrd" mboxrd/msg
+		test_cmp "$DATA/${i}mboxrd" mboxrd/msg || return 1
 	done &&
 	sp=" " &&
 	echo "From " >expect &&
diff --git a/t/t5200-update-server-info.sh b/t/t5200-update-server-info.sh
index 21a58eecb9..ed9dfd624c 100755
--- a/t/t5200-update-server-info.sh
+++ b/t/t5200-update-server-info.sh
@@ -2,6 +2,7 @@
 
 test_description='Test git update-server-info'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' 'test_commit file'
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index e13a884207..2fd845187e 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -347,7 +347,7 @@ test_expect_success 'unpacking with --strict' '
 		for i in 0 1 2 3 4 5 6 7 8 9
 		do
 			o=$(echo $j$i | git hash-object -w --stdin) &&
-			echo "100644 $o	0 $j$i"
+			echo "100644 $o	0 $j$i" || return 1
 		done
 	done >LIST &&
 	rm -f .git/index &&
@@ -361,11 +361,7 @@ test_expect_success 'unpacking with --strict' '
 	ST=$(git write-tree) &&
 	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
 	PACK5=$( git pack-objects test-5 <actual ) &&
-	PACK6=$( (
-			echo "$LIST"
-			echo "$LI"
-			echo "$ST"
-		 ) | git pack-objects test-6 ) &&
+	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
 	test_create_repo test-5 &&
 	(
 		cd test-5 &&
@@ -394,7 +390,7 @@ test_expect_success 'index-pack with --strict' '
 		for i in 0 1 2 3 4 5 6 7 8 9
 		do
 			o=$(echo $j$i | git hash-object -w --stdin) &&
-			echo "100644 $o	0 $j$i"
+			echo "100644 $o	0 $j$i" || return 1
 		done
 	done >LIST &&
 	rm -f .git/index &&
@@ -408,11 +404,7 @@ test_expect_success 'index-pack with --strict' '
 	ST=$(git write-tree) &&
 	git rev-list --objects "$LIST" "$LI" "$ST" >actual &&
 	PACK5=$( git pack-objects test-5 <actual ) &&
-	PACK6=$( (
-			echo "$LIST"
-			echo "$LI"
-			echo "$ST"
-		 ) | git pack-objects test-6 ) &&
+	PACK6=$( test_write_lines "$LIST" "$LI" "$ST" | git pack-objects test-6 ) &&
 	test_create_repo test-7 &&
 	(
 		cd test-7 &&
@@ -594,7 +586,7 @@ test_expect_success 'setup for --stdin-packs tests' '
 		for id in A B C
 		do
 			git pack-objects .git/objects/pack/pack-$id \
-				--incremental --revs <<-EOF
+				--incremental --revs <<-EOF || exit 1
 			refs/tags/$id
 			EOF
 		done &&
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 7c9d687367..8ee67df38f 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup' '
 	i=1 &&
 	while test $i -le 100
 	do
-		iii=$(printf "%03i" $i)
+		iii=$(printf "%03i" $i) &&
 		test-tool genrandom "bar" 200 > wide_delta_$iii &&
 		test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
 		test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
diff --git a/t/t5306-pack-nobase.sh b/t/t5306-pack-nobase.sh
index f4931c0c2a..51973f4a51 100755
--- a/t/t5306-pack-nobase.sh
+++ b/t/t5306-pack-nobase.sh
@@ -12,7 +12,7 @@ test_description='git-pack-object with missing base
 #
 test_expect_success \
     'setup base' \
-    'for a in a b c d e f g h i; do echo $a >>text; done &&
+    'test_write_lines a b c d e f g h i >text &&
      echo side >side &&
      git update-index --add text side &&
      A=$(echo A | git commit-tree $(git write-tree)) &&
diff --git a/t/t5307-pack-missing-commit.sh b/t/t5307-pack-missing-commit.sh
index f4338abb78..1e02c305c4 100755
--- a/t/t5307-pack-missing-commit.sh
+++ b/t/t5307-pack-missing-commit.sh
@@ -2,6 +2,7 @@
 
 test_description='pack should notice missing commit objects'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -11,7 +12,7 @@ test_expect_success setup '
 		git add "file$i" &&
 		test_tick &&
 		git commit -m "$i" &&
-		git tag "tag$i"
+		git tag "tag$i" || return 1
 	done &&
 	obj=$(git rev-parse --verify tag3) &&
 	fanout=$(expr "$obj" : "\(..\)") &&
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index dcf03d324a..d05ab716f6 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
 test_description='exercise basic bitmap functionality'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-bitmap.sh
@@ -35,7 +33,7 @@ test_expect_success 'setup writing bitmaps during repack' '
 '
 
 test_expect_success 'full repack creates bitmaps' '
-	GIT_TRACE2_EVENT_NESTING=4 GIT_TRACE2_EVENT="$(pwd)/trace" \
+	GIT_TRACE2_EVENT="$(pwd)/trace" \
 		git repack -ad &&
 	ls .git/objects/pack/ | grep bitmap >output &&
 	test_line_count = 1 output &&
@@ -230,7 +228,7 @@ test_expect_success 'pack reuse respects --honor-pack-keep' '
 	test_when_finished "rm -f .git/objects/pack/*.keep" &&
 	for i in .git/objects/pack/*.pack
 	do
-		>${i%.pack}.keep
+		>${i%.pack}.keep || return 1
 	done &&
 	reusable_pack --honor-pack-keep >empty.pack &&
 	git index-pack empty.pack &&
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index 759169d074..df524f7b6d 100755
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@ -57,8 +57,11 @@ test_expect_success 'create series of packs' '
 		git commit -m $i &&
 		cur=$(git rev-parse HEAD^{tree}) &&
 		{
-			test -n "$prev" && echo "-$prev"
-			echo $cur
+			if test -n "$prev"
+			then
+				echo "-$prev"
+			fi &&
+			echo $cur &&
 			echo "$(git rev-parse :file) file"
 		} | git pack-objects --stdout >tmp &&
 		git index-pack --stdin --fix-thin <tmp || return 1
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 13ed3eb136..33b740ce62 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -16,9 +16,9 @@ test_expect_success 'setup r1' '
 	git init r1 &&
 	for n in 1 2 3 4 5
 	do
-		echo "This is file: $n" > r1/file.$n
-		git -C r1 add file.$n
-		git -C r1 commit -m "$n"
+		echo "This is file: $n" > r1/file.$n &&
+		git -C r1 add file.$n &&
+		git -C r1 commit -m "$n" || return 1
 	done
 '
 
@@ -116,9 +116,9 @@ test_expect_success 'setup r2' '
 	git init r2 &&
 	for n in 1000 10000
 	do
-		printf "%"$n"s" X > r2/large.$n
-		git -C r2 add large.$n
-		git -C r2 commit -m "$n"
+		printf "%"$n"s" X > r2/large.$n &&
+		git -C r2 add large.$n &&
+		git -C r2 commit -m "$n" || return 1
 	done
 '
 
@@ -278,10 +278,10 @@ test_expect_success 'setup r3' '
 	mkdir r3/dir1 &&
 	for n in sparse1 sparse2
 	do
-		echo "This is file: $n" > r3/$n
-		git -C r3 add $n
-		echo "This is file: dir1/$n" > r3/dir1/$n
-		git -C r3 add dir1/$n
+		echo "This is file: $n" > r3/$n &&
+		git -C r3 add $n &&
+		echo "This is file: dir1/$n" > r3/dir1/$n &&
+		git -C r3 add dir1/$n || return 1
 	done &&
 	git -C r3 commit -m "sparse" &&
 	echo dir1/ >pattern1 &&
@@ -331,10 +331,10 @@ test_expect_success 'setup r4' '
 	mkdir r4/dir1 &&
 	for n in sparse1 sparse2
 	do
-		echo "This is file: $n" > r4/$n
-		git -C r4 add $n
-		echo "This is file: dir1/$n" > r4/dir1/$n
-		git -C r4 add dir1/$n
+		echo "This is file: $n" > r4/$n &&
+		git -C r4 add $n &&
+		echo "This is file: dir1/$n" > r4/dir1/$n &&
+		git -C r4 add dir1/$n || return 1
 	done &&
 	echo dir1/ >r4/pattern &&
 	git -C r4 add pattern &&
@@ -409,7 +409,7 @@ test_expect_success 'setup r1 - delete loose blobs' '
 
 	for id in `cat expected | sed "s|..|&/|"`
 	do
-		rm r1/.git/objects/$id
+		rm r1/.git/objects/$id || return 1
 	done
 '
 
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index f516fda7cc..edb728f77c 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -64,7 +64,7 @@ test_expect_success 'create commits and repack' '
 	for i in $(test_seq 3)
 	do
 		test_commit $i &&
-		git branch commits/$i
+		git branch commits/$i || return 1
 	done &&
 	git repack
 '
@@ -147,13 +147,13 @@ test_expect_success 'Add more commits' '
 	for i in $(test_seq 4 5)
 	do
 		test_commit $i &&
-		git branch commits/$i
+		git branch commits/$i || return 1
 	done &&
 	git reset --hard commits/2 &&
 	for i in $(test_seq 6 7)
 	do
 		test_commit $i &&
-		git branch commits/$i
+		git branch commits/$i || return 1
 	done &&
 	git reset --hard commits/2 &&
 	git merge commits/4 &&
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 3f69e43178..afbe93f162 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -93,7 +93,7 @@ test_expect_success 'create objects' '
 	test_commit initial &&
 	for i in $(test_seq 1 5)
 	do
-		generate_objects $i
+		generate_objects $i || return 1
 	done &&
 	commit_and_list_objects
 '
@@ -155,7 +155,7 @@ test_expect_success 'corrupt idx reports errors' '
 test_expect_success 'add more objects' '
 	for i in $(test_seq 6 10)
 	do
-		generate_objects $i
+		generate_objects $i || return 1
 	done &&
 	commit_and_list_objects
 '
@@ -203,7 +203,7 @@ test_expect_success 'add more packs' '
 	do
 		generate_objects $j &&
 		commit_and_list_objects &&
-		git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list
+		git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list || return 1
 	done
 '
 
@@ -482,8 +482,10 @@ test_expect_success 'corrupt MIDX is not reused' '
 '
 
 test_expect_success 'verify incorrect checksum' '
-	pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 1)) &&
-	corrupt_midx_and_verify $pos "\377" $objdir "incorrect checksum"
+	pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 10)) &&
+	corrupt_midx_and_verify $pos \
+		"\377\377\377\377\377\377\377\377\377\377" \
+		$objdir "incorrect checksum"
 '
 
 test_expect_success 'repack progress off for redirected stderr' '
@@ -594,7 +596,7 @@ test_expect_success 'force some 64-bit offsets with pack-objects' '
 	mkdir objects64/pack &&
 	for i in $(test_seq 1 11)
 	do
-		generate_objects 11
+		generate_objects 11 || return 1
 	done &&
 	commit_and_list_objects &&
 	pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
@@ -638,7 +640,7 @@ test_expect_success 'setup expire tests' '
 		git update-index --add large_file.txt &&
 		for i in $(test_seq 1 20)
 		do
-			test_commit $i
+			test_commit $i || exit 1
 		done &&
 		git branch A HEAD &&
 		git branch B HEAD~8 &&
diff --git a/t/t5322-pack-objects-sparse.sh b/t/t5322-pack-objects-sparse.sh
index 61cb907a90..d39958c066 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -14,7 +14,7 @@ test_expect_success 'setup repo' '
 		for j in $(test_seq 1 3)
 		do
 			mkdir f$i/f$j &&
-			echo $j >f$i/f$j/data.txt
+			echo $j >f$i/f$j/data.txt || return 1
 		done
 	done &&
 	git add . &&
@@ -23,7 +23,7 @@ test_expect_success 'setup repo' '
 	do
 		git checkout -b topic$i main &&
 		echo change-$i >f$i/f$i/data.txt &&
-		git commit -a -m "Changed f$i/f$i/data.txt"
+		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
 	done &&
 	cat >packinput.txt <<-EOF &&
 	topic1
diff --git a/t/t5325-reverse-index.sh b/t/t5325-reverse-index.sh
index da453f68d6..d042d26f2b 100755
--- a/t/t5325-reverse-index.sh
+++ b/t/t5325-reverse-index.sh
@@ -46,7 +46,7 @@ test_expect_success 'index-pack with --[no-]rev-index' '
 		test_path_exists $rev &&
 
 		test_index_pack "$conf" --no-rev-index &&
-		test_path_is_missing $rev
+		test_path_is_missing $rev || return 1
 	done
 '
 
diff --git a/t/t5410-receive-pack-alternates.sh b/t/t5410-receive-pack-alternates.sh
index 0b28e4e452..7a45d4c311 100755
--- a/t/t5410-receive-pack-alternates.sh
+++ b/t/t5410-receive-pack-alternates.sh
@@ -5,6 +5,7 @@ test_description='git receive-pack with alternate ref filtering'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 8a5d3492c7..f0dc4e6968 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -95,7 +95,7 @@ test_expect_success 'setup' '
 	while [ $cur -le 10 ]; do
 		add A$cur $(eval echo \$A$prev) &&
 		prev=$cur &&
-		cur=$(($cur+1))
+		cur=$(($cur+1)) || return 1
 	done &&
 	add B1 $A1 &&
 	git update-ref refs/heads/A "$ATIP" &&
@@ -112,7 +112,7 @@ test_expect_success 'post 1st pull setup' '
 	while [ $cur -le 65 ]; do
 		add B$cur $(eval echo \$B$prev) &&
 		prev=$cur &&
-		cur=$(($cur+1))
+		cur=$(($cur+1)) || return 1
 	done
 '
 
@@ -464,11 +464,11 @@ test_expect_success 'fetch creating new shallow root' '
 test_expect_success 'setup tests for the --stdin parameter' '
 	for head in C D E F
 	do
-		add $head
+		add $head || return 1
 	done &&
 	for head in A B C D E F
 	do
-		git tag $head $head
+		git tag $head $head || return 1
 	done &&
 	cat >input <<-\EOF &&
 	refs/heads/C
diff --git a/t/t5502-quickfetch.sh b/t/t5502-quickfetch.sh
index 8c05c7715b..b160f8b7fb 100755
--- a/t/t5502-quickfetch.sh
+++ b/t/t5502-quickfetch.sh
@@ -130,7 +130,7 @@ test_expect_success 'quickfetch should handle ~1000 refs (on Windows)' '
 	for i in 0 1 2 3 4 5 6 7 8 9; do
 		for j in 0 1 2 3 4 5 6 7 8 9; do
 			for k in 0 1 2 3 4 5 6 7 8 9; do
-				echo "$branchprefix$i$j$k" >> .git/packed-refs
+				echo "$branchprefix$i$j$k" >> .git/packed-refs || return 1
 			done
 		done
 	done &&
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 6e5a9c20e7..b0b795aca9 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -292,7 +292,7 @@ test_expect_success 'push with receive.fsck.missingEmail=warn' '
 		receive.fsck.missingEmail warn &&
 	git push --porcelain dst bogus >act 2>&1 &&
 	grep "missingEmail" act &&
-	test_i18ngrep "Skipping unknown msg id.*whatever" act &&
+	test_i18ngrep "skipping unknown msg id.*whatever" act &&
 	git --git-dir=dst/.git branch -D bogus &&
 	git --git-dir=dst/.git config --add \
 		receive.fsck.missingEmail ignore &&
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index e6e3c8f552..9ab315424c 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -2,9 +2,6 @@
 
 test_description='git remote porcelain-ish'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 
 setup_repository () {
@@ -1332,7 +1329,6 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
 	(
 		cd test &&
 		git tag -a -m "Some tag" some-tag main &&
-		exit_with=true &&
 		for type in commit tag tree blob
 		do
 			if test "$type" = "blob"
@@ -1348,9 +1344,8 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
 				push origin $oid:dst 2>err &&
 			test_i18ngrep "error: The destination you" err &&
 			test_i18ngrep ! "hint: Did you mean" err ||
-			exit_with=false
-		done &&
-		$exit_with
+			exit 1
+		done
 	)
 '
 
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a0faf0dd94..20f7110ec1 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -5,9 +5,6 @@ test_description='Per branch config variables affects "git fetch".
 
 '
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-bundle.sh
 
@@ -40,11 +37,11 @@ test_expect_success "clone and setup child repos" '
 		git config branch.main.remote two &&
 		git config branch.main.merge refs/heads/one &&
 		mkdir -p .git/remotes &&
-		{
-			echo "URL: ../two/.git/"
-			echo "Pull: refs/heads/main:refs/heads/two"
-			echo "Pull: refs/heads/one:refs/heads/one"
-		} >.git/remotes/two
+		cat >.git/remotes/two <<-\EOF
+		URL: ../two/.git/
+		Pull: refs/heads/main:refs/heads/two
+		Pull: refs/heads/one:refs/heads/one
+		EOF
 	) &&
 	git clone . bundle &&
 	git clone . seven
@@ -71,7 +68,7 @@ test_expect_success "fetch test for-merge" '
 	main_in_two=$(cd ../two && git rev-parse main) &&
 	one_in_two=$(cd ../two && git rev-parse one) &&
 	{
-		echo "$one_in_two	"
+		echo "$one_in_two	" &&
 		echo "$main_in_two	not-for-merge"
 	} >expected &&
 	cut -f -2 .git/FETCH_HEAD >actual &&
@@ -550,7 +547,7 @@ test_expect_success 'bundle should record HEAD correctly' '
 	git bundle list-heads bundle5 >actual &&
 	for h in HEAD refs/heads/main
 	do
-		echo "$(git rev-parse --verify $h) $h"
+		echo "$(git rev-parse --verify $h) $h" || return 1
 	done >expect &&
 	test_cmp expect actual
 
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 50f14101c5..320d26796d 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -105,19 +105,19 @@ test_expect_success setup '
 	remotes="$remotes config-glob" &&
 
 	mkdir -p .git/remotes &&
-	{
-		echo "URL: ../.git/"
-		echo "Pull: refs/heads/main:remotes/rem/main"
-		echo "Pull: refs/heads/one:remotes/rem/one"
-		echo "Pull: two:remotes/rem/two"
-		echo "Pull: refs/heads/three:remotes/rem/three"
-	} >.git/remotes/remote-explicit &&
+	cat >.git/remotes/remote-explicit <<-\EOF &&
+	URL: ../.git/
+	Pull: refs/heads/main:remotes/rem/main
+	Pull: refs/heads/one:remotes/rem/one
+	Pull: two:remotes/rem/two
+	Pull: refs/heads/three:remotes/rem/three
+	EOF
 	remotes="$remotes remote-explicit" &&
 
-	{
-		echo "URL: ../.git/"
-		echo "Pull: refs/heads/*:refs/remotes/rem/*"
-	} >.git/remotes/remote-glob &&
+	cat >.git/remotes/remote-glob <<-\EOF &&
+	URL: ../.git/
+	Pull: refs/heads/*:refs/remotes/rem/*
+	EOF
 	remotes="$remotes remote-glob" &&
 
 	mkdir -p .git/branches &&
@@ -133,7 +133,7 @@ test_expect_success setup '
 		git config branch.br-$remote-merge.merge refs/heads/three &&
 		git config branch.br-$remote-octopus.remote $remote &&
 		git config branch.br-$remote-octopus.merge refs/heads/one &&
-		git config --add branch.br-$remote-octopus.merge two
+		git config --add branch.br-$remote-octopus.merge two || return 1
 	done &&
 	build_script sed_script
 '
@@ -191,17 +191,17 @@ do
 		cp "$expect_r" expect_r &&
 		convert_expected expect_r sed_script &&
 		{
-			echo "# $cmd"
-			set x $cmd; shift
-			git symbolic-ref HEAD refs/heads/$1 ; shift
-			rm -f .git/FETCH_HEAD
+			echo "# $cmd" &&
+			set x $cmd && shift &&
+			git symbolic-ref HEAD refs/heads/$1 && shift &&
+			rm -f .git/FETCH_HEAD &&
 			git for-each-ref \
 				refs/heads refs/remotes/rem refs/tags |
 			while read val type refname
 			do
-				git update-ref -d "$refname" "$val"
-			done
-			git fetch "$@" >/dev/null
+				git update-ref -d "$refname" "$val" || return 1
+			done &&
+			git fetch "$@" >/dev/null &&
 			cat .git/FETCH_HEAD
 		} >"$actual_f" &&
 		git show-ref >"$actual_r" &&
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 8212ca56dc..2f04cf9a1c 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -541,6 +541,15 @@ do
 
 done
 
+test_expect_success "push to remote with no explicit refspec and config remote.*.push = src:dest" '
+	mk_test testrepo heads/main &&
+	git checkout $the_first_commit &&
+	test_config remote.there.url testrepo &&
+	test_config remote.there.push refs/heads/main:refs/heads/main &&
+	git push there &&
+	check_push_result testrepo $the_commit heads/main
+'
+
 test_expect_success 'push with remote.pushdefault' '
 	mk_test up_repo heads/main &&
 	mk_test down_repo heads/main &&
@@ -1316,10 +1325,7 @@ test_expect_success 'fetch follows tags by default' '
 		git pull ../testrepo main &&
 		git tag -m "annotated" tag &&
 		git for-each-ref >tmp1 &&
-		(
-			cat tmp1
-			sed -n "s|refs/heads/main$|refs/remotes/origin/main|p" tmp1
-		) |
+		sed -n "p; s|refs/heads/main$|refs/remotes/origin/main|p" tmp1 |
 		sort -k 3 >../expect
 	) &&
 	git init dst &&
@@ -1769,6 +1775,38 @@ test_expect_success 'denyCurrentBranch and worktrees' '
 	test_must_fail git -C cloned push origin HEAD:new-wt &&
 	test_config receive.denyCurrentBranch updateInstead &&
 	git -C cloned push origin HEAD:new-wt &&
+	test_path_exists new-wt/first.t &&
 	test_must_fail git -C cloned push --delete origin new-wt
 '
+
+test_expect_success 'denyCurrentBranch and bare repository worktrees' '
+	test_when_finished "rm -fr bare.git" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add wt &&
+	test_commit grape &&
+	git -C bare.git config receive.denyCurrentBranch refuse &&
+	test_must_fail git push bare.git HEAD:wt &&
+	git -C bare.git config receive.denyCurrentBranch updateInstead &&
+	git push bare.git HEAD:wt &&
+	test_path_exists bare.git/wt/grape.t &&
+	test_must_fail git push --delete bare.git wt
+'
+
+test_expect_success 'refuse fetch to current branch of worktree' '
+	test_when_finished "git worktree remove --force wt && git branch -D wt" &&
+	git worktree add wt &&
+	test_commit apple &&
+	test_must_fail git fetch . HEAD:wt &&
+	git fetch -u . HEAD:wt
+'
+
+test_expect_success 'refuse fetch to current branch of bare repository worktree' '
+	test_when_finished "rm -fr bare.git" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add wt &&
+	test_commit banana &&
+	test_must_fail git -C bare.git fetch .. HEAD:wt &&
+	git -C bare.git fetch -u .. HEAD:wt
+'
+
 test_done
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 2dc75b80db..840c89cc8b 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -3,9 +3,6 @@
 
 test_description='Recursive "git fetch" for submodules'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=1
 export GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB
 
diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh
index 8b68bb38a4..b0dbacf0b9 100755
--- a/t/t5540-http-push-webdav.sh
+++ b/t/t5540-http-push-webdav.sh
@@ -18,6 +18,12 @@ then
 	test_done
 fi
 
+if test_have_prereq !REFFILES
+then
+	skip_all='skipping test; dumb HTTP protocol not supported with reftable.'
+	test_done
+fi
+
 LIB_HTTPD_DAV=t
 . "$TEST_DIRECTORY"/lib-httpd.sh
 ROOT_PATH="$PWD"
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 6d9142afc3..259203926a 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -5,6 +5,13 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
+
+if test_have_prereq !REFFILES
+then
+	skip_all='skipping test; dumb HTTP protocol not supported with reftable.'
+	test_done
+fi
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index 7b9fb4ff02..165427d57e 100755
--- a/t/t5552-skipping-fetch-negotiator.sh
+++ b/t/t5552-skipping-fetch-negotiator.sh
@@ -48,7 +48,7 @@ test_expect_success 'commits with no parents are sent regardless of skip distanc
 	git init client &&
 	for i in $(test_seq 7)
 	do
-		test_commit -C client c$i
+		test_commit -C client c$i || return 1
 	done &&
 
 	# We send: "c7" (skip 1) "c5" (skip 2) "c2" (skip 4). After that, since
@@ -68,7 +68,7 @@ test_expect_success 'when two skips collide, favor the larger one' '
 	git init client &&
 	for i in $(test_seq 11)
 	do
-		test_commit -C client c$i
+		test_commit -C client c$i || return 1
 	done &&
 	git -C client checkout c5 &&
 	test_commit -C client c5side &&
@@ -155,14 +155,14 @@ test_expect_success 'do not send "have" with ancestors of commits that server AC
 	for i in $(test_seq 8)
 	do
 		git -C client checkout --orphan b$i &&
-		test_commit -C client b$i.c0
+		test_commit -C client b$i.c0 || return 1
 	done &&
 	for j in $(test_seq 19)
 	do
 		for i in $(test_seq 8)
 		do
 			git -C client checkout b$i &&
-			test_commit -C client b$i.c$j
+			test_commit -C client b$i.c$j || return 1
 		done
 	done &&
 
@@ -201,7 +201,7 @@ test_expect_success 'do not send "have" with ancestors of commits that server AC
 	# should still send the others (in this test, just check b2).
 	for i in $(test_seq 0 8)
 	do
-		have_not_sent b1.c$i
+		have_not_sent b1.c$i || return 1
 	done &&
 	have_sent b2.c1 b2.c0
 '
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
index 9c12c0f8c3..48050162c2 100755
--- a/t/t5553-set-upstream.sh
+++ b/t/t5553-set-upstream.sh
@@ -91,6 +91,17 @@ test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
 	check_config_missing other2
 '
 
+test_expect_success 'fetch --set-upstream with a detached HEAD' '
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	cat >expect <<-\EOF &&
+	warning: could not set upstream of HEAD to '"'"'main'"'"' from '"'"'upstream'"'"' when it does not point to any branch.
+	EOF
+	git fetch --set-upstream upstream main 2>actual.raw &&
+	grep ^warning: actual.raw >actual &&
+	test_cmp expect actual
+'
+
 # tests for pull --set-upstream
 
 test_expect_success 'setup bare parent pull' '
@@ -178,4 +189,15 @@ test_expect_success 'pull --set-upstream with valid URL and branch sets branch'
 	check_config_missing other2
 '
 
+test_expect_success 'pull --set-upstream with a detached HEAD' '
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	cat >expect <<-\EOF &&
+	warning: could not set upstream of HEAD to '"'"'main'"'"' from '"'"'upstream'"'"' when it does not point to any branch.
+	EOF
+	git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
+	grep ^warning: actual.raw >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5555-http-smart-common.sh b/t/t5555-http-smart-common.sh
index 49faf5e283..b1cfe8b7db 100755
--- a/t/t5555-http-smart-common.sh
+++ b/t/t5555-http-smart-common.sh
@@ -2,6 +2,7 @@
 
 test_description='test functionality common to smart fetch & push'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index 05a58069b0..b68ec22d3f 100755
--- a/t/t5562-http-backend-content-length.sh
+++ b/t/t5562-http-backend-content-length.sh
@@ -63,7 +63,7 @@ test_expect_success 'setup' '
 	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
 	{
 		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
-			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw
+			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
 		printf 0000 &&
 		echo "$hash_next" | git pack-objects --stdout
 	} >push_body &&
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index b87ca06a58..1131503b76 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -194,7 +194,7 @@ test_expect_success 'hostname cannot break out of directory' '
 
 test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
 	{
-		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw
+		printf "git-upload-pack /interp.git\n\0host=localhost" | packetize_raw &&
 		printf "0000"
 	} >input &&
 	fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh
index ad8d5804f7..660f876eec 100755
--- a/t/t5571-pre-push-hook.sh
+++ b/t/t5571-pre-push-hook.sh
@@ -114,11 +114,11 @@ test_expect_success 'push to URL' '
 
 test_expect_success 'set up many-ref tests' '
 	{
-		nr=1000
+		nr=1000 &&
 		while test $nr -lt 2000
 		do
-			nr=$(( $nr + 1 ))
-			echo "create refs/heads/b/$nr $COMMIT3"
+			nr=$(( $nr + 1 )) &&
+			echo "create refs/heads/b/$nr $COMMIT3" || return 1
 		done
 	} | git update-ref --stdin
 '
diff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh
index cbcceab9d5..56329aa160 100755
--- a/t/t5602-clone-remote-exec.sh
+++ b/t/t5602-clone-remote-exec.sh
@@ -2,6 +2,7 @@
 
 test_description=clone
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
diff --git a/t/t5603-clone-dirname.sh b/t/t5603-clone-dirname.sh
index 13b5e5eb9b..8ca1f09423 100755
--- a/t/t5603-clone-dirname.sh
+++ b/t/t5603-clone-dirname.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='check output directory names used by git-clone'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # we use a fake ssh wrapper that ignores the arguments
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index d822153e4d..8f676d6b0c 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -46,7 +46,7 @@ test_expect_success 'disallows --bare with --origin' '
 
 	test_must_fail git clone -o foo --bare parent clone-bare-o 2>err &&
 	test_debug "cat err" &&
-	test_i18ngrep -e "--bare and --origin foo options are incompatible" err
+	test_i18ngrep -e "options .--bare. and .--origin foo. cannot be used together" err
 
 '
 
@@ -54,7 +54,7 @@ test_expect_success 'disallows --bare with --separate-git-dir' '
 
 	test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
 	test_debug "cat err" &&
-	test_i18ngrep -e "--bare and --separate-git-dir are incompatible" err
+	test_i18ngrep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
 
 '
 
diff --git a/t/t5609-clone-branch.sh b/t/t5609-clone-branch.sh
index f86a674a03..252e1f7c20 100755
--- a/t/t5609-clone-branch.sh
+++ b/t/t5609-clone-branch.sh
@@ -4,6 +4,7 @@ test_description='clone --branch option'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 check_HEAD() {
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index f8625f9158..4b3877216e 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -17,7 +17,7 @@ test_expect_success 'clone -c sets config in cloned repo' '
 test_expect_success 'clone -c can set multi-keys' '
 	rm -rf child &&
 	git clone -c core.foo=bar -c core.foo=baz . child &&
-	{ echo bar; echo baz; } >expect &&
+	test_write_lines bar baz >expect &&
 	git --git-dir=child/.git config --get-all core.foo >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index cf3e82bdf5..34469b6ac1 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -16,10 +16,10 @@ test_expect_success 'setup normal src repo' '
 	git init src &&
 	for n in 1 2 3 4
 	do
-		echo "This is file: $n" > src/file.$n.txt
-		git -C src add file.$n.txt
-		git -C src commit -m "file $n"
-		git -C src ls-files -s file.$n.txt >>temp
+		echo "This is file: $n" > src/file.$n.txt &&
+		git -C src add file.$n.txt &&
+		git -C src commit -m "file $n" &&
+		git -C src ls-files -s file.$n.txt >>temp || return 1
 	done &&
 	awk -f print_2.awk <temp | sort >expect_1.oids &&
 	test_line_count = 4 expect_1.oids
@@ -72,9 +72,9 @@ test_expect_success 'push new commits to server' '
 	git -C src remote add srv "file://$(pwd)/srv.bare" &&
 	for x in a b c d e
 	do
-		echo "Mod file.1.txt $x" >>src/file.1.txt
-		git -C src add file.1.txt
-		git -C src commit -m "mod $x"
+		echo "Mod file.1.txt $x" >>src/file.1.txt &&
+		git -C src add file.1.txt &&
+		git -C src commit -m "mod $x" || return 1
 	done &&
 	git -C src blame main -- file.1.txt >expect.blame &&
 	git -C src push -u srv main
@@ -114,9 +114,9 @@ test_expect_success 'verify blame causes dynamic object fetch' '
 test_expect_success 'push new commits to server for file.2.txt' '
 	for x in a b c d e f
 	do
-		echo "Mod file.2.txt $x" >>src/file.2.txt
-		git -C src add file.2.txt
-		git -C src commit -m "mod $x"
+		echo "Mod file.2.txt $x" >>src/file.2.txt &&
+		git -C src add file.2.txt &&
+		git -C src commit -m "mod $x" || return 1
 	done &&
 	git -C src push -u srv main
 '
@@ -135,9 +135,9 @@ test_expect_success 'override inherited filter-spec using --no-filter' '
 test_expect_success 'push new commits to server for file.3.txt' '
 	for x in a b c d e f
 	do
-		echo "Mod file.3.txt $x" >>src/file.3.txt
-		git -C src add file.3.txt
-		git -C src commit -m "mod $x"
+		echo "Mod file.3.txt $x" >>src/file.3.txt &&
+		git -C src add file.3.txt &&
+		git -C src commit -m "mod $x" || return 1
 	done &&
 	git -C src push -u srv main
 '
@@ -385,7 +385,7 @@ setup_triangle () {
 	for i in $(test_seq 1 100)
 	do
 		echo "make the tree big" >server/file$i &&
-		git -C server add file$i
+		git -C server add file$i || return 1
 	done &&
 	git -C server commit -m "initial" &&
 	git clone --bare --filter=tree:0 "file://$(pwd)/server" client &&
@@ -669,7 +669,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 	for i in $(test_seq 10)
 	do
 		echo "this is a line" >>"$SERVER/foo.txt" &&
-		echo "this is another line" >>"$SERVER/have.txt"
+		echo "this is another line" >>"$SERVER/have.txt" || return 1
 	done &&
 	git -C "$SERVER" add foo.txt have.txt &&
 	git -C "$SERVER" commit -m bar &&
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index aa1827d841..1896f671cb 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -5,6 +5,7 @@ test_description='test protocol v2 server commands'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'test capability advertisement' '
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index d527cf6c49..710f33e2aa 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -747,7 +747,7 @@ test_expect_success 'clone big repository with http:// using protocol v2' '
 		echo "data 0" &&
 		echo "M 644 inline bla.txt" &&
 		echo "data 4" &&
-		echo "bla"
+		echo "bla" || return 1
 	done | git -C "$HTTPD_DOCUMENT_ROOT_PATH/big" fast-import &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git \
@@ -942,7 +942,7 @@ test_expect_success 'part of packfile response provided as URI' '
 			then
 				>h2found
 			fi
-		fi
+		fi || return 1
 	done &&
 	test -f hfound &&
 	test -f h2found &&
@@ -1107,6 +1107,57 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodul
 	test_i18ngrep "disallowed submodule name" err
 '
 
+test_expect_success 'packfile-uri path redacted in trace' '
+	P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+	rm -rf "$P" http_child log &&
+
+	git init "$P" &&
+	git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+	echo my-blob >"$P/my-blob" &&
+	git -C "$P" add my-blob &&
+	git -C "$P" commit -m x &&
+
+	git -C "$P" hash-object my-blob >objh &&
+	git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+	git -C "$P" config --add \
+		"uploadpack.blobpackfileuri" \
+		"$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+
+	GIT_TRACE_PACKET="$(pwd)/log" \
+	git -c protocol.version=2 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+	grep -F "clone< \\1$(cat packh) $HTTPD_URL/<redacted>" log
+'
+
+test_expect_success 'packfile-uri path not redacted in trace when GIT_TRACE_REDACT=0' '
+	P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+	rm -rf "$P" http_child log &&
+
+	git init "$P" &&
+	git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+	echo my-blob >"$P/my-blob" &&
+	git -C "$P" add my-blob &&
+	git -C "$P" commit -m x &&
+
+	git -C "$P" hash-object my-blob >objh &&
+	git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+	git -C "$P" config --add \
+		"uploadpack.blobpackfileuri" \
+		"$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+
+	GIT_TRACE_PACKET="$(pwd)/log" \
+	GIT_TRACE_REDACT=0 \
+	git -c protocol.version=2 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+	grep -F "clone< \\1$(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" log
+'
+
 test_expect_success 'http:// --negotiate-only' '
 	SERVER="$HTTPD_DOCUMENT_ROOT_PATH/server" &&
 	URI="$HTTPD_URL/smart/server" &&
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 220098523a..9d6cd7d986 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -2,9 +2,6 @@
 
 test_description='upload-pack ref-in-want'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 
 get_actual_refs () {
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
index bc393d7c31..ae1a00afb0 100755
--- a/t/t5704-protocol-violations.sh
+++ b/t/t5704-protocol-violations.sh
@@ -4,6 +4,8 @@ test_description='Test responses to violations of the network protocol. In most
 of these cases it will generally be acceptable for one side to break off
 communications if the other side says something unexpected. We are mostly
 making sure that we do not segfault or otherwise behave badly.'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'extra delim packet in v2 ls-refs args' '
diff --git a/t/t5705-session-id-in-capabilities.sh b/t/t5705-session-id-in-capabilities.sh
index eb8c79aafd..ed38c76c29 100755
--- a/t/t5705-session-id-in-capabilities.sh
+++ b/t/t5705-session-id-in-capabilities.sh
@@ -32,7 +32,6 @@ do
 		test_when_finished "git -C local push --delete origin new-branch" &&
 		cp -r "$LOCAL_PRISTINE" local &&
 		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT_NESTING=5 \
 		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 		git -c protocol.version=$PROTO -C local push \
 			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
@@ -65,7 +64,6 @@ do
 		test_when_finished "git -C local push --delete origin new-branch" &&
 		cp -r "$LOCAL_PRISTINE" local &&
 		git -C local pull --no-rebase origin &&
-		GIT_TRACE2_EVENT_NESTING=5 \
 		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 		git -c protocol.version=$PROTO -C local push \
 			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
diff --git a/t/t6005-rev-list-count.sh b/t/t6005-rev-list-count.sh
index 0b64822bf6..86542c650e 100755
--- a/t/t6005-rev-list-count.sh
+++ b/t/t6005-rev-list-count.sh
@@ -2,13 +2,14 @@
 
 test_description='git rev-list --max-count and --skip test'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-    for n in 1 2 3 4 5 ; do \
-        echo $n > a ; \
-        git add a ; \
-        git commit -m "$n" ; \
+    for n in 1 2 3 4 5 ; do
+	echo $n > a &&
+	git add a &&
+	git commit -m "$n" || return 1
     done
 '
 
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index 63fa7c8313..5a67bbc760 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -124,7 +124,7 @@ test_expect_success 'dodecapus' '
 		git checkout -b root$i five &&
 		test_commit $i &&
 		roots="$roots root$i" ||
-		return
+		return 1
 	done &&
 	git checkout main &&
 	test_tick &&
@@ -142,8 +142,8 @@ test_expect_success 'ancestors with the same commit time' '
 
 	test_tick_keep=$test_tick &&
 	for i in 1 2 3 4 5 6 7 8; do
-		test_tick=$test_tick_keep
-		test_commit t$i
+		test_tick=$test_tick_keep &&
+		test_commit t$i || return 1
 	done &&
 	git rev-list t1^! --not t$i >result &&
 	test_must_be_empty result
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 20adbece65..af57a04b7f 100755
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -51,7 +51,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'rev-list D..M' '
-	for c in E F G H I J K L M; do echo $c; done >expect &&
+	test_write_lines E F G H I J K L M >expect &&
 	git rev-list --format=%s D..M |
 	sed -e "/^commit /d" |
 	sort >actual &&
@@ -59,7 +59,7 @@ test_expect_success 'rev-list D..M' '
 '
 
 test_expect_success 'rev-list --ancestry-path D..M' '
-	for c in E F H I J L M; do echo $c; done >expect &&
+	test_write_lines E F H I J L M >expect &&
 	git rev-list --ancestry-path --format=%s D..M |
 	sed -e "/^commit /d" |
 	sort >actual &&
@@ -81,7 +81,7 @@ test_expect_success 'rev-list --ancestry-path D..M -- M.t' '
 '
 
 test_expect_success 'rev-list F...I' '
-	for c in F G H I; do echo $c; done >expect &&
+	test_write_lines F G H I >expect &&
 	git rev-list --format=%s F...I |
 	sed -e "/^commit /d" |
 	sort >actual &&
@@ -89,7 +89,7 @@ test_expect_success 'rev-list F...I' '
 '
 
 test_expect_success 'rev-list --ancestry-path F...I' '
-	for c in F H I; do echo $c; done >expect &&
+	test_write_lines F H I >expect &&
 	git rev-list --ancestry-path --format=%s F...I |
 	sed -e "/^commit /d" |
 	sort >actual &&
@@ -111,7 +111,7 @@ test_expect_success 'rev-list --ancestry-path G..M -- G.t' '
 '
 
 test_expect_success 'rev-list --ancestry-path --simplify-merges G^..M -- G.t' '
-	for c in G L; do echo $c; done >expect &&
+	test_write_lines G L >expect &&
 	git rev-list --ancestry-path --simplify-merges --format=%s G^..M -- G.t |
 	sed -e "/^commit /d" |
 	sort >actual &&
diff --git a/t/t6060-merge-index.sh b/t/t6060-merge-index.sh
index ddf34f0115..ed449abe55 100755
--- a/t/t6060-merge-index.sh
+++ b/t/t6060-merge-index.sh
@@ -4,9 +4,7 @@ test_description='basic git merge-index / git-merge-one-file tests'
 . ./test-lib.sh
 
 test_expect_success 'setup diverging branches' '
-	for i in 1 2 3 4 5 6 7 8 9 10; do
-		echo $i
-	done >file &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
 	git add file &&
 	git commit -m base &&
 	git tag base &&
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 78b5851780..c571fa5179 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup' '
 		test_tick &&
 		git commit --allow-empty -m "$i" &&
 		commit=$(git rev-parse --verify HEAD) &&
-		printf "$commit " >>.git/info/grafts
+		printf "$commit " >>.git/info/grafts || return 1
 	done
 '
 
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 52cde097dd..6f0902b863 100755
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -2,6 +2,7 @@
 
 test_description='git rev-list should handle unexpected object types'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup well-formed objects' '
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index 4ade105db3..8d9d6604f0 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -16,9 +16,9 @@ test_expect_success 'setup r1' '
 	git init r1 &&
 	for n in 1 2 3 4 5
 	do
-		echo "This is file: $n" > r1/file.$n
-		git -C r1 add file.$n
-		git -C r1 commit -m "$n"
+		echo "This is file: $n" > r1/file.$n &&
+		git -C r1 add file.$n &&
+		git -C r1 commit -m "$n" || return 1
 	done
 '
 
@@ -73,9 +73,9 @@ test_expect_success 'setup r2' '
 	git init r2 &&
 	for n in 1000 10000
 	do
-		printf "%"$n"s" X > r2/large.$n
-		git -C r2 add large.$n
-		git -C r2 commit -m "$n"
+		printf "%"$n"s" X > r2/large.$n &&
+		git -C r2 add large.$n &&
+		git -C r2 commit -m "$n" || return 1
 	done
 '
 
@@ -245,10 +245,10 @@ test_expect_success 'setup r3' '
 	mkdir r3/dir1 &&
 	for n in sparse1 sparse2
 	do
-		echo "This is file: $n" > r3/$n
-		git -C r3 add $n
-		echo "This is file: dir1/$n" > r3/dir1/$n
-		git -C r3 add dir1/$n
+		echo "This is file: $n" > r3/$n &&
+		git -C r3 add $n &&
+		echo "This is file: dir1/$n" > r3/dir1/$n &&
+		git -C r3 add dir1/$n || return 1
 	done &&
 	git -C r3 commit -m "sparse" &&
 	echo dir1/ >pattern1 &&
@@ -672,7 +672,7 @@ test_expect_success 'rev-list W/ --missing=print' '
 
 	for id in `cat expected | sed "s|..|&/|"`
 	do
-		rm r1/.git/objects/$id
+		rm r1/.git/objects/$id || return 1
 	done &&
 
 	git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index bae2419150..d8af2bb9d2 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -262,7 +262,7 @@ test_expect_success 'name-rev --all' '
 	>expect.unsorted &&
 	for rev in $(git rev-list --all)
 	do
-		git name-rev $rev >>expect.unsorted
+		git name-rev $rev >>expect.unsorted || return 1
 	done &&
 	sort <expect.unsorted >expect &&
 	git name-rev --all >actual.unsorted &&
@@ -275,7 +275,7 @@ test_expect_success 'name-rev --stdin' '
 	for rev in $(git rev-list --all)
 	do
 		name=$(git name-rev --name-only $rev) &&
-		echo "$rev ($name)" >>expect.unsorted
+		echo "$rev ($name)" >>expect.unsorted || return 1
 	done &&
 	sort <expect.unsorted >expect &&
 	git rev-list --all | git name-rev --stdin >actual.unsorted &&
@@ -390,9 +390,12 @@ test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
 committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 data <<EOF
 commit #$i
-EOF"
-		test $i = 1 && echo "from refs/heads/main^0"
-		i=$(($i + 1))
+EOF" &&
+		if test $i = 1
+		then
+			echo "from refs/heads/main^0"
+		fi &&
+		i=$(($i + 1)) || return 1
 	done | git fast-import &&
 	git checkout main &&
 	git tag far-far-away HEAD^ &&
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index 30328b87f0..8ff1d76f79 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -11,7 +11,7 @@ test_expect_success 'setup' '
 		fi &&
 		: >$p &&
 		git add $p &&
-		git commit -m $p
+		git commit -m $p || return 1
 	done &&
 	git log --oneline --format=%s >actual &&
 	cat <<EOF >expect &&
diff --git a/t/t6136-pathspec-in-bare.sh b/t/t6136-pathspec-in-bare.sh
index b117251366..ae8b5379e2 100755
--- a/t/t6136-pathspec-in-bare.sh
+++ b/t/t6136-pathspec-in-bare.sh
@@ -2,6 +2,7 @@
 
 test_description='diagnosing out-of-scope pathspec'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup a bare and non-bare repository' '
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 06c5fb5615..5a221f8ef1 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -91,6 +91,26 @@ test_expect_success GPGSSH 'created ssh signed commit and tag' '
 	git tag -s -u"${GPGSSH_KEY_UNTRUSTED}" -m signed-ssh-tag-msg-untrusted signed-untrusted-ssh-tag left
 '
 
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed tags with keys having defined lifetimes' '
+	test_when_finished "test_unconfig commit.gpgsign" &&
+	test_config gpg.format ssh &&
+	git checkout -b signed-expiry-ssh &&
+	touch file &&
+	git add file &&
+
+	echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+	git tag -s -u "${GPGSSH_KEY_EXPIRED}" -m expired-signed expired-signed &&
+
+	echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+	git tag -s -u "${GPGSSH_KEY_NOTYETVALID}" -m notyetvalid-signed notyetvalid-signed &&
+
+	echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+	git tag -s -u "${GPGSSH_KEY_TIMEBOXEDVALID}" -m timeboxedvalid-signed timeboxedvalid-signed &&
+
+	echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+	git tag -s -u "${GPGSSH_KEY_TIMEBOXEDINVALID}" -m timeboxedinvalid-signed timeboxedinvalid-signed
+'
+
 test_expect_success 'message for merging local branch' '
 	echo "Merge branch ${apos}left${apos}" >expected &&
 
@@ -104,8 +124,9 @@ test_expect_success 'message for merging local branch' '
 test_expect_success GPG 'message for merging local tag signed by good key' '
 	git checkout main &&
 	git fetch . signed-good-tag &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+	grep "^signed-tag-msg" actual &&
 	grep "^# gpg: Signature made" actual &&
 	grep "^# gpg: Good signature from" actual
 '
@@ -113,8 +134,9 @@ test_expect_success GPG 'message for merging local tag signed by good key' '
 test_expect_success GPG 'message for merging local tag signed by unknown key' '
 	git checkout main &&
 	git fetch . signed-good-tag &&
-	GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+	GNUPGHOME=. git fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+	grep "^signed-tag-msg" actual &&
 	grep "^# gpg: Signature made" actual &&
 	grep -E "^# gpg: Can${apos}t check signature: (public key not found|No public key)" actual
 '
@@ -123,7 +145,9 @@ test_expect_success GPGSSH 'message for merging local tag signed by good ssh key
 	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
 	git checkout main &&
 	git fetch . signed-good-ssh-tag &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	grep "^Merge tag ${apos}signed-good-ssh-tag${apos}" actual &&
+	grep "^signed-ssh-tag-msg" actual &&
 	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
 	! grep "${GPGSSH_BAD_SIGNATURE}" actual
 '
@@ -132,11 +156,55 @@ test_expect_success GPGSSH 'message for merging local tag signed by unknown ssh
 	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
 	git checkout main &&
 	git fetch . signed-untrusted-ssh-tag &&
-	git fmt-merge-msg <.git/FETCH_HEAD >actual 2>&1 &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	grep "^Merge tag ${apos}signed-untrusted-ssh-tag${apos}" actual &&
+	grep "^signed-ssh-tag-msg-untrusted" actual &&
 	grep "${GPGSSH_GOOD_SIGNATURE_UNTRUSTED}" actual &&
 	! grep "${GPGSSH_BAD_SIGNATURE}" actual &&
 	grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
 '
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by expired ssh key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git checkout main &&
+	git fetch . expired-signed &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	grep "^Merge tag ${apos}expired-signed${apos}" actual &&
+	grep "^expired-signed" actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by not yet valid ssh key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git checkout main &&
+	git fetch . notyetvalid-signed &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	grep "^Merge tag ${apos}notyetvalid-signed${apos}" actual &&
+	grep "^notyetvalid-signed" actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by valid timeboxed ssh key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git checkout main &&
+	git fetch . timeboxedvalid-signed &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	grep "^Merge tag ${apos}timeboxedvalid-signed${apos}" actual &&
+	grep "^timeboxedvalid-signed" actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'message for merging local tag signed by invalid timeboxed ssh key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git checkout main &&
+	git fetch . timeboxedinvalid-signed &&
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	grep "^Merge tag ${apos}timeboxedinvalid-signed${apos}" actual &&
+	grep "^timeboxedinvalid-signed" actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
 test_expect_success 'message for merging external branch' '
 	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
@@ -519,7 +587,7 @@ test_expect_success 'merge-msg lots of commits' '
 		while test $i -gt 9
 		do
 			echo "  $i" &&
-			i=$(($i-1))
+			i=$(($i-1)) || return 1
 		done &&
 		echo "  ..."
 	} >expected &&
@@ -573,7 +641,35 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	test_cmp expected .git/MERGE_MSG
 '
 
+test_expect_success 'merge --into-name=<name>' '
+	test_when_finished "git checkout main" &&
+	git checkout -B side main &&
+	git commit --allow-empty -m "One step ahead" &&
+
+	git checkout --detach main &&
+	git merge --no-ff side &&
+	git show -s --format="%s" >full.0 &&
+	head -n1 full.0 >actual &&
+	# expect that HEAD is shown as-is
+	grep -e "Merge branch .side. into HEAD$" actual &&
+
+	git reset --hard main &&
+	git merge --no-ff --into-name=main side &&
+	git show -s --format="%s" >full.1 &&
+	head -n1 full.1 >actual &&
+	# expect that we pretend to be merging to main, that is suppressed
+	grep -e "Merge branch .side.$" actual &&
+
+	git checkout -b throwaway main &&
+	git merge --no-ff --into-name=main side &&
+	git show -s --format="%s" >full.2 &&
+	head -n1 full.2 >actual &&
+	# expect that we pretend to be merging to main, that is suppressed
+	grep -e "Merge branch .side.$" actual
+'
+
 test_expect_success 'merge.suppressDest configuration' '
+	test_when_finished "git checkout main" &&
 	git checkout -B side main &&
 	git commit --allow-empty -m "One step ahead" &&
 	git checkout main &&
@@ -590,7 +686,19 @@ test_expect_success 'merge.suppressDest configuration' '
 	git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
 	head -n1 full.3 >actual &&
 	grep -e "Merge branch .side." actual &&
-	! grep -e " into main$" actual
+	! grep -e " into main$" actual &&
+
+	git checkout --detach HEAD &&
+	git -c merge.suppressDest="main" fmt-merge-msg <.git/FETCH_HEAD >full.4 &&
+	head -n1 full.4 >actual &&
+	grep -e "Merge branch .side. into HEAD$" actual &&
+
+	git -c merge.suppressDest="main" fmt-merge-msg \
+		--into-name=main <.git/FETCH_HEAD >full.5 &&
+	head -n1 full.5 >actual &&
+	grep -e "Merge branch .side." actual &&
+	! grep -e " into main$" actual &&
+	! grep -e " into HEAD$" actual
 '
 
 test_done
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 80679d5e12..dcaab7265f 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -5,9 +5,6 @@
 
 test_description='for-each-ref test'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
@@ -419,6 +416,11 @@ test_expect_success 'Verify descending sort' '
 	test_cmp expected actual
 '
 
+test_expect_success 'Give help even with invalid sort atoms' '
+	test_expect_code 129 git for-each-ref --sort=bogus -h >actual 2>&1 &&
+	grep "^usage: git for-each-ref" actual
+'
+
 cat >expected <<\EOF
 refs/tags/testtag
 refs/tags/testtag-2
@@ -950,10 +952,7 @@ test_expect_success '%(raw) with --shell and --sort=raw must fail' '
 '
 
 test_expect_success '%(raw:size) with --shell' '
-	git for-each-ref --format="%(raw:size)" | while read line
-	do
-		echo "'\''$line'\''" >>expect
-	done &&
+	git for-each-ref --format="%(raw:size)" | sed "s/^/$SQ/;s/$/$SQ/" >expect &&
 	git for-each-ref --format="%(raw:size)" --shell >actual &&
 	test_cmp expect actual
 '
@@ -1019,6 +1018,27 @@ test_expect_success 'equivalent sorts fall back on refname' '
 	test_cmp expected actual
 '
 
+test_expect_success '--no-sort cancels the previous sort keys' '
+	cat >expected <<-\EOF &&
+	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
+	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
+	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
+	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
+	EOF
+	git for-each-ref \
+		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
+		--sort=-refname \
+		--sort=taggeremail \
+		--no-sort \
+		--sort=taggerdate \
+		"refs/tags/multi-*" >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
 	test_when_finished "git checkout main" &&
 	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
@@ -1315,7 +1335,7 @@ test_expect_success ':remotename and :remoteref' '
 			echo "${pair#*=}" >expect &&
 			git for-each-ref --format="${pair%=*}" \
 				refs/heads/main >actual &&
-			test_cmp expect actual
+			test_cmp expect actual || exit 1
 		done &&
 		git branch push-simple &&
 		git config branch.push-simple.pushRemote from &&
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 1537aa2179..1ce5f490e9 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -2,9 +2,6 @@
 
 test_description='test for-each-refs usage of ref-filter APIs'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
diff --git a/t/t6406-merge-attr.sh b/t/t6406-merge-attr.sh
index 8494645837..57e6af5eaa 100755
--- a/t/t6406-merge-attr.sh
+++ b/t/t6406-merge-attr.sh
@@ -62,10 +62,10 @@ test_expect_success setup '
 
 test_expect_success merge '
 
-	{
-		echo "binary -merge"
-		echo "union merge=union"
-	} >.gitattributes &&
+	cat >.gitattributes <<-\EOF &&
+	binary -merge
+	union merge=union
+	EOF
 
 	if git merge main
 	then
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh
index d4273f2575..8e6241f92e 100755
--- a/t/t6407-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -5,6 +5,7 @@ test_description='ask merge-recursive to merge binary files'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -47,7 +48,7 @@ test_expect_success resolve '
 		echo Oops, should not have succeeded
 		false
 	else
-		git ls-files -s >current
+		git ls-files -s >current &&
 		test_cmp expect current
 	fi
 '
@@ -62,7 +63,7 @@ test_expect_success recursive '
 		echo Oops, should not have succeeded
 		false
 	else
-		git ls-files -s >current
+		git ls-files -s >current &&
 		test_cmp expect current
 	fi
 '
diff --git a/t/t6409-merge-subtree.sh b/t/t6409-merge-subtree.sh
index ba7890ec52..e9ba6f1690 100755
--- a/t/t6409-merge-subtree.sh
+++ b/t/t6409-merge-subtree.sh
@@ -10,7 +10,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 test_expect_success setup '
 
 	s="1 2 3 4 5 6 7 8" &&
-	for i in $s; do echo $i; done >hello &&
+	test_write_lines $s >hello &&
 	git add hello &&
 	git commit -m initial &&
 	git checkout -b side &&
@@ -18,7 +18,7 @@ test_expect_success setup '
 	git add hello &&
 	git commit -m second &&
 	git checkout main &&
-	for i in mundo $s; do echo $i; done >hello &&
+	test_write_lines mundo $s >hello &&
 	git add hello &&
 	git commit -m main
 
@@ -27,7 +27,7 @@ test_expect_success setup '
 test_expect_success 'subtree available and works like recursive' '
 
 	git merge -s subtree side &&
-	for i in mundo $s world; do echo $i; done >expect &&
+	test_write_lines mundo $s world >expect &&
 	test_cmp expect hello
 
 '
diff --git a/t/t6411-merge-filemode.sh b/t/t6411-merge-filemode.sh
index f54c915d6a..6ae2489286 100755
--- a/t/t6411-merge-filemode.sh
+++ b/t/t6411-merge-filemode.sh
@@ -51,10 +51,10 @@ test_expect_success 'set up mode change in both branches' '
 	: >file2 &&
 	git add file2 &&
 	git commit -m b2 &&
-	{
-		echo "100755 $H 2	file2"
-		echo "100644 $H 3	file2"
-	} >expect
+	cat >expect <<-EOF
+	100755 $H 2	file2
+	100644 $H 3	file2
+	EOF
 '
 
 do_both_modes () {
diff --git a/t/t6412-merge-large-rename.sh b/t/t6412-merge-large-rename.sh
index c50d315722..ca018d11f5 100755
--- a/t/t6412-merge-large-rename.sh
+++ b/t/t6412-merge-large-rename.sh
@@ -37,18 +37,18 @@ test_rename() {
 	test_might_fail git branch -D test$n &&
 	git reset --hard initial &&
 	for i in $(count $n); do
-		make_text $i initial initial >$i
+		make_text $i initial initial >$i || return 1
 	done &&
 	git add . &&
 	git commit -m add=$n &&
 	for i in $(count $n); do
-		make_text $i changed initial >$i
+		make_text $i changed initial >$i || return 1
 	done &&
 	git commit -a -m change=$n &&
 	git checkout -b test$n HEAD^ &&
 	for i in $(count $n); do
-		git rm $i
-		make_text $i initial changed >$i.moved
+		git rm $i &&
+		make_text $i initial changed >$i.moved || return 1
 	done &&
 	git add . &&
 	git commit -m change+rename=$n &&
@@ -79,7 +79,7 @@ test_expect_success 'setup large simple rename' '
 
 	git reset --hard initial &&
 	for i in $(count 200); do
-		make_text foo bar baz >$i
+		make_text foo bar baz >$i || return 1
 	done &&
 	git add . &&
 	git commit -m create-files &&
diff --git a/t/t6414-merge-rename-nocruft.sh b/t/t6414-merge-rename-nocruft.sh
index d7e3c1fa6e..69fc1c9e69 100755
--- a/t/t6414-merge-rename-nocruft.sh
+++ b/t/t6414-merge-rename-nocruft.sh
@@ -4,6 +4,7 @@ test_description='Merge-recursive merging renames'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t6416-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 84f5082366..690c8482b1 100755
--- a/t/t6416-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -24,14 +24,8 @@ test_expect_success 'setup basic criss-cross + rename with no modifications' '
 		cd basic-rename &&
 
 		ten="0 1 2 3 4 5 6 7 8 9" &&
-		for i in $ten
-		do
-			echo line $i in a sample file
-		done >one &&
-		for i in $ten
-		do
-			echo line $i in another sample file
-		done >two &&
+		printf "line %d in a sample file\n" $ten >one &&
+		printf "line %d in another sample file\n" $ten >two &&
 		git add one two &&
 		test_tick && git commit -m initial &&
 
@@ -96,14 +90,8 @@ test_expect_success 'setup criss-cross + rename merges with basic modification'
 		cd rename-modify &&
 
 		ten="0 1 2 3 4 5 6 7 8 9" &&
-		for i in $ten
-		do
-			echo line $i in a sample file
-		done >one &&
-		for i in $ten
-		do
-			echo line $i in another sample file
-		done >two &&
+		printf "line %d in a sample file\n" $ten >one &&
+		printf "line %d in another sample file\n" $ten >two &&
 		git add one two &&
 		test_tick && git commit -m initial &&
 
@@ -1588,10 +1576,7 @@ test_expect_success 'setup nested conflicts' '
 		cd nested_conflicts &&
 
 		# Create some related files now
-		for i in $(test_seq 1 10)
-		do
-			echo Random base content line $i
-		done >initial &&
+		printf "Random base content line %d\n" $(test_seq 1 10) >initial &&
 
 		cp initial b_L1 &&
 		cp initial b_R1 &&
@@ -1777,10 +1762,7 @@ test_expect_success 'setup virtual merge base with nested conflicts' '
 		cd virtual_merge_base_has_nested_conflicts &&
 
 		# Create some related files now
-		for i in $(test_seq 1 10)
-		do
-			echo Random base content line $i
-		done >content &&
+		printf "Random base content line %d\n" $(test_seq 1 10) >content &&
 
 		# Setup original commit
 		git add content &&
diff --git a/t/t6417-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh
index ec065d6a65..62d1406119 100755
--- a/t/t6417-merge-ours-theirs.sh
+++ b/t/t6417-merge-ours-theirs.sh
@@ -7,10 +7,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 . ./test-lib.sh
 
 test_expect_success setup '
-	for i in 1 2 3 4 5 6 7 8 9
-	do
-		echo "$i"
-	done >file &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
 	git add file &&
 	cp file elif &&
 	git commit -m initial &&
diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh
index 1e0296dd17..41288a60ce 100755
--- a/t/t6418-merge-text-auto.sh
+++ b/t/t6418-merge-text-auto.sh
@@ -204,4 +204,30 @@ test_expect_success 'Test delete/normalize conflict' '
 	test_path_is_missing file
 '
 
+test_expect_success 'rename/delete vs. renormalization' '
+	git init subrepo &&
+	(
+		cd subrepo &&
+		echo foo >oldfile &&
+		git add oldfile &&
+		git commit -m original &&
+
+		git branch rename &&
+		git branch nuke &&
+
+		git checkout rename &&
+		git mv oldfile newfile &&
+		git commit -m renamed &&
+
+		git checkout nuke &&
+		git rm oldfile &&
+		git commit -m deleted &&
+
+		git checkout rename^0 &&
+		test_must_fail git -c merge.renormalize=true merge nuke >out &&
+
+		grep "rename/delete" out
+	)
+'
+
 test_done
diff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh
index 25c4b720e7..a9ee4cb207 100755
--- a/t/t6427-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -211,4 +211,94 @@ test_expect_success 'rebase --apply describes fake ancestor base' '
 	)
 '
 
+test_setup_zdiff3 () {
+	test_create_repo zdiff3 &&
+	(
+		cd zdiff3 &&
+
+		test_write_lines 1 2 3 4 5 6 7 8 9 >basic &&
+		test_write_lines 1 2 3 AA 4 5 BB 6 7 8 >middle-common &&
+		test_write_lines 1 2 3 4 5 6 7 8 9 >interesting &&
+		test_write_lines 1 2 3 4 5 6 7 8 9 >evil &&
+
+		git add basic middle-common interesting evil &&
+		git commit -m base &&
+
+		git branch left &&
+		git branch right &&
+
+		git checkout left &&
+		test_write_lines 1 2 3 4 A B C D E 7 8 9 >basic &&
+		test_write_lines 1 2 3 CC 4 5 DD 6 7 8 >middle-common &&
+		test_write_lines 1 2 3 4 A B C D E F G H I J 7 8 9 >interesting &&
+		test_write_lines 1 2 3 4 X A B C 7 8 9 >evil &&
+		git add -u &&
+		git commit -m letters &&
+
+		git checkout right &&
+		test_write_lines 1 2 3 4 A X C Y E 7 8 9 >basic &&
+		test_write_lines 1 2 3 EE 4 5 FF 6 7 8 >middle-common &&
+		test_write_lines 1 2 3 4 A B C 5 6 G H I J 7 8 9 >interesting &&
+		test_write_lines 1 2 3 4 Y A B C B C 7 8 9 >evil &&
+		git add -u &&
+		git commit -m permuted
+	)
+}
+
+test_expect_success 'check zdiff3 markers' '
+	test_setup_zdiff3 &&
+	(
+		cd zdiff3 &&
+
+		git checkout left^0 &&
+
+		base=$(git rev-parse --short HEAD^1) &&
+		test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
+
+		test_write_lines 1 2 3 4 A \
+				 "<<<<<<< HEAD" B C D \
+				 "||||||| $base" 5 6 \
+				 ======= X C Y \
+				 ">>>>>>> right^0" \
+				 E 7 8 9 \
+				 >expect &&
+		test_cmp expect basic &&
+
+		test_write_lines 1 2 3 \
+				 "<<<<<<< HEAD" CC \
+				 "||||||| $base" AA \
+				 ======= EE \
+				 ">>>>>>> right^0" \
+				 4 5 \
+				 "<<<<<<< HEAD" DD \
+				 "||||||| $base" BB \
+				 ======= FF \
+				 ">>>>>>> right^0" \
+				 6 7 8 \
+				 >expect &&
+		test_cmp expect middle-common &&
+
+		test_write_lines 1 2 3 4 A B C \
+				 "<<<<<<< HEAD" D E F \
+				 "||||||| $base" 5 6 \
+				 ======= 5 6 \
+				 ">>>>>>> right^0" \
+				 G H I J 7 8 9 \
+				 >expect &&
+		test_cmp expect interesting &&
+
+		# Not passing this one yet; the common "B C" lines is still
+		# being left in the conflict blocks on the left and right
+		# sides.
+		test_write_lines 1 2 3 4 \
+				 "<<<<<<< HEAD" X A \
+				 "||||||| $base" 5 6 \
+				 ======= Y A B C \
+				 ">>>>>>> right^0" \
+				 B C 7 8 9 \
+				 >expect &&
+		test_cmp expect evil
+	)
+'
+
 test_done
diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index a0efe7cb6d..07067bb347 100755
--- a/t/t6430-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -706,7 +706,7 @@ test_expect_success 'merge-recursive remembers the names of all base trees' '
 	# more trees than static slots used by oid_to_hex()
 	for commit in $c0 $c2 $c4 $c5 $c6 $c7
 	do
-		git rev-parse "$commit^{tree}"
+		git rev-parse "$commit^{tree}" || return 1
 	done >trees &&
 
 	# ignore the return code; it only fails because the input is weird...
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index 3d7a62ddab..338a9c46a2 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -32,7 +32,7 @@ test_expect_success 'setup' '
 	do
 		test_commit "1-$i" &&
 		git branch -f commit-1-$i &&
-		git tag -a -m "1-$i" tag-1-$i commit-1-$i
+		git tag -a -m "1-$i" tag-1-$i commit-1-$i || return 1
 	done &&
 	for j in $(test_seq 1 9)
 	do
@@ -46,7 +46,7 @@ test_expect_success 'setup' '
 		do
 			git merge commit-$j-$i -m "$x-$i" &&
 			git branch -f commit-$x-$i &&
-			git tag -a -m "$x-$i" tag-$x-$i commit-$x-$i
+			git tag -a -m "$x-$i" tag-$x-$i commit-$x-$i || return 1
 		done
 	done &&
 	git commit-graph write --reachable &&
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 082be85dff..9aa1660651 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -94,10 +94,10 @@ test_expect_success 'creating a tag with --create-reflog should create reflog' '
 	git log -1 \
 		--format="format:tag: tagging %h (%s, %cd)%n" \
 		--date=format:%Y-%m-%d >expected &&
-	test_when_finished "git tag -d tag_with_reflog" &&
-	git tag --create-reflog tag_with_reflog &&
-	git reflog exists refs/tags/tag_with_reflog &&
-	sed -e "s/^.*	//" .git/logs/refs/tags/tag_with_reflog >actual &&
+	test_when_finished "git tag -d tag_with_reflog1" &&
+	git tag --create-reflog tag_with_reflog1 &&
+	git reflog exists refs/tags/tag_with_reflog1 &&
+	test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog1 | sed -e "s/^.*	//" >actual &&
 	test_cmp expected actual
 '
 
@@ -105,10 +105,10 @@ test_expect_success 'annotated tag with --create-reflog has correct message' '
 	git log -1 \
 		--format="format:tag: tagging %h (%s, %cd)%n" \
 		--date=format:%Y-%m-%d >expected &&
-	test_when_finished "git tag -d tag_with_reflog" &&
-	git tag -m "annotated tag" --create-reflog tag_with_reflog &&
-	git reflog exists refs/tags/tag_with_reflog &&
-	sed -e "s/^.*	//" .git/logs/refs/tags/tag_with_reflog >actual &&
+	test_when_finished "git tag -d tag_with_reflog2" &&
+	git tag -m "annotated tag" --create-reflog tag_with_reflog2 &&
+	git reflog exists refs/tags/tag_with_reflog2 &&
+	test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog2 | sed -e "s/^.*	//" >actual &&
 	test_cmp expected actual
 '
 
@@ -118,10 +118,10 @@ test_expect_success '--create-reflog does not create reflog on failure' '
 '
 
 test_expect_success 'option core.logAllRefUpdates=always creates reflog' '
-	test_when_finished "git tag -d tag_with_reflog" &&
+	test_when_finished "git tag -d tag_with_reflog3" &&
 	test_config core.logAllRefUpdates always &&
-	git tag tag_with_reflog &&
-	git reflog exists refs/tags/tag_with_reflog
+	git tag tag_with_reflog3 &&
+	git reflog exists refs/tags/tag_with_reflog3
 '
 
 test_expect_success 'listing all tags if one exists should succeed' '
@@ -1976,9 +1976,12 @@ test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a de
 committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 data <<EOF
 commit #$i
-EOF"
-		test $i = 1 && echo "from refs/heads/main^0"
-		i=$(($i + 1))
+EOF" &&
+		if test $i = 1
+		then
+			echo "from refs/heads/main^0"
+		fi &&
+		i=$(($i + 1)) || return 1
 	done | git fast-import &&
 	git checkout main &&
 	git tag far-far-away HEAD^ &&
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 0e7cf75435..e56ca5b0fa 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -661,6 +661,13 @@ test_expect_success 'setup trace2' '
 	export GIT_TRACE2_BRIEF
 '
 
+test_expect_success 'setup large log output' '
+	perl -e "
+		print \"this is a long commit message\" x 50000
+	" >commit-msg &&
+	git commit --allow-empty -F commit-msg
+'
+
 test_expect_success TTY 'git returns SIGPIPE on early pager exit' '
 	test_when_finished "rm pager-used trace.normal" &&
 	test_config core.pager ">pager-used; head -n 1; exit 0" &&
@@ -670,7 +677,7 @@ test_expect_success TTY 'git returns SIGPIPE on early pager exit' '
 
 	if test_have_prereq !MINGW
 	then
-		OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
 		test_match_signal 13 "$OUT"
 	else
 		test_terminal git log
@@ -691,7 +698,7 @@ test_expect_success TTY 'git returns SIGPIPE on early pager non-zero exit' '
 
 	if test_have_prereq !MINGW
 	then
-		OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
 		test_match_signal 13 "$OUT"
 	else
 		test_terminal git log
@@ -710,13 +717,7 @@ test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' '
 	export GIT_TRACE2 &&
 	test_when_finished "unset GIT_TRACE2" &&
 
-	if test_have_prereq !MINGW
-	then
-		OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
-		test "$OUT" -eq 0
-	else
-		test_terminal git log
-	fi &&
+	test_terminal git log &&
 
 	grep child_exit trace.normal >child-exits &&
 	test_line_count = 1 child-exits &&
@@ -724,41 +725,14 @@ test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' '
 	test_path_is_file pager-used
 '
 
-test_expect_success TTY 'git discards nonexisting pager without SIGPIPE' '
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager "wc >pager-used; does-not-exist" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
-
-	if test_have_prereq !MINGW
-	then
-		OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
-		test "$OUT" -eq 0
-	else
-		test_terminal git log
-	fi &&
-
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:127 " child-exits &&
-	test_path_is_file pager-used
-'
-
-test_expect_success TTY 'git attempts to page to nonexisting pager command, gets SIGPIPE' '
+test_expect_success TTY 'git skips paging nonexisting command' '
 	test_when_finished "rm trace.normal" &&
 	test_config core.pager "does-not-exist" &&
 	GIT_TRACE2="$(pwd)/trace.normal" &&
 	export GIT_TRACE2 &&
 	test_when_finished "unset GIT_TRACE2" &&
 
-	if test_have_prereq !MINGW
-	then
-		OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+	test_terminal git log &&
 
 	grep child_exit trace.normal >child-exits &&
 	test_line_count = 1 child-exits &&
@@ -767,14 +741,14 @@ test_expect_success TTY 'git attempts to page to nonexisting pager command, gets
 
 test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' '
 	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; test-tool sigchain" &&
+	test_config core.pager ">pager-used; exec test-tool sigchain" &&
 	GIT_TRACE2="$(pwd)/trace.normal" &&
 	export GIT_TRACE2 &&
 	test_when_finished "unset GIT_TRACE2" &&
 
 	if test_have_prereq !MINGW
 	then
-		OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
 		test_match_signal 13 "$OUT"
 	else
 		test_terminal git log
@@ -786,4 +760,9 @@ test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' '
 	test_path_is_file pager-used
 '
 
+test_expect_success TTY 'non-existent pager doesnt cause crash' '
+	test_config pager.show invalid-pager &&
+	test_terminal git show
+'
+
 test_done
diff --git a/t/t7010-setup.sh b/t/t7010-setup.sh
index 0335a9a158..520f96d09f 100755
--- a/t/t7010-setup.sh
+++ b/t/t7010-setup.sh
@@ -137,7 +137,7 @@ test_expect_success 'setup deeper work tree' '
 
 test_expect_success 'add a directory outside the work tree' '(
 	cd tester &&
-	d1="$(cd .. ; pwd)" &&
+	d1="$(cd .. && pwd)" &&
 	test_must_fail git add "$d1"
 )'
 
diff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh
index 06c9dd6c93..1cb36b9ab8 100755
--- a/t/t7031-verify-tag-signed-ssh.sh
+++ b/t/t7031-verify-tag-signed-ssh.sh
@@ -48,6 +48,23 @@ test_expect_success GPGSSH 'create signed tags ssh' '
 	git tag -u"${GPGSSH_KEY_UNTRUSTED}" -m eighth eighth-signed-alt
 '
 
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed tags with keys having defined lifetimes' '
+	test_when_finished "test_unconfig commit.gpgsign" &&
+	test_config gpg.format ssh &&
+
+	echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+	git tag -s -u "${GPGSSH_KEY_EXPIRED}" -m expired-signed expired-signed &&
+
+	echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+	git tag -s -u "${GPGSSH_KEY_NOTYETVALID}" -m notyetvalid-signed notyetvalid-signed &&
+
+	echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+	git tag -s -u "${GPGSSH_KEY_TIMEBOXEDVALID}" -m timeboxedvalid-signed timeboxedvalid-signed &&
+
+	echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+	git tag -s -u "${GPGSSH_KEY_TIMEBOXEDINVALID}" -m timeboxedinvalid-signed timeboxedinvalid-signed
+'
+
 test_expect_success GPGSSH 'verify and show ssh signatures' '
 	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
 	(
@@ -80,6 +97,31 @@ test_expect_success GPGSSH 'verify and show ssh signatures' '
 	)
 '
 
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag exits failure on expired signature key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-tag expired-signed 2>actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag exits failure on not yet valid signature key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-tag notyetvalid-signed 2>actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag succeeds with tag date and key validity matching' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git verify-tag timeboxedvalid-signed 2>actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-tag failes with tag date outside of key validity' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-tag timeboxedinvalid-signed 2>actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
 test_expect_success GPGSSH 'detect fudged ssh signature' '
 	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
 	git cat-file tag seventh-signed >raw &&
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index eeb0534163..20a0d2afc2 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -4,10 +4,6 @@ test_description='git status --porcelain=v2
 
 This test exercises porcelain V2 output for git status.'
 
-
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./test-lib.sh
 
 
@@ -113,6 +109,21 @@ test_expect_success 'after first commit, create unstaged changes' '
 	test_cmp expect actual
 '
 
+test_expect_success 'after first commit, stash existing changes' '
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	# stash 2
+	EOF
+
+	test_when_finished "git stash pop && git stash pop" &&
+
+	git stash -- file_x &&
+	git stash &&
+	git status --porcelain=v2 --branch --show-stash --untracked-files=no >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'after first commit but omit untracked files and branch' '
 	cat >expect <<-EOF &&
 	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index 5530651eea..638bb04e21 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='git reset should cull empty subdirs'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-diff-data.sh
 
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 601b2bf97f..d05426062e 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -472,6 +472,23 @@ test_expect_success '--mixed refreshes the index' '
 	test_cmp expect output
 '
 
+test_expect_success '--mixed preserves skip-worktree' '
+	echo 123 >>file2 &&
+	git add file2 &&
+	git update-index --skip-worktree file2 &&
+	git reset --mixed HEAD >output &&
+	test_must_be_empty output &&
+
+	cat >expect <<-\EOF &&
+	Unstaged changes after reset:
+	M	file2
+	EOF
+	git update-index --no-skip-worktree file2 &&
+	git add file2 &&
+	git reset --mixed HEAD >output &&
+	test_cmp expect output
+'
+
 test_expect_success 'resetting specific path that is unmerged' '
 	git rm --cached file2 &&
 	F1=$(git rev-parse HEAD:file1) &&
diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index afe36a533c..0de83e3619 100755
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='git reset in a bare repository'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup non-bare' '
diff --git a/t/t7107-reset-pathspec-file.sh b/t/t7107-reset-pathspec-file.sh
index 15ccb14f7e..523efbecde 100755
--- a/t/t7107-reset-pathspec-file.sh
+++ b/t/t7107-reset-pathspec-file.sh
@@ -160,13 +160,13 @@ test_expect_success 'error conditions' '
 	git rm fileA.t &&
 
 	test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
 
 	test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git reset --pathspec-file-nul 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
 	test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
 	test_i18ngrep -e "fatal: Cannot do soft reset with paths" err &&
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index a82a07a04a..3d62e10b53 100755
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -8,7 +8,7 @@ test_description='Tests for "git reset" with "--merge" and "--keep" options'
 . ./test-lib.sh
 
 test_expect_success setup '
-    for i in 1 2 3; do echo line $i; done >file1 &&
+    printf "line %d\n" 1 2 3 >file1 &&
     cat file1 >file2 &&
     git add file1 file2 &&
     test_tick &&
diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh
index 688fa995c9..a21781d68a 100755
--- a/t/t7113-post-index-change-hook.sh
+++ b/t/t7113-post-index-change-hook.sh
@@ -5,6 +5,7 @@ test_description='post index change hook'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index b7ba1c3268..61ad47b0c1 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -658,4 +658,21 @@ test_expect_success 'custom merge driver with checkout -m' '
 	test_cmp expect arm
 '
 
+test_expect_success 'tracking info copied with autoSetupMerge=inherit' '
+	git reset --hard main &&
+	# default config does not copy tracking info
+	git checkout -b foo-no-inherit koala/bear &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with autoSetupMerge=inherit, we copy tracking info from koala/bear
+	test_config branch.autoSetupMerge inherit &&
+	git checkout -b foo koala/bear &&
+	test_cmp_config origin branch.foo.remote &&
+	test_cmp_config refs/heads/koala/bear branch.foo.merge &&
+	# no tracking info to inherit from main
+	git checkout -b main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
+'
+
 test_done
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index cb1b8e35db..e7cec2e457 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -1182,18 +1182,17 @@ test_expect_success 'submodule deinit is silent when used on an uninitialized su
 	rmdir init example2
 '
 
-test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' '
+test_expect_success 'submodule deinit absorbs .git directory if .git is a directory' '
 	git submodule update --init &&
 	(
 		cd init &&
 		rm .git &&
-		cp -R ../.git/modules/example .git &&
+		mv ../.git/modules/example .git &&
 		GIT_WORK_TREE=. git config --unset core.worktree
 	) &&
-	test_must_fail git submodule deinit init &&
-	test_must_fail git submodule deinit -f init &&
-	test -d init/.git &&
-	test -n "$(git config --get-regexp "submodule\.example\.")"
+	git submodule deinit init &&
+	test_path_is_missing init/.git &&
+	test -z "$(git config --get-regexp "submodule\.example\.")"
 '
 
 test_expect_success 'submodule with UTF-8 name' '
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 8dd0f98812..91964653a0 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -359,14 +359,14 @@ test_expect_success '--fixup=reword: ignores staged changes' '
 
 test_expect_success '--fixup=reword: error out with -m option' '
 	commit_for_rebase_autosquash_setup &&
-	echo "fatal: cannot combine -m with --fixup:reword" >expect &&
+	echo "fatal: options '\''-m'\'' and '\''--fixup:reword'\'' cannot be used together" >expect &&
 	test_must_fail git commit --fixup=reword:HEAD~ -m "reword commit message" 2>actual &&
 	test_cmp expect actual
 '
 
 test_expect_success '--fixup=amend: error out with -m option' '
 	commit_for_rebase_autosquash_setup &&
-	echo "fatal: cannot combine -m with --fixup:amend" >expect &&
+	echo "fatal: options '\''-m'\'' and '\''--fixup:amend'\'' cannot be used together" >expect &&
 	test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
 	test_cmp expect actual
 '
@@ -421,8 +421,9 @@ test_expect_success 'amend! commit allows empty commit msg body with --allow-emp
 
 test_fixup_reword_opt () {
 	test_expect_success "--fixup=reword: incompatible with $1" "
-		echo 'fatal: reword option of --fixup is mutually exclusive with'\
-			'--patch/--interactive/--all/--include/--only' >expect &&
+		echo 'fatal: reword option of '\''--fixup'\'' and' \
+			''\''--patch/--interactive/--all/--include/--only'\' \
+			'cannot be used together' >expect &&
 		test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&
 		test_cmp expect actual
 	"
@@ -435,7 +436,7 @@ done
 
 test_expect_success '--fixup=reword: give error with pathsec' '
 	commit_for_rebase_autosquash_setup &&
-	echo "fatal: cannot combine reword option of --fixup with path '\''foo'\''" >expect &&
+	echo "fatal: reword option of '\''--fixup'\'' and path '\''foo'\'' cannot be used together" >expect &&
 	test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
 	test_cmp expect actual
 '
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index 512ae2781f..fb5417d5e7 100755
--- a/t/t7501-commit-basic-functionality.sh
+++ b/t/t7501-commit-basic-functionality.sh
@@ -667,10 +667,7 @@ test_expect_success 'amend can copy notes' '
 
 test_expect_success 'commit a file whose name is a dash' '
 	git reset --hard &&
-	for i in 1 2 3 4 5
-	do
-		echo $i
-	done >./- &&
+	test_write_lines 1 2 3 4 5 >./- &&
 	git add ./- &&
 	test_tick &&
 	git commit -m "add dash" >output </dev/null &&
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 2a07c70867..e39c809ca4 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -16,7 +16,7 @@ test_expect_success 'set up commits for rebasing' '
 	test_commit rebase-b b bb &&
 	for i in $(test_seq 1 13)
 	do
-		test_commit rebase-$i c $i
+		test_commit rebase-$i c $i || return 1
 	done &&
 	git checkout main &&
 
diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh
index d568593382..21c668f75e 100755
--- a/t/t7509-commit-authorship.sh
+++ b/t/t7509-commit-authorship.sh
@@ -5,6 +5,7 @@
 
 test_description='commit tests of various authorhip options. '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 author_header () {
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index d65a0171f2..8593b7e3cb 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -71,25 +71,7 @@ test_expect_success GPG 'create signed commits' '
 	git tag eleventh-signed $(cat oid) &&
 	echo 12 | git commit-tree --gpg-sign=B7227189 HEAD^{tree} >oid &&
 	test_line_count = 1 oid &&
-	git tag twelfth-signed-alt $(cat oid) &&
-
-	cat >keydetails <<-\EOF &&
-	Key-Type: RSA
-	Key-Length: 2048
-	Subkey-Type: RSA
-	Subkey-Length: 2048
-	Name-Real: Unknown User
-	Name-Email: unknown@git.com
-	Expire-Date: 0
-	%no-ask-passphrase
-	%no-protection
-	EOF
-	gpg --batch --gen-key keydetails &&
-	echo 13 >file && git commit -a -S"unknown@git.com" -m thirteenth &&
-	git tag thirteenth-signed &&
-	DELETE_FINGERPRINT=$(gpg -K --with-colons --fingerprint --batch unknown@git.com | grep "^fpr" | head -n 1 | awk -F ":" "{print \$10;}") &&
-	gpg --batch --yes --delete-secret-keys $DELETE_FINGERPRINT &&
-	gpg --batch --yes --delete-keys unknown@git.com
+	git tag twelfth-signed-alt $(cat oid)
 '
 
 test_expect_success GPG 'verify and show signatures' '
@@ -129,7 +111,7 @@ test_expect_success GPG 'verify and show signatures' '
 '
 
 test_expect_success GPG 'verify-commit exits failure on unknown signature' '
-	test_must_fail git verify-commit thirteenth-signed 2>actual &&
+	test_must_fail env GNUPGHOME="$GNUPGHOME_NOT_USED" git verify-commit initial 2>actual &&
 	! grep "Good signature from" actual &&
 	! grep "BAD signature from" actual &&
 	grep -q -F -e "No public key" -e "public key not found" actual
@@ -228,7 +210,7 @@ test_expect_success GPG 'detect fudged signature with NUL' '
 '
 
 test_expect_success GPG 'amending already signed commit' '
-	git checkout fourth-signed^0 &&
+	git checkout -f fourth-signed^0 &&
 	git commit --amend -S --no-edit &&
 	git verify-commit HEAD &&
 	git show -s --show-signature HEAD >actual &&
diff --git a/t/t7511-status-index.sh b/t/t7511-status-index.sh
index b5fdc048a5..4ffa45a7bf 100755
--- a/t/t7511-status-index.sh
+++ b/t/t7511-status-index.sh
@@ -2,6 +2,7 @@
 
 test_description='git status with certain file name lengths'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 files="0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z"
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 7f2956d77a..2f16d5787e 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -659,6 +659,7 @@ On branch am_empty
 You are in the middle of an am session.
 The current patch is empty.
   (use "git am --skip" to skip this patch)
+  (use "git am --allow-empty" to record this patch as an empty commit)
   (use "git am --abort" to restore the original branch)
 
 nothing to commit (use -u to show untracked files)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 04885d0a5e..97f10905d2 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -156,7 +156,7 @@ test_expect_success 'with config option on the command line' '
 		Acked-by: Johan
 		Reviewed-by: Peff
 	EOF
-	{ echo; echo "Acked-by: Johan"; } |
+	{ echo && echo "Acked-by: Johan"; } |
 	git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \
 		--trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual &&
 	test_cmp expected actual
diff --git a/t/t7515-status-symlinks.sh b/t/t7515-status-symlinks.sh
index 9f989be01b..e3d6bb67bf 100755
--- a/t/t7515-status-symlinks.sh
+++ b/t/t7515-status-symlinks.sh
@@ -2,6 +2,7 @@
 
 test_description='git status and symlinks'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index f488d930df..a6308acf00 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -248,7 +248,7 @@ do
 		git config core.preloadIndex $preload_val &&
 		if test $preload_val = true
 		then
-			GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX
+			GIT_TEST_PRELOAD_INDEX=$preload_val && export GIT_TEST_PRELOAD_INDEX
 		else
 			sane_unset GIT_TEST_PRELOAD_INDEX
 		fi
@@ -390,7 +390,7 @@ test_expect_success 'status succeeds after staging/unstaging' '
 # during a call to 'git status'. Otherwise, we verify that we _do_ call it.
 check_sparse_index_behavior () {
 	git -C full status --porcelain=v2 >expect &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 		git -C sparse status --porcelain=v2 >actual &&
 	test_region $1 index ensure_full_index trace2.txt &&
 	test_region fsm_hook query trace2.txt &&
diff --git a/t/t7525-status-rename.sh b/t/t7525-status-rename.sh
index a62736dce0..22bf5c7e5d 100755
--- a/t/t7525-status-rename.sh
+++ b/t/t7525-status-rename.sh
@@ -2,6 +2,7 @@
 
 test_description='git status rename detection options'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' '
diff --git a/t/t7526-commit-pathspec-file.sh b/t/t7526-commit-pathspec-file.sh
index 5fbe47ebcd..ad011bb9f1 100755
--- a/t/t7526-commit-pathspec-file.sh
+++ b/t/t7526-commit-pathspec-file.sh
@@ -2,6 +2,7 @@
 
 test_description='commit --pathspec-from-file'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_tick
@@ -140,19 +141,19 @@ test_expect_success 'error conditions' '
 	>empty_list &&
 
 	test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
 	test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
 	test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
-	test_i18ngrep -e "--pathspec-from-file with -a does not make sense" err &&
+	test_i18ngrep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
 
 	test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
-	test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err &&
+	test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
 	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
-	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+	test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
 	test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
 	test_i18ngrep -e "No paths with --include/--only does not make sense." err &&
diff --git a/t/t7528-signed-commit-ssh.sh b/t/t7528-signed-commit-ssh.sh
index badf3ed320..f47e995179 100755
--- a/t/t7528-signed-commit-ssh.sh
+++ b/t/t7528-signed-commit-ssh.sh
@@ -73,7 +73,46 @@ test_expect_success GPGSSH 'create signed commits' '
 	git tag eleventh-signed $(cat oid) &&
 	echo 12 | git commit-tree --gpg-sign="${GPGSSH_KEY_UNTRUSTED}" HEAD^{tree} >oid &&
 	test_line_count = 1 oid &&
-	git tag twelfth-signed-alt $(cat oid)
+	git tag twelfth-signed-alt $(cat oid) &&
+
+	echo 13>file && test_tick && git commit -a -m thirteenth -S"${GPGSSH_KEY_ECDSA}" &&
+	git tag thirteenth-signed-ecdsa
+'
+
+test_expect_success GPGSSH 'sign commits using literal public keys with ssh-agent' '
+	test_when_finished "test_unconfig commit.gpgsign" &&
+	test_config gpg.format ssh &&
+	eval $(ssh-agent) &&
+	test_when_finished "kill ${SSH_AGENT_PID}" &&
+	ssh-add "${GPGSSH_KEY_PRIMARY}" &&
+	echo 1 >file && git add file &&
+	git commit -a -m rsa-inline -S"$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
+	echo 2 >file &&
+	test_config user.signingkey "$(cat "${GPGSSH_KEY_PRIMARY}.pub")" &&
+	git commit -a -m rsa-config -S &&
+	ssh-add "${GPGSSH_KEY_ECDSA}" &&
+	echo 3 >file &&
+	git commit -a -m ecdsa-inline -S"key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
+	echo 4 >file &&
+	test_config user.signingkey "key::$(cat "${GPGSSH_KEY_ECDSA}.pub")" &&
+	git commit -a -m ecdsa-config -S
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'create signed commits with keys having defined lifetimes' '
+	test_when_finished "test_unconfig commit.gpgsign" &&
+	test_config gpg.format ssh &&
+
+	echo expired >file && test_tick && git commit -a -m expired -S"${GPGSSH_KEY_EXPIRED}" &&
+	git tag expired-signed &&
+
+	echo notyetvalid >file && test_tick && git commit -a -m notyetvalid -S"${GPGSSH_KEY_NOTYETVALID}" &&
+	git tag notyetvalid-signed &&
+
+	echo timeboxedvalid >file && test_tick && git commit -a -m timeboxedvalid -S"${GPGSSH_KEY_TIMEBOXEDVALID}" &&
+	git tag timeboxedvalid-signed &&
+
+	echo timeboxedinvalid >file && test_tick && git commit -a -m timeboxedinvalid -S"${GPGSSH_KEY_TIMEBOXEDINVALID}" &&
+	git tag timeboxedinvalid-signed
 '
 
 test_expect_success GPGSSH 'verify and show signatures' '
@@ -122,6 +161,31 @@ test_expect_success GPGSSH 'verify-commit exits failure on untrusted signature'
 	grep "${GPGSSH_KEY_NOT_TRUSTED}" actual
 '
 
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit exits failure on expired signature key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-commit expired-signed 2>actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit exits failure on not yet valid signature key' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-commit notyetvalid-signed 2>actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit succeeds with commit date and key validity matching' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	git verify-commit timeboxedvalid-signed 2>actual &&
+	grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual &&
+	! grep "${GPGSSH_BAD_SIGNATURE}" actual
+'
+
+test_expect_success GPGSSH,GPGSSH_VERIFYTIME 'verify-commit exits failure with commit date outside of key validity' '
+	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
+	test_must_fail git verify-commit timeboxedinvalid-signed 2>actual &&
+	! grep "${GPGSSH_GOOD_SIGNATURE_TRUSTED}" actual
+'
+
 test_expect_success GPGSSH 'verify-commit exits success with matching minTrustLevel' '
 	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
 	test_config gpg.minTrustLevel fully &&
@@ -217,7 +281,7 @@ test_expect_success GPGSSH 'amending already signed commit' '
 	test_config gpg.format ssh &&
 	test_config user.signingkey "${GPGSSH_KEY_PRIMARY}" &&
 	test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" &&
-	git checkout fourth-signed^0 &&
+	git checkout -f fourth-signed^0 &&
 	git commit --amend -S --no-edit &&
 	git verify-commit HEAD &&
 	git show -s --show-signature HEAD >actual &&
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index c773e30b3f..f0f6fda150 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -967,7 +967,7 @@ test_expect_success 'set up mod-256 conflict scenario' '
 	# 256 near-identical stanzas...
 	for i in $(test_seq 1 256); do
 		for j in 1 2 3 4 5; do
-			echo $i-$j
+			echo $i-$j || return 1
 		done
 	done >file &&
 	git add file &&
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index a9c816b47f..ff085b086c 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -29,8 +29,8 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
 	refs="" &&
 	while test $i -le 30
 	do
-		refs="$refs c$i"
-		i=$(expr $i + 1)
+		refs="$refs c$i" &&
+		i=$(expr $i + 1) || return 1
 	done &&
 	git merge $refs &&
 	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh
index 27cd94ad6f..4887ca705b 100755
--- a/t/t7603-merge-reduce-heads.sh
+++ b/t/t7603-merge-reduce-heads.sh
@@ -95,7 +95,7 @@ test_expect_success 'setup' '
 		echo $i > $i.c &&
 		git add $i.c &&
 		git commit -m $i &&
-		git tag $i
+		git tag $i || return 1
 	done &&
 	git reset --hard A &&
 	for i in F G H I
@@ -103,7 +103,7 @@ test_expect_success 'setup' '
 		echo $i > $i.c &&
 		git add $i.c &&
 		git commit -m $i &&
-		git tag $i
+		git tag $i || return 1
 	done
 '
 
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 0260ad6f0e..e489869dd9 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -5,6 +5,7 @@ test_description='git repack works correctly'
 . ./test-lib.sh
 . "${TEST_DIRECTORY}/lib-bitmap.sh"
 . "${TEST_DIRECTORY}/lib-midx.sh"
+. "${TEST_DIRECTORY}/lib-terminal.sh"
 
 commit_and_pack () {
 	test_commit "$@" 1>&2 &&
@@ -117,7 +118,7 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
 			rm alt_objects/pack/$base_name.keep
 		else
 			touch alt_objects/pack/$base_name.keep
-		fi
+		fi || return 1
 	done &&
 	git repack -a -d &&
 	test_no_missing_in_packs
@@ -372,4 +373,16 @@ test_expect_success '--write-midx with preferred bitmap tips' '
 	)
 '
 
+test_expect_success '--write-midx -b packs non-kept objects' '
+	GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+		git repack --write-midx -a -b &&
+	test_subcommand_inexact git pack-objects --honor-pack-keep <trace.txt
+'
+
+test_expect_success TTY '--quiet disables progress' '
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git -C midx repack -ad --quiet --write-midx 2>stderr &&
+	test_must_be_empty stderr
+'
+
 test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 6b6423a07c..424c31c328 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -31,28 +31,28 @@ int main(int argc, const char **argv)
 EOF
 
 test_expect_success setup '
-	{
-		echo foo mmap bar
-		echo foo_mmap bar
-		echo foo_mmap bar mmap
-		echo foo mmap bar_mmap
-		echo foo_mmap bar mmap baz
-	} >file &&
-	{
-		echo Hello world
-		echo HeLLo world
-		echo Hello_world
-		echo HeLLo_world
-	} >hello_world &&
-	{
-		echo "a+b*c"
-		echo "a+bc"
-		echo "abc"
-	} >ab &&
-	{
-		echo d &&
-		echo 0
-	} >d0 &&
+	cat >file <<-\EOF &&
+	foo mmap bar
+	foo_mmap bar
+	foo_mmap bar mmap
+	foo mmap bar_mmap
+	foo_mmap bar mmap baz
+	EOF
+	cat >hello_world <<-\EOF &&
+	Hello world
+	HeLLo world
+	Hello_world
+	HeLLo_world
+	EOF
+	cat >ab <<-\EOF &&
+	a+b*c
+	a+bc
+	abc
+	EOF
+	cat >d0 <<-\EOF &&
+	d
+	0
+	EOF
 	echo vvv >v &&
 	echo ww w >w &&
 	echo x x xx x >x &&
@@ -63,13 +63,13 @@ test_expect_success setup '
 	echo vvv >t/v &&
 	mkdir t/a &&
 	echo vvv >t/a/v &&
-	{
-		echo "line without leading space1"
-		echo " line with leading space1"
-		echo " line with leading space2"
-		echo " line with leading space3"
-		echo "line without leading space2"
-	} >space &&
+	qz_to_tab_space >space <<-\EOF &&
+	line without leading space1
+	Zline with leading space1
+	Zline with leading space2
+	Zline with leading space3
+	line without leading space2
+	EOF
 	cat >hello.ps1 <<-\EOF &&
 	# No-op.
 	function dummy() {}
@@ -106,129 +106,129 @@ do
 	esac
 
 	test_expect_success "grep -w $L" '
-		{
-			echo ${HC}file:1:foo mmap bar
-			echo ${HC}file:3:foo_mmap bar mmap
-			echo ${HC}file:4:foo mmap bar_mmap
-			echo ${HC}file:5:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:1:foo mmap bar
+		${HC}file:3:foo_mmap bar mmap
+		${HC}file:4:foo mmap bar_mmap
+		${HC}file:5:foo_mmap bar mmap baz
+		EOF
 		git -c grep.linenumber=false grep -n -w -e mmap $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (with --column)" '
-		{
-			echo ${HC}file:5:foo mmap bar
-			echo ${HC}file:14:foo_mmap bar mmap
-			echo ${HC}file:5:foo mmap bar_mmap
-			echo ${HC}file:14:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:5:foo mmap bar
+		${HC}file:14:foo_mmap bar mmap
+		${HC}file:5:foo mmap bar_mmap
+		${HC}file:14:foo_mmap bar mmap baz
+		EOF
 		git grep --column -w -e mmap $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (with --column, extended OR)" '
-		{
-			echo ${HC}file:14:foo_mmap bar mmap
-			echo ${HC}file:19:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:14:foo_mmap bar mmap
+		${HC}file:19:foo_mmap bar mmap baz
+		EOF
 		git grep --column -w -e mmap$ --or -e baz $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (with --column, --invert-match)" '
-		{
-			echo ${HC}file:1:foo mmap bar
-			echo ${HC}file:1:foo_mmap bar
-			echo ${HC}file:1:foo_mmap bar mmap
-			echo ${HC}file:1:foo mmap bar_mmap
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:1:foo mmap bar
+		${HC}file:1:foo_mmap bar
+		${HC}file:1:foo_mmap bar mmap
+		${HC}file:1:foo mmap bar_mmap
+		EOF
 		git grep --column --invert-match -w -e baz $H -- file >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep $L (with --column, --invert-match, extended OR)" '
-		{
-			echo ${HC}hello_world:6:HeLLo_world
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}hello_world:6:HeLLo_world
+		EOF
 		git grep --column --invert-match -e ll --or --not -e _ $H -- hello_world \
 			>actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep $L (with --column, --invert-match, extended AND)" '
-		{
-			echo ${HC}hello_world:3:Hello world
-			echo ${HC}hello_world:3:Hello_world
-			echo ${HC}hello_world:6:HeLLo_world
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}hello_world:3:Hello world
+		${HC}hello_world:3:Hello_world
+		${HC}hello_world:6:HeLLo_world
+		EOF
 		git grep --column --invert-match --not -e _ --and --not -e ll $H -- hello_world \
 			>actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep $L (with --column, double-negation)" '
-		{
-			echo ${HC}file:1:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:1:foo_mmap bar mmap baz
+		EOF
 		git grep --column --not \( --not -e foo --or --not -e baz \) $H -- file \
 			>actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (with --column, -C)" '
-		{
-			echo ${HC}file:5:foo mmap bar
-			echo ${HC}file-foo_mmap bar
-			echo ${HC}file:14:foo_mmap bar mmap
-			echo ${HC}file:5:foo mmap bar_mmap
-			echo ${HC}file:14:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:5:foo mmap bar
+		${HC}file-foo_mmap bar
+		${HC}file:14:foo_mmap bar mmap
+		${HC}file:5:foo mmap bar_mmap
+		${HC}file:14:foo_mmap bar mmap baz
+		EOF
 		git grep --column -w -C1 -e mmap $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (with --line-number, --column)" '
-		{
-			echo ${HC}file:1:5:foo mmap bar
-			echo ${HC}file:3:14:foo_mmap bar mmap
-			echo ${HC}file:4:5:foo mmap bar_mmap
-			echo ${HC}file:5:14:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:1:5:foo mmap bar
+		${HC}file:3:14:foo_mmap bar mmap
+		${HC}file:4:5:foo mmap bar_mmap
+		${HC}file:5:14:foo_mmap bar mmap baz
+		EOF
 		git grep -n --column -w -e mmap $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (with non-extended patterns, --column)" '
-		{
-			echo ${HC}file:5:foo mmap bar
-			echo ${HC}file:10:foo_mmap bar
-			echo ${HC}file:10:foo_mmap bar mmap
-			echo ${HC}file:5:foo mmap bar_mmap
-			echo ${HC}file:10:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:5:foo mmap bar
+		${HC}file:10:foo_mmap bar
+		${HC}file:10:foo_mmap bar mmap
+		${HC}file:5:foo mmap bar_mmap
+		${HC}file:10:foo_mmap bar mmap baz
+		EOF
 		git grep --column -w -e bar -e mmap $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L" '
-		{
-			echo ${HC}file:1:foo mmap bar
-			echo ${HC}file:3:foo_mmap bar mmap
-			echo ${HC}file:4:foo mmap bar_mmap
-			echo ${HC}file:5:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:1:foo mmap bar
+		${HC}file:3:foo_mmap bar mmap
+		${HC}file:4:foo mmap bar_mmap
+		${HC}file:5:foo_mmap bar mmap baz
+		EOF
 		git -c grep.linenumber=true grep -w -e mmap $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L" '
-		{
-			echo ${HC}file:foo mmap bar
-			echo ${HC}file:foo_mmap bar mmap
-			echo ${HC}file:foo mmap bar_mmap
-			echo ${HC}file:foo_mmap bar mmap baz
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:foo mmap bar
+		${HC}file:foo_mmap bar mmap
+		${HC}file:foo mmap bar_mmap
+		${HC}file:foo_mmap bar mmap baz
+		EOF
 		git -c grep.linenumber=true grep --no-line-number -w -e mmap $H >actual &&
 		test_cmp expected actual
 	'
@@ -239,17 +239,17 @@ do
 	'
 
 	test_expect_success "grep -w $L (x)" '
-		{
-			echo ${HC}x:1:x x xx x
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}x:1:x x xx x
+		EOF
 		git grep -n -w -e "x xx* x" $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep -w $L (y-1)" '
-		{
-			echo ${HC}y:1:y yy
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}y:1:y yy
+		EOF
 		git grep -n -w -e "^y" $H >actual &&
 		test_cmp expected actual
 	'
@@ -277,16 +277,16 @@ do
 	'
 
 	test_expect_success "grep $L (with --column, --only-matching)" '
-		{
-			echo ${HC}file:1:5:mmap
-			echo ${HC}file:2:5:mmap
-			echo ${HC}file:3:5:mmap
-			echo ${HC}file:3:13:mmap
-			echo ${HC}file:4:5:mmap
-			echo ${HC}file:4:13:mmap
-			echo ${HC}file:5:5:mmap
-			echo ${HC}file:5:13:mmap
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}file:1:5:mmap
+		${HC}file:2:5:mmap
+		${HC}file:3:5:mmap
+		${HC}file:3:13:mmap
+		${HC}file:4:5:mmap
+		${HC}file:4:13:mmap
+		${HC}file:5:5:mmap
+		${HC}file:5:13:mmap
+		EOF
 		git grep --column -n -o -e mmap $H >actual &&
 		test_cmp expected actual
 	'
@@ -320,11 +320,11 @@ do
 	'
 
 	test_expect_success "grep --max-depth -1 $L" '
-		{
-			echo ${HC}t/a/v:1:vvv
-			echo ${HC}t/v:1:vvv
-			echo ${HC}v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}t/a/v:1:vvv
+		${HC}t/v:1:vvv
+		${HC}v:1:vvv
+		EOF
 		git grep --max-depth -1 -n -e vvv $H >actual &&
 		test_cmp expected actual &&
 		git grep --recursive -n -e vvv $H >actual &&
@@ -332,9 +332,9 @@ do
 	'
 
 	test_expect_success "grep --max-depth 0 $L" '
-		{
-			echo ${HC}v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}v:1:vvv
+		EOF
 		git grep --max-depth 0 -n -e vvv $H >actual &&
 		test_cmp expected actual &&
 		git grep --no-recursive -n -e vvv $H >actual &&
@@ -342,11 +342,11 @@ do
 	'
 
 	test_expect_success "grep --max-depth 0 -- '*' $L" '
-		{
-			echo ${HC}t/a/v:1:vvv
-			echo ${HC}t/v:1:vvv
-			echo ${HC}v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}t/a/v:1:vvv
+		${HC}t/v:1:vvv
+		${HC}v:1:vvv
+		EOF
 		git grep --max-depth 0 -n -e vvv $H -- "*" >actual &&
 		test_cmp expected actual &&
 		git grep --no-recursive -n -e vvv $H -- "*" >actual &&
@@ -354,18 +354,18 @@ do
 	'
 
 	test_expect_success "grep --max-depth 1 $L" '
-		{
-			echo ${HC}t/v:1:vvv
-			echo ${HC}v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}t/v:1:vvv
+		${HC}v:1:vvv
+		EOF
 		git grep --max-depth 1 -n -e vvv $H >actual &&
 		test_cmp expected actual
 	'
 
 	test_expect_success "grep --max-depth 0 -- t $L" '
-		{
-			echo ${HC}t/v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}t/v:1:vvv
+		EOF
 		git grep --max-depth 0 -n -e vvv $H -- t >actual &&
 		test_cmp expected actual &&
 		git grep --no-recursive -n -e vvv $H -- t >actual &&
@@ -373,10 +373,10 @@ do
 	'
 
 	test_expect_success "grep --max-depth 0 -- . t $L" '
-		{
-			echo ${HC}t/v:1:vvv
-			echo ${HC}v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}t/v:1:vvv
+		${HC}v:1:vvv
+		EOF
 		git grep --max-depth 0 -n -e vvv $H -- . t >actual &&
 		test_cmp expected actual &&
 		git grep --no-recursive -n -e vvv $H -- . t >actual &&
@@ -384,10 +384,10 @@ do
 	'
 
 	test_expect_success "grep --max-depth 0 -- t . $L" '
-		{
-			echo ${HC}t/v:1:vvv
-			echo ${HC}v:1:vvv
-		} >expected &&
+		cat >expected <<-EOF &&
+		${HC}t/v:1:vvv
+		${HC}v:1:vvv
+		EOF
 		git grep --max-depth 0 -n -e vvv $H -- t . >actual &&
 		test_cmp expected actual &&
 		git grep --no-recursive -n -e vvv $H -- t . >actual &&
@@ -1314,10 +1314,10 @@ test_expect_success PCRE 'grep -P pattern with grep.extendedRegexp=true' '
 '
 
 test_expect_success PCRE 'grep -P -v pattern' '
-	{
-		echo "ab:a+b*c"
-		echo "ab:a+bc"
-	} >expected &&
+	cat >expected <<-\EOF &&
+	ab:a+b*c
+	ab:a+bc
+	EOF
 	git grep -P -v "abc" ab >actual &&
 	test_cmp expected actual
 '
@@ -1331,10 +1331,10 @@ test_expect_success PCRE 'grep -P -i pattern' '
 '
 
 test_expect_success PCRE 'grep -P -w pattern' '
-	{
-		echo "hello_world:Hello world"
-		echo "hello_world:HeLLo world"
-	} >expected &&
+	cat >expected <<-\EOF &&
+	hello_world:Hello world
+	hello_world:HeLLo world
+	EOF
 	git grep -P -w "He((?i)ll)o" hello_world >actual &&
 	test_cmp expected actual
 '
@@ -1469,10 +1469,10 @@ test_expect_success 'grep -F pattern with grep.patternType=basic' '
 '
 
 test_expect_success 'grep -G pattern with grep.patternType=fixed' '
-	{
-		echo "ab:a+b*c"
-		echo "ab:a+bc"
-	} >expected &&
+	cat >expected <<-\EOF &&
+	ab:a+b*c
+	ab:a+bc
+	EOF
 	git \
 		-c grep.patterntype=fixed \
 		grep -G "a+b" ab >actual &&
@@ -1480,11 +1480,11 @@ test_expect_success 'grep -G pattern with grep.patternType=fixed' '
 '
 
 test_expect_success 'grep -E pattern with grep.patternType=fixed' '
-	{
-		echo "ab:a+b*c"
-		echo "ab:a+bc"
-		echo "ab:abc"
-	} >expected &&
+	cat >expected <<-\EOF &&
+	ab:a+b*c
+	ab:a+bc
+	ab:abc
+	EOF
 	git \
 		-c grep.patterntype=fixed \
 		grep -E "a+" ab >actual &&
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index e5d1e4ea68..ca3f24f807 100755
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -123,4 +123,10 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: gr
 	test_cmp invalid-0xe5 actual
 '
 
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-literal ASCII from UTF-8' '
+	git grep --perl-regexp -h -o -e ll. file >actual &&
+	echo "lló" >expected &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t7815-grep-binary.sh b/t/t7815-grep-binary.sh
index 90ebb64f46..ac871287c0 100755
--- a/t/t7815-grep-binary.sh
+++ b/t/t7815-grep-binary.sh
@@ -2,6 +2,7 @@
 
 test_description='git grep in binary files'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'setup' "
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index 5bb302b1ba..ee4fdd8f18 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -97,7 +97,7 @@ test_expect_success 'set up abbrev tests' '
 	test_commit abbrev &&
 	sha1=$(git rev-parse --verify HEAD) &&
 	check_abbrev () {
-		expect=$1; shift
+		expect=$1 && shift &&
 		echo $sha1 | cut -c 1-$expect >expect &&
 		git blame "$@" abbrev.t >actual &&
 		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index da80f815ce..d751d48b7d 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -13,14 +13,8 @@ test_expect_success setup '
 	echo B B B B B >two &&
 	echo C C C C C >tres &&
 	echo ABC >mouse &&
-	for i in 1 2 3 4 5 6 7 8 9
-	do
-		echo $i
-	done >nine_lines &&
-	for i in 1 2 3 4 5 6 7 8 9 a
-	do
-		echo $i
-	done >ten_lines &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
 	git add one two tres mouse nine_lines ten_lines &&
 	test_tick &&
 	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
index e68e6115a6..0bd0341301 100755
--- a/t/t8014-blame-ignore-fuzzy.sh
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -310,7 +310,7 @@ test_expect_success setup '
 			echo "$line" >>"$i" &&
 			git add "$i" &&
 			test_tick &&
-			GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count"
+			GIT_AUTHOR_NAME="$line_count" git commit -m "$line_count" || return 1
 		done <"a$i"
 	done &&
 
@@ -318,7 +318,7 @@ test_expect_success setup '
 	do
 		# Overwrite the files with the final content.
 		cp b$i $i &&
-		git add $i
+		git add $i || return 1
 	done &&
 	test_tick &&
 
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index 66cd51102c..7b2049caa0 100755
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 test_description='git svn rmdir'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize repo' '
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 67eed2fefc..c7d8e0bf00 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -117,7 +117,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
 	mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
 	for i in a b c ; do \
 	  echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
-	  echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
+	  echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t || return 1
 	done &&
 	  echo "bad delete test" > \
 	   import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
@@ -134,7 +134,7 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
 		svn mv t native/t &&
 		for i in a b c
 		do
-			svn mv $i.pm native/$i.pm
+			svn mv $i.pm native/$i.pm || return 1
 		done &&
 		echo z >>native/t/c.t &&
 		poke native/t/c.t &&
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index ceaa5bad10..aa908bbc2f 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -98,10 +98,10 @@ test_expect_success 'migrate --minimize on old inited layout' '
 	rm -rf "$GIT_DIR"/svn &&
 	for i in $(cat fetch.out)
 	do
-		path=$(expr $i : "\([^:]*\):.*$")
-		ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
-		if test -z "$ref"; then continue; fi
-		if test -n "$path"; then path="/$path"; fi
+		path=${i%%:*} &&
+		ref=${i#*:} &&
+		if test "$ref" = "${ref#refs/remotes/}"; then continue; fi &&
+		if test -n "$path"; then path="/$path"; fi &&
 		mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
 		echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
 		return 1
diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index ead404589e..3320b1f39c 100755
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -5,6 +5,7 @@
 
 test_description='git svn respects rewriteRoot during rebuild'
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 mkdir import
diff --git a/t/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh
index 4e95f791db..9871f5abc9 100755
--- a/t/t9128-git-svn-cmd-branch.sh
+++ b/t/t9128-git-svn-cmd-branch.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='git svn partial-rebuild tests'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize svnrepo' '
diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index cb764bcadc..90325db909 100755
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -15,7 +15,7 @@ EOF
 test_expect_success 'setup svnrepo' '
 	for i in aa bb cc dd
 	do
-		svn_cmd mkdir -m $i --username $i "$svnrepo"/$i
+		svn_cmd mkdir -m $i --username $i "$svnrepo"/$i || return 1
 	done
 	'
 
@@ -59,8 +59,8 @@ test_expect_success 'authors-file against globs' '
 	git svn clone --authors-file=svn-authors -s "$svnrepo"/aa aa-work &&
 	for i in bb ee cc
 	do
-		branch="aa/branches/$i"
-		svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch"
+		branch="aa/branches/$i" &&
+		svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch" || return 1
 	done
 	'
 
diff --git a/t/t9134-git-svn-ignore-paths.sh b/t/t9134-git-svn-ignore-paths.sh
index fff49c4100..4a77eb9f60 100755
--- a/t/t9134-git-svn-ignore-paths.sh
+++ b/t/t9134-git-svn-ignore-paths.sh
@@ -27,7 +27,7 @@ test_expect_success 'setup test repository' '
 test_expect_success 'clone an SVN repository with ignored www directory' '
 	git svn clone --ignore-paths="^www" "$svnrepo" g &&
 	echo test_qqq > expect &&
-	for i in g/*/*.txt; do cat $i >> expect2; done &&
+	for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
 	test_cmp expect expect2
 '
 
@@ -36,7 +36,7 @@ test_expect_success 'init+fetch an SVN repository with ignored www directory' '
 	( cd c && git svn fetch --ignore-paths="^www" ) &&
 	rm expect2 &&
 	echo test_qqq > expect &&
-	for i in c/*/*.txt; do cat $i >> expect2; done &&
+	for i in c/*/*.txt; do cat $i >> expect2 || return 1; done &&
 	test_cmp expect expect2
 '
 
@@ -62,7 +62,7 @@ test_expect_success 'update git svn-cloned repo (config ignore)' '
 		cd g &&
 		git svn rebase &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -73,7 +73,7 @@ test_expect_success 'update git svn-cloned repo (option ignore)' '
 		cd c &&
 		git svn rebase --ignore-paths="^www" &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -94,7 +94,7 @@ test_expect_success 'update git svn-cloned repo (config ignore)' '
 		cd g &&
 		git svn rebase &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -105,7 +105,7 @@ test_expect_success 'update git svn-cloned repo (option ignore)' '
 		cd c &&
 		git svn rebase --ignore-paths="^www" &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -127,7 +127,7 @@ test_expect_success 'update git svn-cloned repo again (config ignore)' '
 		cd g &&
 		git svn rebase &&
 		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -138,7 +138,7 @@ test_expect_success 'update git svn-cloned repo again (option ignore)' '
 		cd c &&
 		git svn rebase --ignore-paths="^www" &&
 		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 027b416720..784ec7fc2d 100755
--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -27,7 +27,7 @@ test_expect_success 'svn-authors setup' '
 test_expect_success 'setup svnrepo' '
 	for i in aa bb cc-sub dd-sub ee-foo ff
 	do
-		svn mkdir -m $i --username $i "$svnrepo"/$i
+		svn mkdir -m $i --username $i "$svnrepo"/$i || return 1
 	done
 '
 
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 5f91c0d68b..80cb55fee7 100755
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -8,7 +8,7 @@ test_description='git svn creates empty directories'
 test_expect_success 'initialize repo' '
 	for i in a b c d d/e d/e/f "weird file name"
 	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
 	done
 '
 
@@ -102,7 +102,7 @@ test_expect_success 'git svn mkdirs -r works' '
 test_expect_success 'initialize trunk' '
 	for i in trunk trunk/a trunk/"weird file name"
 	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
 	done
 '
 
diff --git a/t/t9147-git-svn-include-paths.sh b/t/t9147-git-svn-include-paths.sh
index d292bf9f55..257fc8f2f8 100755
--- a/t/t9147-git-svn-include-paths.sh
+++ b/t/t9147-git-svn-include-paths.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup test repository' '
 test_expect_success 'clone an SVN repository with filter to include qqq directory' '
 	git svn clone --include-paths="qqq" "$svnrepo" g &&
 	echo test_qqq > expect &&
-	for i in g/*/*.txt; do cat $i >> expect2; done &&
+	for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
 	test_cmp expect expect2
 '
 
@@ -38,7 +38,7 @@ test_expect_success 'init+fetch an SVN repository with included qqq directory' '
 	( cd c && git svn fetch --include-paths="qqq" ) &&
 	rm expect2 &&
 	echo test_qqq > expect &&
-	for i in c/*/*.txt; do cat $i >> expect2; done &&
+	for i in c/*/*.txt; do cat $i >> expect2 || return 1; done &&
 	test_cmp expect expect2
 '
 
@@ -64,7 +64,7 @@ test_expect_success 'update git svn-cloned repo (config include)' '
 		cd g &&
 		git svn rebase &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -75,7 +75,7 @@ test_expect_success 'update git svn-cloned repo (option include)' '
 		cd c &&
 		git svn rebase --include-paths="qqq" &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -96,7 +96,7 @@ test_expect_success 'update git svn-cloned repo (config include)' '
 		cd g &&
 		git svn rebase &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -107,7 +107,7 @@ test_expect_success 'update git svn-cloned repo (option include)' '
 		cd c &&
 		git svn rebase --include-paths="qqq" &&
 		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -129,7 +129,7 @@ test_expect_success 'update git svn-cloned repo again (config include)' '
 		cd g &&
 		git svn rebase &&
 		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
@@ -140,7 +140,7 @@ test_expect_success 'update git svn-cloned repo again (option include)' '
 		cd c &&
 		git svn rebase --include-paths="qqq" &&
 		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2; done &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
 		test_cmp expect2 expect &&
 		rm expect expect2
 	)
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 1fbe84feb1..c93a5beab2 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -5,9 +5,6 @@
 
 test_description='git-svn svn mergeinfo properties'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./lib-git-svn.sh
 
 test_expect_success 'load svn dump' "
diff --git a/t/t9152-svn-empty-dirs-after-gc.sh b/t/t9152-svn-empty-dirs-after-gc.sh
index 89f285d082..a597c42f77 100755
--- a/t/t9152-svn-empty-dirs-after-gc.sh
+++ b/t/t9152-svn-empty-dirs-after-gc.sh
@@ -8,7 +8,7 @@ test_description='git svn creates empty directories, calls git gc, makes sure th
 test_expect_success 'initialize repo' '
 	for i in a b c d d/e d/e/f "weird file name"
 	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i"
+		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
 	done
 '
 
diff --git a/t/t9167-git-svn-cmd-branch-subproject.sh b/t/t9167-git-svn-cmd-branch-subproject.sh
index ba35fc06fc..d9fd111c10 100755
--- a/t/t9167-git-svn-cmd-branch-subproject.sh
+++ b/t/t9167-git-svn-cmd-branch-subproject.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='git svn branch for subproject clones'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./lib-git-svn.sh
 
 test_expect_success 'initialize svnrepo' '
diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index f519e4f1bf..d8b1f9442e 100755
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 test_description='test git fast-import unpack limit'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success 'create loose objects on import' '
diff --git a/t/t9303-fast-import-compression.sh b/t/t9303-fast-import-compression.sh
index 57d916524e..4f5bf40587 100755
--- a/t/t9303-fast-import-compression.sh
+++ b/t/t9303-fast-import-compression.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 test_description='compression setting of fast-import utility'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 import_large () {
diff --git a/t/t9304-fast-import-marks.sh b/t/t9304-fast-import-marks.sh
index d4359dba21..bed01c99ea 100755
--- a/t/t9304-fast-import-marks.sh
+++ b/t/t9304-fast-import-marks.sh
@@ -16,7 +16,7 @@ test_expect_success 'setup large marks file' '
 	blob=$(git rev-parse HEAD:one.t) &&
 	for i in $(test_seq 1024 16384)
 	do
-		echo ":$i $blob"
+		echo ":$i $blob" || return 1
 	done >>marks
 '
 
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 409b48e244..7b7a18dd2c 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -750,4 +750,36 @@ test_expect_success 'merge commit gets exported with --import-marks' '
 	)
 '
 
+
+test_expect_success 'fast-export --first-parent outputs all revisions output by revision walk' '
+	git init first-parent &&
+	(
+		cd first-parent &&
+		test_commit A &&
+		git checkout -b topic1 &&
+		test_commit B &&
+		git checkout main &&
+		git merge --no-ff topic1 &&
+
+		git checkout -b topic2 &&
+		test_commit C &&
+		git checkout main &&
+		git merge --no-ff topic2 &&
+
+		test_commit D &&
+
+		git fast-export main -- --first-parent >first-parent-export &&
+		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
+		test_cmp first-parent-export first-parent-reverse-export &&
+
+		git init import &&
+		git -C import fast-import <first-parent-export &&
+
+		git log --format="%ad %s" --first-parent main >expected &&
+		git -C import log --format="%ad %s" --all >actual &&
+		test_cmp expected actual &&
+		test_line_count = 4 actual
+	)
+'
+
 test_done
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 17f988edd2..210ddf09e3 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -338,7 +338,7 @@ test_expect_success 'cvs update (subdirectories)' \
   '(for dir in A A/B A/B/C A/D E; do
       mkdir $dir &&
       echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
-      git add $dir
+      git add $dir || exit 1
    done) &&
    git commit -q -m "deep sub directory structure" &&
    git push gitcvs.git >/dev/null &&
@@ -350,10 +350,9 @@ test_expect_success 'cvs update (subdirectories)' \
 	test_cmp "$dir/$filename" "../$dir/$filename"; then
         :
       else
-        echo >failure
+	exit 1
       fi
-    done) &&
-   test ! -f failure'
+    done)'
 
 cd "$WORKDIR"
 test_expect_success 'cvs update (delete file)' \
@@ -382,7 +381,7 @@ test_expect_success 'cvs update (merge)' \
    for i in 1 2 3 4 5 6 7
    do
      echo Line $i >>merge &&
-     echo Line $i >>expected
+     echo Line $i >>expected || return 1
    done &&
    echo Line 8 >>expected &&
    git add merge &&
@@ -592,7 +591,7 @@ test_expect_success 'cvs annotate' '
     cd cvswork &&
     GIT_CONFIG="$git_config" cvs annotate merge >../out &&
     sed -e "s/ .*//" ../out >../actual &&
-    for i in 3 1 1 1 1 1 1 1 2 4; do echo 1.$i; done >../expect &&
+    printf "1.%d\n" 3 1 1 1 1 1 1 1 2 4 >../expect &&
     test_cmp ../expect ../actual
 '
 
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 0e9daa5768..19f38f78f2 100755
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -12,9 +12,6 @@
 # bug.
 
 test_description='git cvsimport testing for correct patchset estimation'
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./lib-cvs.sh
 
 setup_cvs_test_repository t9603
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 81bc8e8da1..806005a793 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -171,7 +171,7 @@ test_expect_success 'clone using non-numeric revision ranges' '
 			cd "$git" &&
 			git ls-files >lines &&
 			test_line_count = 8 lines
-		)
+		) || return 1
 	done
 '
 
diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index e3836888ec..5fe83315ec 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -4,6 +4,8 @@ test_description='git p4 rcs keywords'
 
 . ./lib-git-p4.sh
 
+CP1252="\223\224"
+
 test_expect_success 'start p4d' '
 	start_p4d
 '
@@ -32,6 +34,9 @@ test_expect_success 'init depot' '
 		p4 submit -d "filek" &&
 		p4 add -t text+ko fileko &&
 		p4 submit -d "fileko" &&
+		printf "$CP1252" >fileko_cp1252 &&
+		p4 add -t text+ko fileko_cp1252 &&
+		p4 submit -d "fileko_cp1252" &&
 		p4 add -t text file_text &&
 		p4 submit -d "file_text"
 	)
@@ -359,4 +364,14 @@ test_expect_failure 'Add keywords in git which do not match the default p4 value
 	)
 '
 
+test_expect_success 'check cp1252 smart quote are preserved through RCS keyword processing' '
+	test_when_finished cleanup_git &&
+	git p4 clone --dest="$git" //depot &&
+	(
+		cd "$git" &&
+		printf "$CP1252" >expect &&
+		test_cmp_bin expect fileko_cp1252
+	)
+'
+
 test_done
diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 0db7ab9918..de591d875c 100755
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -92,11 +92,11 @@ test_expect_success 'Add some more files' '
 	for i in $(test_seq 0 10)
 	do
 		p4_add_file "included/x$i" &&
-		p4_add_file "excluded/x$i"
+		p4_add_file "excluded/x$i" || return 1
 	done &&
 	for i in $(test_seq 0 10)
 	do
-		p4_add_file "excluded/y$i"
+		p4_add_file "excluded/y$i" || return 1
 	done
 '
 
@@ -123,7 +123,7 @@ test_expect_success 'Create a repo with multiple depot paths' '
 	do
 		for i in $(test_seq 1 10)
 		do
-			p4_add_file "$p/file$p$i"
+			p4_add_file "$p/file$p$i" || return 1
 		done
 	done
 '
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 5decc3b269..98c6280632 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -5,9 +5,6 @@
 
 test_description='test bash completion'
 
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
-export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-
 . ./lib-bash.sh
 
 complete ()
@@ -879,7 +876,7 @@ test_expect_success '__git_refs - unique remote branches for git checkout DWIMer
 		refs/remotes/remote/branch-in-remote
 	do
 		git update-ref $remote_ref main &&
-		test_when_finished "git update-ref -d $remote_ref"
+		test_when_finished "git update-ref -d $remote_ref" || return 1
 	done &&
 	(
 		cur= &&
@@ -1052,7 +1049,7 @@ test_expect_success '__git_refs - only matching refs - checkout DWIMery' '
 		refs/remotes/remote/branch-in-remote
 	do
 		git update-ref $remote_ref main &&
-		test_when_finished "git update-ref -d $remote_ref"
+		test_when_finished "git update-ref -d $remote_ref" || return 1
 	done &&
 	(
 		cur=mat &&
@@ -2148,6 +2145,9 @@ test_expect_success PERL 'send-email' '
 	--cover-from-description=Z
 	--cover-letter Z
 	EOF
+	test_completion "git send-email --val" <<-\EOF &&
+	--validate Z
+	EOF
 	test_completion "git send-email ma" "main "
 '
 
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index eef2262a36..c3d38aaccb 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -680,6 +680,17 @@ test_have_prereq () {
 			# Keep a list of missing prerequisites; restore
 			# the negative marker if necessary.
 			prerequisite=${negative_prereq:+!}$prerequisite
+
+			# Abort if this prereq was marked as required
+			if test -n "$GIT_TEST_REQUIRE_PREREQ"
+			then
+				case " $GIT_TEST_REQUIRE_PREREQ " in
+				*" $prerequisite "*)
+					BAIL_OUT "required prereq $prerequisite failed"
+					;;
+				esac
+			fi
+
 			if test -z "$missing_prereq"
 			then
 				missing_prereq=$prerequisite
@@ -1749,6 +1760,40 @@ test_subcommand () {
 }
 
 # Check that the given command was invoked as part of the
+# trace2-format trace on stdin, but without an exact set of
+# arguments.
+#
+#	test_subcommand [!] <command> <args>... < <trace>
+#
+# For example, to look for an invocation of "git pack-objects"
+# with the "--honor-pack-keep" argument, use
+#
+#	GIT_TRACE2_EVENT=event.log git repack ... &&
+#	test_subcommand git pack-objects --honor-pack-keep <event.log
+#
+# If the first parameter passed is !, this instead checks that
+# the given command was not called.
+#
+test_subcommand_inexact () {
+	local negate=
+	if test "$1" = "!"
+	then
+		negate=t
+		shift
+	fi
+
+	local expr=$(printf '"%s".*' "$@")
+	expr="${expr%,}"
+
+	if test -n "$negate"
+	then
+		! grep "\"event\":\"child_start\".*\[$expr\]"
+	else
+		grep "\"event\":\"child_start\".*\[$expr\]"
+	fi
+}
+
+# Check that the given command was invoked as part of the
 # trace2-format trace on stdin.
 #
 #	test_region [!] <category> <label> git <command> <args>...
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 2679a7596a..0f7a137c7d 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -476,6 +476,13 @@ export GIT_TEST_MERGE_ALGORITHM
 GIT_TRACE_BARE=1
 export GIT_TRACE_BARE
 
+# Some tests scan the GIT_TRACE2_EVENT feed for events, but the
+# default depth is 2, which frequently causes issues when the
+# events are wrapped in new regions. Set it to a sufficiently
+# large depth to avoid custom changes in the test suite.
+GIT_TRACE2_EVENT_NESTING=100
+export GIT_TRACE2_EVENT_NESTING
+
 # Use specific version of the index file format
 if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
 then
@@ -489,6 +496,13 @@ then
 	export GIT_PERL_FATAL_WARNINGS
 fi
 
+case $GIT_TEST_FSYNC in
+'')
+	GIT_TEST_FSYNC=0
+	export GIT_TEST_FSYNC
+	;;
+esac
+
 # Add libc MALLOC and MALLOC_PERTURB test
 # only if we are not executing the test with valgrind
 if test -n "$valgrind" ||
@@ -589,6 +603,15 @@ USER_TERM="$TERM"
 TERM=dumb
 export TERM USER_TERM
 
+# What is written by tests to stdout and stderr is sent to different places
+# depending on the test mode (e.g. /dev/null in non-verbose mode, piped to tee
+# with --tee option, etc.). We save the original stdin to FD #6 and stdout and
+# stderr to #5 and #7, so that the test framework can use them (e.g. for
+# printing errors within the test framework) independently of the test mode.
+exec 5>&1
+exec 6<&0
+exec 7>&2
+
 _error_exit () {
 	finalize_junit_xml
 	GIT_EXIT_OK=t
@@ -612,7 +635,7 @@ BAIL_OUT () {
 	local bail_out="Bail out! "
 	local message="$1"
 
-	say_color error $bail_out "$message"
+	say_color >&5 error $bail_out "$message"
 	_error_exit
 }
 
@@ -637,9 +660,6 @@ then
 	exit 0
 fi
 
-exec 5>&1
-exec 6<&0
-exec 7>&2
 if test "$verbose_log" = "t"
 then
 	exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3
@@ -669,6 +689,8 @@ test_fixed=0
 test_broken=0
 test_success=0
 
+test_missing_prereq=
+
 test_external_has_tap=0
 
 die () {
@@ -1069,6 +1091,14 @@ test_skip () {
 			of_prereq=" of $test_prereq"
 		fi
 		skipped_reason="missing $missing_prereq${of_prereq}"
+
+		# Keep a list of all the missing prereq for result aggregation
+		if test -z "$missing_prereq"
+		then
+			test_missing_prereq=$missing_prereq
+		else
+			test_missing_prereq="$test_missing_prereq,$missing_prereq"
+		fi
 	fi
 
 	case "$to_skip" in
@@ -1175,6 +1205,7 @@ test_done () {
 		fixed $test_fixed
 		broken $test_broken
 		failed $test_failure
+		missing_prereq $test_missing_prereq
 
 		EOF
 	fi
@@ -1734,6 +1765,10 @@ build_option () {
 	sed -ne "s/^$1: //p"
 }
 
+test_lazy_prereq SIZE_T_IS_64BIT '
+	test 8 -eq "$(build_option sizeof-size_t)"
+'
+
 test_lazy_prereq LONG_IS_64BIT '
 	test 8 -le "$(build_option sizeof-long)"
 '
diff --git a/tag.c b/tag.c
index 3e18a41841..dfbcd7fcc2 100644
--- a/tag.c
+++ b/tag.c
@@ -25,8 +25,9 @@ static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
 		return error("no signature found");
 	}
 
-	ret = check_signature(payload.buf, payload.len, signature.buf,
-				signature.len, &sigc);
+	sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
+	sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
+	ret = check_signature(&sigc, signature.buf, signature.len);
 
 	if (!(flags & GPG_VERIFY_OMIT_STATUS))
 		print_signature_buffer(&sigc, flags);
diff --git a/tmp-objdir.c b/tmp-objdir.c
index b8d880e362..3d38eeab66 100644
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "tmp-objdir.h"
+#include "chdir-notify.h"
 #include "dir.h"
 #include "sigchain.h"
 #include "string-list.h"
@@ -11,6 +12,8 @@
 struct tmp_objdir {
 	struct strbuf path;
 	struct strvec env;
+	struct object_directory *prev_odb;
+	int will_destroy;
 };
 
 /*
@@ -38,6 +41,9 @@ static int tmp_objdir_destroy_1(struct tmp_objdir *t, int on_signal)
 	if (t == the_tmp_objdir)
 		the_tmp_objdir = NULL;
 
+	if (!on_signal && t->prev_odb)
+		restore_primary_odb(t->prev_odb, t->path.buf);
+
 	/*
 	 * This may use malloc via strbuf_grow(), but we should
 	 * have pre-grown t->path sufficiently so that this
@@ -52,6 +58,7 @@ static int tmp_objdir_destroy_1(struct tmp_objdir *t, int on_signal)
 	 */
 	if (!on_signal)
 		tmp_objdir_free(t);
+
 	return err;
 }
 
@@ -121,7 +128,7 @@ static int setup_tmp_objdir(const char *root)
 	return ret;
 }
 
-struct tmp_objdir *tmp_objdir_create(void)
+struct tmp_objdir *tmp_objdir_create(const char *prefix)
 {
 	static int installed_handlers;
 	struct tmp_objdir *t;
@@ -129,11 +136,16 @@ struct tmp_objdir *tmp_objdir_create(void)
 	if (the_tmp_objdir)
 		BUG("only one tmp_objdir can be used at a time");
 
-	t = xmalloc(sizeof(*t));
+	t = xcalloc(1, sizeof(*t));
 	strbuf_init(&t->path, 0);
 	strvec_init(&t->env);
 
-	strbuf_addf(&t->path, "%s/incoming-XXXXXX", get_object_directory());
+	/*
+	 * Use a string starting with tmp_ so that the builtin/prune.c code
+	 * can recognize any stale objdirs left behind by a crash and delete
+	 * them.
+	 */
+	strbuf_addf(&t->path, "%s/tmp_objdir-%s-XXXXXX", get_object_directory(), prefix);
 
 	/*
 	 * Grow the strbuf beyond any filename we expect to be placed in it.
@@ -269,6 +281,13 @@ int tmp_objdir_migrate(struct tmp_objdir *t)
 	if (!t)
 		return 0;
 
+	if (t->prev_odb) {
+		if (the_repository->objects->odb->will_destroy)
+			BUG("migrating an ODB that was marked for destruction");
+		restore_primary_odb(t->prev_odb, t->path.buf);
+		t->prev_odb = NULL;
+	}
+
 	strbuf_addbuf(&src, &t->path);
 	strbuf_addstr(&dst, get_object_directory());
 
@@ -292,3 +311,33 @@ void tmp_objdir_add_as_alternate(const struct tmp_objdir *t)
 {
 	add_to_alternates_memory(t->path.buf);
 }
+
+void tmp_objdir_replace_primary_odb(struct tmp_objdir *t, int will_destroy)
+{
+	if (t->prev_odb)
+		BUG("the primary object database is already replaced");
+	t->prev_odb = set_temporary_primary_odb(t->path.buf, will_destroy);
+	t->will_destroy = will_destroy;
+}
+
+struct tmp_objdir *tmp_objdir_unapply_primary_odb(void)
+{
+	if (!the_tmp_objdir || !the_tmp_objdir->prev_odb)
+		return NULL;
+
+	restore_primary_odb(the_tmp_objdir->prev_odb, the_tmp_objdir->path.buf);
+	the_tmp_objdir->prev_odb = NULL;
+	return the_tmp_objdir;
+}
+
+void tmp_objdir_reapply_primary_odb(struct tmp_objdir *t, const char *old_cwd,
+		const char *new_cwd)
+{
+	char *path;
+
+	path = reparent_relative_path(old_cwd, new_cwd, t->path.buf);
+	strbuf_reset(&t->path);
+	strbuf_addstr(&t->path, path);
+	free(path);
+	tmp_objdir_replace_primary_odb(t, t->will_destroy);
+}
diff --git a/tmp-objdir.h b/tmp-objdir.h
index b1e45b4c75..cda5ec7677 100644
--- a/tmp-objdir.h
+++ b/tmp-objdir.h
@@ -10,7 +10,7 @@
  *
  * Example:
  *
- *	struct tmp_objdir *t = tmp_objdir_create();
+ *	struct tmp_objdir *t = tmp_objdir_create("incoming");
  *	if (!run_command_v_opt_cd_env(cmd, 0, NULL, tmp_objdir_env(t)) &&
  *	    !tmp_objdir_migrate(t))
  *		printf("success!\n");
@@ -22,9 +22,10 @@
 struct tmp_objdir;
 
 /*
- * Create a new temporary object directory; returns NULL on failure.
+ * Create a new temporary object directory with the specified prefix;
+ * returns NULL on failure.
  */
-struct tmp_objdir *tmp_objdir_create(void);
+struct tmp_objdir *tmp_objdir_create(const char *prefix);
 
 /*
  * Return a list of environment strings, suitable for use with
@@ -51,4 +52,26 @@ int tmp_objdir_destroy(struct tmp_objdir *);
  */
 void tmp_objdir_add_as_alternate(const struct tmp_objdir *);
 
+/*
+ * Replaces the writable object store in the current process with the temporary
+ * object directory and makes the former main object store an alternate.
+ * If will_destroy is nonzero, the object directory may not be migrated.
+ */
+void tmp_objdir_replace_primary_odb(struct tmp_objdir *, int will_destroy);
+
+/*
+ * If the primary object database was replaced by a temporary object directory,
+ * restore it to its original value while keeping the directory contents around.
+ * Returns NULL if the primary object database was not replaced.
+ */
+struct tmp_objdir *tmp_objdir_unapply_primary_odb(void);
+
+/*
+ * Reapplies the former primary temporary object database, after potentially
+ * changing its relative path.
+ */
+void tmp_objdir_reapply_primary_odb(struct tmp_objdir *, const char *old_cwd,
+		const char *new_cwd);
+
+
 #endif /* TMP_OBJDIR_H */
diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
index bda283e7f4..8a21dd2972 100644
--- a/trace2/tr2_dst.c
+++ b/trace2/tr2_dst.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "sigchain.h"
 #include "trace2/tr2_dst.h"
 #include "trace2/tr2_sid.h"
 #include "trace2/tr2_sysenv.h"
@@ -360,6 +361,7 @@ int tr2_dst_trace_want(struct tr2_dst *dst)
 void tr2_dst_write_line(struct tr2_dst *dst, struct strbuf *buf_line)
 {
 	int fd = tr2_dst_get_trace_fd(dst);
+	ssize_t bytes;
 
 	strbuf_complete_line(buf_line); /* ensure final NL on buffer */
 
@@ -378,12 +380,15 @@ void tr2_dst_write_line(struct tr2_dst *dst, struct strbuf *buf_line)
 	 *
 	 * If we get an IO error, just close the trace dst.
 	 */
-	if (write(fd, buf_line->buf, buf_line->len) >= 0)
+	sigchain_push(SIGPIPE, SIG_IGN);
+	bytes = write(fd, buf_line->buf, buf_line->len);
+	sigchain_pop(SIGPIPE);
+	if (bytes >= 0)
 		return;
 
+	tr2_dst_trace_disable(dst);
 	if (tr2_dst_want_warning())
 		warning("unable to write trace to '%s': %s",
 			tr2_sysenv_display_name(dst->sysenv_var),
 			strerror(errno));
-	tr2_dst_trace_disable(dst);
 }
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index 3a0014417c..bd17ecdc32 100644
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -354,7 +354,7 @@ static void fn_child_start_fl(const char *file, int line,
 	jw_object_inline_begin_array(&jw, "argv");
 	if (cmd->git_cmd)
 		jw_array_string(&jw, "git");
-	jw_array_argv(&jw, cmd->argv);
+	jw_array_argv(&jw, cmd->args.v);
 	jw_end(&jw);
 	jw_end(&jw);
 
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 58d9e430f0..6e429a3fb9 100644
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -232,7 +232,7 @@ static void fn_child_start_fl(const char *file, int line,
 	strbuf_addch(&buf_payload, ' ');
 	if (cmd->git_cmd)
 		strbuf_addstr(&buf_payload, "git ");
-	sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+	sq_append_quote_argv_pretty(&buf_payload, cmd->args.v);
 
 	normal_io_write_fl(file, line, &buf_payload);
 	strbuf_release(&buf_payload);
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index e4acca13d6..2ff9cf7083 100644
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -335,10 +335,10 @@ static void fn_child_start_fl(const char *file, int line,
 	strbuf_addstr(&buf_payload, " argv:[");
 	if (cmd->git_cmd) {
 		strbuf_addstr(&buf_payload, "git");
-		if (cmd->argv[0])
+		if (cmd->args.nr)
 			strbuf_addch(&buf_payload, ' ');
 	}
-	sq_append_quote_argv_pretty(&buf_payload, cmd->argv);
+	sq_append_quote_argv_pretty(&buf_payload, cmd->args.v);
 	strbuf_addch(&buf_payload, ']');
 
 	perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute,
diff --git a/trailer.c b/trailer.c
index 7c7cb61a94..1b12f77d94 100644
--- a/trailer.c
+++ b/trailer.c
@@ -236,7 +236,7 @@ static char *apply_command(struct conf_info *conf, const char *arg)
 			strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
 		strvec_push(&cp.args, cmd.buf);
 	}
-	cp.env = local_repo_env;
+	strvec_pushv(&cp.env_array, (const char **)local_repo_env);
 	cp.no_stdin = 1;
 	cp.use_shell = 1;
 
diff --git a/transport.c b/transport.c
index e4f1decae2..2a3e324154 100644
--- a/transport.c
+++ b/transport.c
@@ -1204,16 +1204,15 @@ static int run_pre_push_hook(struct transport *transport,
 	struct ref *r;
 	struct child_process proc = CHILD_PROCESS_INIT;
 	struct strbuf buf;
-	const char *argv[4];
+	const char *hook_path = find_hook("pre-push");
 
-	if (!(argv[0] = find_hook("pre-push")))
+	if (!hook_path)
 		return 0;
 
-	argv[1] = transport->remote->name;
-	argv[2] = transport->url;
-	argv[3] = NULL;
+	strvec_push(&proc.args, hook_path);
+	strvec_push(&proc.args, transport->remote->name);
+	strvec_push(&proc.args, transport->url);
 
-	proc.argv = argv;
 	proc.in = -1;
 	proc.trace2_hook_name = "pre-push";
 
@@ -1457,13 +1456,18 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
 	return rc;
 }
 
-void transport_unlock_pack(struct transport *transport)
+void transport_unlock_pack(struct transport *transport, unsigned int flags)
 {
+	int in_signal_handler = !!(flags & TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER);
 	int i;
 
 	for (i = 0; i < transport->pack_lockfiles.nr; i++)
-		unlink_or_warn(transport->pack_lockfiles.items[i].string);
-	string_list_clear(&transport->pack_lockfiles, 0);
+		if (in_signal_handler)
+			unlink(transport->pack_lockfiles.items[i].string);
+		else
+			unlink_or_warn(transport->pack_lockfiles.items[i].string);
+	if (!in_signal_handler)
+		string_list_clear(&transport->pack_lockfiles, 0);
 }
 
 int transport_connect(struct transport *transport, const char *name,
diff --git a/transport.h b/transport.h
index 8bb4c8bbc8..3f16e50c19 100644
--- a/transport.h
+++ b/transport.h
@@ -279,7 +279,19 @@ const struct ref *transport_get_remote_refs(struct transport *transport,
  */
 const struct git_hash_algo *transport_get_hash_algo(struct transport *transport);
 int transport_fetch_refs(struct transport *transport, struct ref *refs);
-void transport_unlock_pack(struct transport *transport);
+
+/*
+ * If this flag is set, unlocking will avoid to call non-async-signal-safe
+ * functions. This will necessarily leave behind some data structures which
+ * cannot be cleaned up.
+ */
+#define TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER (1 << 0)
+
+/*
+ * Unlock all packfiles locked by the transport.
+ */
+void transport_unlock_pack(struct transport *transport, unsigned int flags);
+
 int transport_disconnect(struct transport *transport);
 char *transport_anonymize_url(const char *url);
 void transport_take_over(struct transport *transport,
diff --git a/tree-diff.c b/tree-diff.c
index 437c98a70e..69031d7cba 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -603,8 +603,7 @@ static void try_to_follow_renames(const struct object_id *old_oid,
 	 * about dry-run mode and returns wildcard info.
 	 */
 	if (opt->pathspec.has_wildcard)
-		die("BUG:%s:%d: wildcards are not supported",
-		    __FILE__, __LINE__);
+		BUG("wildcards are not supported");
 #endif
 
 	/* Remove the file creation entry from the diff queue, and remember it */
diff --git a/unpack-trees.c b/unpack-trees.c
index 89ca95ce90..360844bda3 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -36,6 +36,9 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
 	/* ERROR_NOT_UPTODATE_DIR */
 	"Updating '%s' would lose untracked files in it",
 
+	/* ERROR_CWD_IN_THE_WAY */
+	"Refusing to remove '%s' since it is the current working directory.",
+
 	/* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
 	"Untracked working tree file '%s' would be overwritten by merge.",
 
@@ -131,6 +134,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	msgs[ERROR_NOT_UPTODATE_DIR] =
 		_("Updating the following directories would lose untracked files in them:\n%s");
 
+	msgs[ERROR_CWD_IN_THE_WAY] =
+		_("Refusing to remove the current working directory:\n%s");
+
 	if (!strcmp(cmd, "checkout"))
 		msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
 		      ? _("The following untracked working tree files would be removed by checkout:\n%%s"
@@ -645,17 +651,24 @@ static void mark_ce_used_same_name(struct cache_entry *ce,
 	}
 }
 
-static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
+static struct cache_entry *next_cache_entry(struct unpack_trees_options *o, int *hint)
 {
 	const struct index_state *index = o->src_index;
 	int pos = o->cache_bottom;
 
+	if (*hint > pos)
+		pos = *hint;
+
 	while (pos < index->cache_nr) {
 		struct cache_entry *ce = index->cache[pos];
-		if (!(ce->ce_flags & CE_UNPACKED))
+		if (!(ce->ce_flags & CE_UNPACKED)) {
+			*hint = pos + 1;
 			return ce;
+		}
 		pos++;
 	}
+
+	*hint = pos;
 	return NULL;
 }
 
@@ -1231,7 +1244,9 @@ static int find_cache_pos(struct traverse_info *info,
 
 /*
  * Given a sparse directory entry 'ce', compare ce->name to
- * info->name + '/' + p->path + '/' if info->name is non-empty.
+ * info->traverse_path + p->path + '/' if info->traverse_path
+ * is non-empty.
+ *
  * Compare ce->name to p->path + '/' otherwise. Note that
  * ce->name must end in a trailing '/' because it is a sparse
  * directory entry.
@@ -1243,11 +1258,11 @@ static int sparse_dir_matches_path(const struct cache_entry *ce,
 	assert(S_ISSPARSEDIR(ce->ce_mode));
 	assert(ce->name[ce->ce_namelen - 1] == '/');
 
-	if (info->namelen)
-		return ce->ce_namelen == info->namelen + p->pathlen + 2 &&
-		       ce->name[info->namelen] == '/' &&
-		       !strncmp(ce->name, info->name, info->namelen) &&
-		       !strncmp(ce->name + info->namelen + 1, p->path, p->pathlen);
+	if (info->pathlen)
+		return ce->ce_namelen == info->pathlen + p->pathlen + 1 &&
+		       ce->name[info->pathlen - 1] == '/' &&
+		       !strncmp(ce->name, info->traverse_path, info->pathlen) &&
+		       !strncmp(ce->name + info->pathlen, p->path, p->pathlen);
 	return ce->ce_namelen == p->pathlen + 1 &&
 	       !strncmp(ce->name, p->path, p->pathlen);
 }
@@ -1365,12 +1380,13 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
 
 	/* Are we supposed to look at the index too? */
 	if (o->merge) {
+		int hint = -1;
 		while (1) {
 			int cmp;
 			struct cache_entry *ce;
 
 			if (o->diff_index_cached)
-				ce = next_cache_entry(o);
+				ce = next_cache_entry(o, &hint);
 			else
 				ce = find_cache_entry(info, p);
 
@@ -1690,7 +1706,7 @@ static int verify_absent(const struct cache_entry *,
 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
 {
 	struct repository *repo = the_repository;
-	int i, ret;
+	int i, hint, ret;
 	static struct cache_entry *dfc;
 	struct pattern_list pl;
 	int free_pattern_list = 0;
@@ -1779,13 +1795,15 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		info.pathspec = o->pathspec;
 
 		if (o->prefix) {
+			hint = -1;
+
 			/*
 			 * Unpack existing index entries that sort before the
 			 * prefix the tree is spliced into.  Note that o->merge
 			 * is always true in this case.
 			 */
 			while (1) {
-				struct cache_entry *ce = next_cache_entry(o);
+				struct cache_entry *ce = next_cache_entry(o, &hint);
 				if (!ce)
 					break;
 				if (ce_in_traverse_path(ce, &info))
@@ -1806,8 +1824,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 
 	/* Any left-over entries in the index? */
 	if (o->merge) {
+		hint = -1;
 		while (1) {
-			struct cache_entry *ce = next_cache_entry(o);
+			struct cache_entry *ce = next_cache_entry(o, &hint);
 			if (!ce)
 				break;
 			if (unpack_index_entry(ce, o) < 0)
@@ -2146,10 +2165,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
 		cnt++;
 	}
 
-	/*
-	 * Then we need to make sure that we do not lose a locally
-	 * present file that is not ignored.
-	 */
+	/* Do not lose a locally present file that is not ignored. */
 	pathbuf = xstrfmt("%.*s/", namelen, ce->name);
 
 	memset(&d, 0, sizeof(d));
@@ -2160,6 +2176,12 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
 	free(pathbuf);
 	if (i)
 		return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
+
+	/* Do not lose startup_info->original_cwd */
+	if (startup_info->original_cwd &&
+	    !strcmp(startup_info->original_cwd, ce->name))
+		return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, ce->name);
+
 	return cnt;
 }
 
@@ -2252,10 +2274,19 @@ static int verify_absent_1(const struct cache_entry *ce,
 	int len;
 	struct stat st;
 
-	if (o->index_only || !o->update ||
-	    o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED)
+	if (o->index_only || !o->update)
 		return 0;
 
+	if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED) {
+		/* Avoid nuking startup_info->original_cwd... */
+		if (startup_info->original_cwd &&
+		    !strcmp(startup_info->original_cwd, ce->name))
+			return add_rejected_path(o, ERROR_CWD_IN_THE_WAY,
+						 ce->name);
+		/* ...but nuke anything else. */
+		return 0;
+	}
+
 	len = check_leading_path(ce->name, ce_namelen(ce), 0);
 	if (!len)
 		return 0;
diff --git a/unpack-trees.h b/unpack-trees.h
index 71ffb7eeb0..efb9edfbb2 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -19,6 +19,7 @@ enum unpack_trees_error_types {
 	ERROR_WOULD_OVERWRITE = 0,
 	ERROR_NOT_UPTODATE_FILE,
 	ERROR_NOT_UPTODATE_DIR,
+	ERROR_CWD_IN_THE_WAY,
 	ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
 	ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
 	ERROR_BIND_OVERLAP,
diff --git a/upload-pack.c b/upload-pack.c
index c78d55bc67..8acc98741b 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -194,7 +194,13 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 }
 
 struct output_state {
-	char buffer[8193];
+	/*
+	 * We do writes no bigger than LARGE_PACKET_DATA_MAX - 1, because with
+	 * sideband-64k the band designator takes up 1 byte of space. Because
+	 * relay_pack_data keeps the last byte to itself, we make the buffer 1
+	 * byte bigger than the intended maximum write size.
+	 */
+	char buffer[(LARGE_PACKET_DATA_MAX - 1) + 1];
 	int used;
 	unsigned packfile_uris_started : 1;
 	unsigned packfile_started : 1;
@@ -269,7 +275,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
 			     const struct string_list *uri_protocols)
 {
 	struct child_process pack_objects = CHILD_PROCESS_INIT;
-	struct output_state output_state = { { 0 } };
+	struct output_state *output_state = xcalloc(1, sizeof(struct output_state));
 	char progress[128];
 	char abort_msg[] = "aborting due to possible repository "
 		"corruption on the remote side.";
@@ -404,7 +410,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
 		}
 		if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
 			int result = relay_pack_data(pack_objects.out,
-						     &output_state,
+						     output_state,
 						     pack_data->use_sideband,
 						     !!uri_protocols);
 
@@ -438,11 +444,12 @@ static void create_pack_file(struct upload_pack_data *pack_data,
 	}
 
 	/* flush the data */
-	if (output_state.used > 0) {
-		send_client_data(1, output_state.buffer, output_state.used,
+	if (output_state->used > 0) {
+		send_client_data(1, output_state->buffer, output_state->used,
 				 pack_data->use_sideband);
 		fprintf(stderr, "flushed.\n");
 	}
+	free(output_state);
 	if (pack_data->use_sideband)
 		packet_flush(1);
 	return;
@@ -596,14 +603,11 @@ static int do_reachable_revlist(struct child_process *cmd,
 				struct object_array *reachable,
 				enum allow_uor allow_uor)
 {
-	static const char *argv[] = {
-		"rev-list", "--stdin", NULL,
-	};
 	struct object *o;
 	FILE *cmd_in = NULL;
 	int i;
 
-	cmd->argv = argv;
+	strvec_pushl(&cmd->args, "rev-list", "--stdin", NULL);
 	cmd->git_cmd = 1;
 	cmd->no_stderr = 1;
 	cmd->in = -1;
diff --git a/urlmatch.c b/urlmatch.c
index 33a2ccd306..03ad3f30a9 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -5,7 +5,7 @@
 #define URL_DIGIT "0123456789"
 #define URL_ALPHADIGIT URL_ALPHA URL_DIGIT
 #define URL_SCHEME_CHARS URL_ALPHADIGIT "+.-"
-#define URL_HOST_CHARS URL_ALPHADIGIT ".-[:]" /* IPv6 literals need [:] */
+#define URL_HOST_CHARS URL_ALPHADIGIT ".-_[:]" /* IPv6 literals need [:] */
 #define URL_UNSAFE_CHARS " <>\"%{}|\\^`" /* plus 0x00-0x1F,0x7F-0xFF */
 #define URL_GEN_RESERVED ":/?#[]@"
 #define URL_SUB_RESERVED "!$&'()*+,;="
diff --git a/usage.c b/usage.c
index c7d233b0de..9943dd8742 100644
--- a/usage.c
+++ b/usage.c
@@ -6,7 +6,7 @@
 #include "git-compat-util.h"
 #include "cache.h"
 
-void vreportf(const char *prefix, const char *err, va_list params)
+static void vreportf(const char *prefix, const char *err, va_list params)
 {
 	char msg[4096];
 	char *p, *pend = msg + sizeof(msg);
@@ -55,6 +55,12 @@ static NORETURN void usage_builtin(const char *err, va_list params)
 	exit(129);
 }
 
+static void die_message_builtin(const char *err, va_list params)
+{
+	trace2_cmd_error_va(err, params);
+	vreportf("fatal: ", err, params);
+}
+
 /*
  * We call trace2_cmd_error_va() in the below functions first and
  * expect it to va_copy 'params' before using it (because an 'ap' can
@@ -62,10 +68,9 @@ static NORETURN void usage_builtin(const char *err, va_list params)
  */
 static NORETURN void die_builtin(const char *err, va_list params)
 {
-	trace2_cmd_error_va(err, params);
-
-	vreportf("fatal: ", err, params);
+	report_fn die_message_fn = get_die_message_routine();
 
+	die_message_fn(err, params);
 	exit(128);
 }
 
@@ -109,6 +114,7 @@ static int die_is_recursing_builtin(void)
  * (ugh), so keep things static. */
 static NORETURN_PTR report_fn usage_routine = usage_builtin;
 static NORETURN_PTR report_fn die_routine = die_builtin;
+static report_fn die_message_routine = die_message_builtin;
 static report_fn error_routine = error_builtin;
 static report_fn warn_routine = warn_builtin;
 static int (*die_is_recursing)(void) = die_is_recursing_builtin;
@@ -118,6 +124,11 @@ void set_die_routine(NORETURN_PTR report_fn routine)
 	die_routine = routine;
 }
 
+report_fn get_die_message_routine(void)
+{
+	return die_message_routine;
+}
+
 void set_error_routine(report_fn routine)
 {
 	error_routine = routine;
@@ -211,6 +222,29 @@ void NORETURN die_errno(const char *fmt, ...)
 	va_end(params);
 }
 
+#undef die_message
+int die_message(const char *err, ...)
+{
+	va_list params;
+
+	va_start(params, err);
+	die_message_routine(err, params);
+	va_end(params);
+	return 128;
+}
+
+#undef die_message_errno
+int die_message_errno(const char *fmt, ...)
+{
+	char buf[1024];
+	va_list params;
+
+	va_start(params, fmt);
+	die_message_routine(fmt_with_err(buf, sizeof(buf), fmt), params);
+	va_end(params);
+	return 128;
+}
+
 #undef error_errno
 int error_errno(const char *fmt, ...)
 {
diff --git a/worktree.c b/worktree.c
index 092a4f92ad..6f598dcfcd 100644
--- a/worktree.c
+++ b/worktree.c
@@ -28,11 +28,13 @@ static void add_head_info(struct worktree *wt)
 {
 	int flags;
 	const char *target;
+	int ignore_errno;
 
 	target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt),
 					 "HEAD",
 					 0,
-					 &wt->head_oid, &flags);
+					 &wt->head_oid, &flags,
+					 &ignore_errno);
 	if (!target)
 		return;
 
@@ -402,22 +404,19 @@ int is_worktree_being_bisected(const struct worktree *wt,
  * bisect). New commands that do similar things should update this
  * function as well.
  */
-const struct worktree *find_shared_symref(const char *symref,
+const struct worktree *find_shared_symref(struct worktree **worktrees,
+					  const char *symref,
 					  const char *target)
 {
 	const struct worktree *existing = NULL;
-	static struct worktree **worktrees;
 	int i = 0;
 
-	if (worktrees)
-		free_worktrees(worktrees);
-	worktrees = get_worktrees();
-
 	for (i = 0; worktrees[i]; i++) {
 		struct worktree *wt = worktrees[i];
 		const char *symref_target;
 		struct ref_store *refs;
 		int flags;
+		int ignore_errno;
 
 		if (wt->is_bare)
 			continue;
@@ -435,7 +434,8 @@ const struct worktree *find_shared_symref(const char *symref,
 
 		refs = get_worktree_ref_store(wt);
 		symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
-							NULL, &flags);
+							NULL, &flags,
+							&ignore_errno);
 		if ((flags & REF_ISSYMREF) &&
 		    symref_target && !strcmp(symref_target, target)) {
 			existing = wt;
@@ -563,16 +563,17 @@ int other_head_refs(each_ref_fn fn, void *cb_data)
 		struct worktree *wt = *p;
 		struct object_id oid;
 		int flag;
+		int ignore_errno;
 
 		if (wt->is_current)
 			continue;
 
 		strbuf_reset(&refname);
 		strbuf_worktree_ref(wt, &refname, "HEAD");
-		if (!refs_read_ref_full(get_main_ref_store(the_repository),
-					refname.buf,
-					RESOLVE_REF_READING,
-					&oid, &flag))
+		if (refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
+					    refname.buf,
+					    RESOLVE_REF_READING,
+					    &oid, &flag, &ignore_errno))
 			ret = fn(refname.buf, &oid, flag, cb_data);
 		if (ret)
 			break;
diff --git a/worktree.h b/worktree.h
index 8b7c408132..9e06fcbdf3 100644
--- a/worktree.h
+++ b/worktree.h
@@ -143,9 +143,10 @@ void free_worktrees(struct worktree **);
 /*
  * Check if a per-worktree symref points to a ref in the main worktree
  * or any linked worktree, and return the worktree that holds the ref,
- * or NULL otherwise. The result may be destroyed by the next call.
+ * or NULL otherwise.
  */
-const struct worktree *find_shared_symref(const char *symref,
+const struct worktree *find_shared_symref(struct worktree **worktrees,
+					  const char *symref,
 					  const char *target);
 
 /*
diff --git a/write-or-die.c b/write-or-die.c
index 0b1ec8190b..a3d5784cec 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "run-command.h"
 
 /*
@@ -57,6 +58,10 @@ void fprintf_or_die(FILE *f, const char *fmt, ...)
 
 void fsync_or_die(int fd, const char *msg)
 {
+	if (use_fsync < 0)
+		use_fsync = git_env_bool("GIT_TEST_FSYNC", 1);
+	if (!use_fsync)
+		return;
 	while (fsync(fd) < 0) {
 		if (errno != EINTR)
 			die_errno("fsync error on '%s'", msg);
diff --git a/wt-status.c b/wt-status.c
index e4f29b2b4c..335e723a71 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -948,11 +948,17 @@ static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
 	return 0;
 }
 
+static int count_stash_entries(void)
+{
+	int n = 0;
+	for_each_reflog_ent("refs/stash", stash_count_refs, &n);
+	return n;
+}
+
 static void wt_longstatus_print_stash_summary(struct wt_status *s)
 {
-	int stash_count = 0;
+	int stash_count = count_stash_entries();
 
-	for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
 	if (stash_count > 0)
 		status_printf_ln(s, GIT_COLOR_NORMAL,
 				 Q_("Your stash currently has %d entry",
@@ -1212,17 +1218,23 @@ static void show_merge_in_progress(struct wt_status *s,
 static void show_am_in_progress(struct wt_status *s,
 				const char *color)
 {
+	int am_empty_patch;
+
 	status_printf_ln(s, color,
 		_("You are in the middle of an am session."));
 	if (s->state.am_empty_patch)
 		status_printf_ln(s, color,
 			_("The current patch is empty."));
 	if (s->hints) {
-		if (!s->state.am_empty_patch)
+		am_empty_patch = s->state.am_empty_patch;
+		if (!am_empty_patch)
 			status_printf_ln(s, color,
 				_("  (fix conflicts and then run \"git am --continue\")"));
 		status_printf_ln(s, color,
 			_("  (use \"git am --skip\" to skip this patch)"));
+		if (am_empty_patch)
+			status_printf_ln(s, color,
+				_("  (use \"git am --allow-empty\" to record this patch as an empty commit)"));
 		status_printf_ln(s, color,
 			_("  (use \"git am --abort\" to restore the original branch)"));
 	}
@@ -2177,6 +2189,18 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
 }
 
 /*
+ * Print the stash count in a porcelain-friendly format
+ */
+static void wt_porcelain_v2_print_stash(struct wt_status *s)
+{
+	int stash_count = count_stash_entries();
+	char eol = s->null_termination ? '\0' : '\n';
+
+	if (stash_count > 0)
+		fprintf(s->fp, "# stash %d%c", stash_count, eol);
+}
+
+/*
  * Convert various submodule status values into a
  * fixed-length string of characters in the buffer provided.
  */
@@ -2437,6 +2461,9 @@ static void wt_porcelain_v2_print(struct wt_status *s)
 	if (s->show_branch)
 		wt_porcelain_v2_print_tracking(s);
 
+	if (s->show_stash)
+		wt_porcelain_v2_print_stash(s);
+
 	for (i = 0; i < s->change.nr; i++) {
 		it = &(s->change.items[i]);
 		d = it->util;
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 75b32aef51..2e3a5a2943 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -313,6 +313,8 @@ int git_xmerge_config(const char *var, const char *value, void *cb)
 			die("'%s' is not a boolean", var);
 		if (!strcmp(value, "diff3"))
 			git_xmerge_style = XDL_MERGE_DIFF3;
+		else if (!strcmp(value, "zdiff3"))
+			git_xmerge_style = XDL_MERGE_ZEALOUS_DIFF3;
 		else if (!strcmp(value, "merge"))
 			git_xmerge_style = 0;
 		/*
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index b29deca5de..72e25a9ffa 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -66,6 +66,7 @@ extern "C" {
 
 /* merge output styles */
 #define XDL_MERGE_DIFF3 1
+#define XDL_MERGE_ZEALOUS_DIFF3 2
 
 typedef struct s_mmfile {
 	char *ptr;
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index a4542c05b6..69689fab24 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -390,12 +390,9 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1,
 }
 
 
-static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags)
+static int recs_match(xrecord_t *rec1, xrecord_t *rec2)
 {
-	return (rec1->ha == rec2->ha &&
-		xdl_recmatch(rec1->ptr, rec1->size,
-			     rec2->ptr, rec2->size,
-			     flags));
+	return (rec1->ha == rec2->ha);
 }
 
 /*
@@ -759,10 +756,10 @@ static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g)
  * following group, expand this group to include it. Return 0 on success or -1
  * if g cannot be slid down.
  */
-static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
+static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g)
 {
 	if (g->end < xdf->nrec &&
-	    recs_match(xdf->recs[g->start], xdf->recs[g->end], flags)) {
+	    recs_match(xdf->recs[g->start], xdf->recs[g->end])) {
 		xdf->rchg[g->start++] = 0;
 		xdf->rchg[g->end++] = 1;
 
@@ -780,10 +777,10 @@ static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
  * into a previous group, expand this group to include it. Return 0 on success
  * or -1 if g cannot be slid up.
  */
-static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g, long flags)
+static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g)
 {
 	if (g->start > 0 &&
-	    recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1], flags)) {
+	    recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1])) {
 		xdf->rchg[--g->start] = 1;
 		xdf->rchg[--g->end] = 0;
 
@@ -833,7 +830,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			end_matching_other = -1;
 
 			/* Shift the group backward as much as possible: */
-			while (!group_slide_up(xdf, &g, flags))
+			while (!group_slide_up(xdf, &g))
 				if (group_previous(xdfo, &go))
 					BUG("group sync broken sliding up");
 
@@ -848,7 +845,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 
 			/* Now shift the group forward as far as possible: */
 			while (1) {
-				if (group_slide_down(xdf, &g, flags))
+				if (group_slide_down(xdf, &g))
 					break;
 				if (group_next(xdfo, &go))
 					BUG("group sync broken sliding down");
@@ -875,7 +872,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			 * other file that it can align with.
 			 */
 			while (go.end == go.start) {
-				if (group_slide_up(xdf, &g, flags))
+				if (group_slide_up(xdf, &g))
 					BUG("match disappeared");
 				if (group_previous(xdfo, &go))
 					BUG("group sync broken sliding to match");
@@ -918,7 +915,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			}
 
 			while (g.end > best_shift) {
-				if (group_slide_up(xdf, &g, flags))
+				if (group_slide_up(xdf, &g))
 					BUG("best shift unreached");
 				if (group_previous(xdfo, &go))
 					BUG("group sync broken sliding to blank line");
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index e694bfd9e3..80794748b0 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -88,19 +88,14 @@ struct region {
 #define REC(env, s, l) \
 	(env->xdf##s.recs[l - 1])
 
-static int cmp_recs(xpparam_t const *xpp,
-	xrecord_t *r1, xrecord_t *r2)
+static int cmp_recs(xrecord_t *r1, xrecord_t *r2)
 {
-	return r1->ha == r2->ha &&
-		xdl_recmatch(r1->ptr, r1->size, r2->ptr, r2->size,
-			    xpp->flags);
-}
+	return r1->ha == r2->ha;
 
-#define CMP_ENV(xpp, env, s1, l1, s2, l2) \
-	(cmp_recs(xpp, REC(env, s1, l1), REC(env, s2, l2)))
+}
 
 #define CMP(i, s1, l1, s2, l2) \
-	(cmp_recs(i->xpp, REC(i->env, s1, l1), REC(i->env, s2, l2)))
+	(cmp_recs(REC(i->env, s1, l1), REC(i->env, s2, l2)))
 
 #define TABLE_HASH(index, side, line) \
 	XDL_HASHLONG((REC(index->env, side, line))->ha, index->table_bits)
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 1659edb453..fff0b594f9 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -230,7 +230,7 @@ static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
 	size += xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, 1,
 			      dest ? dest + size : NULL);
 
-	if (style == XDL_MERGE_DIFF3) {
+	if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) {
 		/* Shared preimage */
 		if (!dest) {
 			size += marker_size + 1 + needs_cr + marker3_size;
@@ -322,6 +322,40 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
 	return size;
 }
 
+static int recmatch(xrecord_t *rec1, xrecord_t *rec2, unsigned long flags)
+{
+	return xdl_recmatch(rec1->ptr, rec1->size,
+			    rec2->ptr, rec2->size, flags);
+}
+
+/*
+ * Remove any common lines from the beginning and end of the conflicted region.
+ */
+static void xdl_refine_zdiff3_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
+		xpparam_t const *xpp)
+{
+	xrecord_t **rec1 = xe1->xdf2.recs, **rec2 = xe2->xdf2.recs;
+	for (; m; m = m->next) {
+		/* let's handle just the conflicts */
+		if (m->mode)
+			continue;
+
+		while(m->chg1 && m->chg2 &&
+		      recmatch(rec1[m->i1], rec2[m->i2], xpp->flags)) {
+			m->chg1--;
+			m->chg2--;
+			m->i1++;
+			m->i2++;
+		}
+		while (m->chg1 && m->chg2 &&
+		       recmatch(rec1[m->i1 + m->chg1 - 1],
+				rec2[m->i2 + m->chg2 - 1], xpp->flags)) {
+			m->chg1--;
+			m->chg2--;
+		}
+	}
+}
+
 /*
  * Sometimes, changes are not quite identical, but differ in only a few
  * lines. Try hard to show only these few lines as conflicting.
@@ -482,7 +516,22 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
 	int style = xmp->style;
 	int favor = xmp->favor;
 
-	if (style == XDL_MERGE_DIFF3) {
+	/*
+	 * XDL_MERGE_DIFF3 does not attempt to refine conflicts by looking
+	 * at common areas of sides 1 & 2, because the base (side 0) does
+	 * not match and is being shown.  Similarly, simplification of
+	 * non-conflicts is also skipped due to the skipping of conflict
+	 * refinement.
+	 *
+	 * XDL_MERGE_ZEALOUS_DIFF3, on the other hand, will attempt to
+	 * refine conflicts looking for common areas of sides 1 & 2.
+	 * However, since the base is being shown and does not match,
+	 * it will only look for common areas at the beginning or end
+	 * of the conflict block.  Since XDL_MERGE_ZEALOUS_DIFF3's
+	 * conflict refinement is much more limited in this fashion, the
+	 * conflict simplification will be skipped.
+	 */
+	if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) {
 		/*
 		 * "diff3 -m" output does not make sense for anything
 		 * more aggressive than XDL_MERGE_EAGER.
@@ -603,10 +652,12 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
 	if (!changes)
 		changes = c;
 	/* refine conflicts */
-	if (XDL_MERGE_ZEALOUS <= level &&
-	    (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
-	     xdl_simplify_non_conflicts(xe1, changes,
-					XDL_MERGE_ZEALOUS < level) < 0)) {
+	if (style == XDL_MERGE_ZEALOUS_DIFF3) {
+		xdl_refine_zdiff3_conflicts(xe1, xe2, changes, xpp);
+	} else if (XDL_MERGE_ZEALOUS <= level &&
+		   (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
+		    xdl_simplify_non_conflicts(xe1, changes,
+					       XDL_MERGE_ZEALOUS < level) < 0)) {
 		xdl_cleanup_merge(changes);
 		return -1;
 	}
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index abeb8fb84e..4527a4a07c 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -181,15 +181,11 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 	if (!(recs = (xrecord_t **) xdl_malloc(narec * sizeof(xrecord_t *))))
 		goto abort;
 
-	if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
-		hbits = hsize = 0;
-	else {
-		hbits = xdl_hashbits((unsigned int) narec);
-		hsize = 1 << hbits;
-		if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
-			goto abort;
-		memset(rhash, 0, hsize * sizeof(xrecord_t *));
-	}
+	hbits = xdl_hashbits((unsigned int) narec);
+	hsize = 1 << hbits;
+	if (!(rhash = (xrecord_t **) xdl_malloc(hsize * sizeof(xrecord_t *))))
+		goto abort;
+	memset(rhash, 0, hsize * sizeof(xrecord_t *));
 
 	nrec = 0;
 	if ((cur = blk = xdl_mmfile_first(mf, &bsize)) != NULL) {
@@ -208,9 +204,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 			crec->size = (long) (cur - prev);
 			crec->ha = hav;
 			recs[nrec++] = crec;
-
-			if ((XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) &&
-			    xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
+			if (xdl_classify_record(pass, cf, rhash, hbits, crec) < 0)
 				goto abort;
 		}
 	}
@@ -219,10 +213,13 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
 		goto abort;
 	memset(rchg, 0, (nrec + 2) * sizeof(char));
 
-	if (!(rindex = (long *) xdl_malloc((nrec + 1) * sizeof(long))))
-		goto abort;
-	if (!(ha = (unsigned long *) xdl_malloc((nrec + 1) * sizeof(unsigned long))))
-		goto abort;
+	if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) &&
+	    (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)) {
+		if (!(rindex = xdl_malloc((nrec + 1) * sizeof(*rindex))))
+			goto abort;
+		if (!(ha = xdl_malloc((nrec + 1) * sizeof(*ha))))
+			goto abort;
+	}
 
 	xdf->nrec = nrec;
 	xdf->recs = recs;
@@ -279,8 +276,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 	enl1 = xdl_guess_lines(mf1, sample) + 1;
 	enl2 = xdl_guess_lines(mf2, sample) + 1;
 
-	if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF &&
-	    xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
+	if (xdl_init_classifier(&cf, enl1 + enl2 + 1, xpp->flags) < 0)
 		return -1;
 
 	if (xdl_prepare_ctx(1, mf1, enl1, xpp, &cf, &xe->xdf1) < 0) {
@@ -305,8 +301,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 		return -1;
 	}
 
-	if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF)
-		xdl_free_classifier(&cf);
+	xdl_free_classifier(&cf);
 
 	return 0;
 }